diff options
| author | Gabriel Caruso <carusogabriel34@gmail.com> | 2018-09-16 14:16:42 -0300 |
|---|---|---|
| committer | Gabriel Caruso <carusogabriel34@gmail.com> | 2018-10-14 12:07:20 -0300 |
| commit | 9c144e0d8217d1ef7a83c2498214308b21af749f (patch) | |
| tree | d977ba0d8601de477c52f62accf02c120ef06253 | |
| parent | b419732ddb0673dc5b15a67ee4bc7f06dd90d7d0 (diff) | |
| download | php-git-9c144e0d8217d1ef7a83c2498214308b21af749f.tar.gz | |
Trim trailing whitespace in tests
5251 files changed, 11757 insertions, 11757 deletions
diff --git a/Zend/tests/001.phpt b/Zend/tests/001.phpt index bbd4ea3ece..c7c2060dc2 100644 --- a/Zend/tests/001.phpt +++ b/Zend/tests/001.phpt @@ -44,7 +44,7 @@ var_dump(func_num_args()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(0) int(1) Exception: Too few arguments to function test2(), 0 passed in %s001.php on line 18 and exactly 1 expected diff --git a/Zend/tests/002.phpt b/Zend/tests/002.phpt index 1728330c08..e89f71ef51 100644 --- a/Zend/tests/002.phpt +++ b/Zend/tests/002.phpt @@ -50,7 +50,7 @@ var_dump(func_get_arg(1)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: func_get_arg(): The argument number should be >= 0 in %s on line %d bool(false) diff --git a/Zend/tests/003.phpt b/Zend/tests/003.phpt index 91daa705d3..b1ef79ebcb 100644 --- a/Zend/tests/003.phpt +++ b/Zend/tests/003.phpt @@ -44,7 +44,7 @@ var_dump(func_get_args()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(0) { } array(1) { diff --git a/Zend/tests/004.phpt b/Zend/tests/004.phpt index 6beafe7076..179684d076 100644 --- a/Zend/tests/004.phpt +++ b/Zend/tests/004.phpt @@ -12,7 +12,7 @@ var_dump(strncmp("qwerty", "qwerty123", 7)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: strncmp() expects exactly 3 parameters, 2 given in %s on line %d NULL int(0) diff --git a/Zend/tests/005.phpt b/Zend/tests/005.phpt index 00f320e947..6ad1b0f63d 100644 --- a/Zend/tests/005.phpt +++ b/Zend/tests/005.phpt @@ -14,7 +14,7 @@ var_dump(strcasecmp("01", "01")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: strcasecmp() expects exactly 2 parameters, 1 given in %s on line %d NULL int(0) diff --git a/Zend/tests/006.phpt b/Zend/tests/006.phpt index eedb849719..64c74ff134 100644 --- a/Zend/tests/006.phpt +++ b/Zend/tests/006.phpt @@ -15,7 +15,7 @@ var_dump(strncasecmp("01", "01", 1000)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: strncasecmp() expects exactly 3 parameters, 1 given in %s on line %d NULL diff --git a/Zend/tests/007.phpt b/Zend/tests/007.phpt index f8e5b99a0e..6120181269 100644 --- a/Zend/tests/007.phpt +++ b/Zend/tests/007.phpt @@ -21,7 +21,7 @@ var_dump(each($a)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: each() expects exactly 1 parameter, 0 given in %s on line %d NULL diff --git a/Zend/tests/008.phpt b/Zend/tests/008.phpt index a3a3e02fcc..0766c3e1a4 100644 --- a/Zend/tests/008.phpt +++ b/Zend/tests/008.phpt @@ -23,7 +23,7 @@ var_dump(constant("test const")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: define() expects at least 2 parameters, 0 given in %s on line %d NULL diff --git a/Zend/tests/009.phpt b/Zend/tests/009.phpt index 0dc9453576..82cfabee49 100644 --- a/Zend/tests/009.phpt +++ b/Zend/tests/009.phpt @@ -35,7 +35,7 @@ $f1->testNull(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Deprecated: Non-static method foo::bar() should not be called statically in %s on line %d string(3) "foo" diff --git a/Zend/tests/010.phpt b/Zend/tests/010.phpt index 8f5fa5a052..eef3bc594f 100644 --- a/Zend/tests/010.phpt +++ b/Zend/tests/010.phpt @@ -41,7 +41,7 @@ var_dump(get_parent_class(1)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- bool(false) bool(false) string(3) "foo" diff --git a/Zend/tests/011.phpt b/Zend/tests/011.phpt index 57c6214916..7bcab0798f 100644 --- a/Zend/tests/011.phpt +++ b/Zend/tests/011.phpt @@ -52,7 +52,7 @@ $bar->test(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: property_exists() expects exactly 2 parameters, 0 given in %s on line %d NULL diff --git a/Zend/tests/012.phpt b/Zend/tests/012.phpt index b192bc1e0c..40f68e9794 100644 --- a/Zend/tests/012.phpt +++ b/Zend/tests/012.phpt @@ -18,7 +18,7 @@ var_dump(class_exists("stdClass")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: class_exists() expects at least 1 parameter, 0 given in %s on line %d NULL bool(false) diff --git a/Zend/tests/013.phpt b/Zend/tests/013.phpt index 1fc4af77ab..aec10e53f1 100644 --- a/Zend/tests/013.phpt +++ b/Zend/tests/013.phpt @@ -18,7 +18,7 @@ var_dump(interface_exists("stdClass")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: interface_exists() expects at least 1 parameter, 0 given in %s on line %d NULL bool(false) diff --git a/Zend/tests/014.phpt b/Zend/tests/014.phpt index 25995b7976..18037a99e3 100644 --- a/Zend/tests/014.phpt +++ b/Zend/tests/014.phpt @@ -20,7 +20,7 @@ var_dump(get_included_files()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(1) { [0]=> string(%d) "%s" diff --git a/Zend/tests/015.phpt b/Zend/tests/015.phpt index ffe1a4f94e..ccf5e4ddb0 100644 --- a/Zend/tests/015.phpt +++ b/Zend/tests/015.phpt @@ -13,7 +13,7 @@ var_dump(trigger_error("error", E_USER_DEPRECATED)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: trigger_error() expects at least 1 parameter, 0 given in %s on line %d NULL diff --git a/Zend/tests/016.phpt b/Zend/tests/016.phpt index 6ec507e6b1..de011606bc 100644 --- a/Zend/tests/016.phpt +++ b/Zend/tests/016.phpt @@ -3,10 +3,10 @@ isset() with object properties when operating on non-object --FILE-- <?php -$foo = NULL; +$foo = NULL; isset($foo->bar->bar); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- Done diff --git a/Zend/tests/017.phpt b/Zend/tests/017.phpt index 0e1c1be697..ed1b2a38a5 100644 --- a/Zend/tests/017.phpt +++ b/Zend/tests/017.phpt @@ -43,7 +43,7 @@ var_dump(count(get_extension_funcs("zend"))); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: get_resource_type() expects exactly 1 parameter, 0 given in %s on line %d NULL diff --git a/Zend/tests/018.phpt b/Zend/tests/018.phpt index 9543cc4caa..5ced729fce 100644 --- a/Zend/tests/018.phpt +++ b/Zend/tests/018.phpt @@ -17,7 +17,7 @@ var_dump(constant("TEST_CONST2")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: constant() expects exactly 1 parameter, 0 given in %s on line %d NULL diff --git a/Zend/tests/019.phpt b/Zend/tests/019.phpt index a14a3aead6..7323f5de2f 100644 --- a/Zend/tests/019.phpt +++ b/Zend/tests/019.phpt @@ -16,7 +16,7 @@ echo "*** Testing unset(), empty() & isset() with scalar variables ***\n"; // testing scalar variables $scalar_variables = array( - 0, + 0, 1, +1 -1, @@ -52,23 +52,23 @@ foreach ($scalar_variables as $scalar_var) { echo "-- Iteration $loop_counter --\n"; $loop_counter++; // checking with isset before unsetting, expected: bool(true) - var_dump( isset($scalar_var) ); - var_dump( isset($scalar_var, $set_var) ); + var_dump( isset($scalar_var) ); + var_dump( isset($scalar_var, $set_var) ); // checking if the var is empty, expected: bool(false) on most // except "", 0, "0", NULL, FALSE - var_dump( empty($scalar_var) ); - + var_dump( empty($scalar_var) ); + // destroy the variable using unset - unset( $scalar_var ); + unset( $scalar_var ); // dump and see if its destroyed, expcted: NULL - var_dump( $scalar_var ); + var_dump( $scalar_var ); // check using isset to see if unset, expected: bool(false) - var_dump( isset($scalar_var) ); - var_dump( isset($scalar_var, $set_var) ); + var_dump( isset($scalar_var) ); + var_dump( isset($scalar_var, $set_var) ); // empty to check if empty, expecting bool(true) - var_dump( empty($scalar_var) ); + var_dump( empty($scalar_var) ); // isset() with two args, one arg only unset, expected: bool(false) var_dump( isset($scalar_var, $set_var) ); @@ -90,16 +90,16 @@ $array_variables = array( array(1 => "One", 2 => "two"), array("Name" => "Jack", "Age" => "30"), array(1,2, "One" => "1", 2 => "two", ""=>"empty", "" => '') -); +); $outer_loop_counter = 1; foreach ($array_variables as $array_var) { echo "--- Outerloop Iteration $outer_loop_counter ---\n"; - + // check the isset and unset on non existing key $var = 1; // a var which is defined // try to unset the element which is non-existent - unset($array_var['non_existent']); + unset($array_var['non_existent']); // check using isset() & empty() on a non_existent element in the array var_dump( isset($array_var['non_existent']) ); var_dump( isset($array_var['non_existent'], $var) ); @@ -115,11 +115,11 @@ foreach ($array_variables as $array_var) { // unset each element in the array and see the working of unset, isset & empty $inner_loop_counter = 1; foreach ($keys as $key_value) { - echo "-- Innerloop Iteration $inner_loop_counter of Outerloop Iteration $outer_loop_counter --\n"; + echo "-- Innerloop Iteration $inner_loop_counter of Outerloop Iteration $outer_loop_counter --\n"; $inner_loop_counter++; // unset the element - unset($array_var[$key_value]); + unset($array_var[$key_value]); // dump the array after element was unset var_dump($array_var); // check using isset for the element that was unset @@ -127,7 +127,7 @@ foreach ($array_variables as $array_var) { // calling isset with more args var_dump( isset($array_var[$key_val], $array_var) ); //expected: bool(false) - // calling empty, expected bool(true) + // calling empty, expected bool(true) var_dump( empty($array_var[$key_val]) ); // dump the array to see that that array did not get modified @@ -144,7 +144,7 @@ foreach ($array_variables as $array_var) { // use isset to see that array is not set var_dump( isset($array_var) ); //expected: bool(false) var_dump( isset($array_var, $array_var[$key_val]) ); // expected: bool(false) - + // empty() to see if the array is empty var_dump( empty($array_var) ); // expected: bool(true) } @@ -183,7 +183,7 @@ foreach ($resources as $resource) { unset($temp_var); // now the isset() with both the args as unset var_dump( isset($resource, $temp_var) ); // expected: bool(false); - + // dump the resource to see if there any effect on it var_dump($resource); } @@ -200,12 +200,12 @@ class Point var $x; var $y; var $lable; - + function __construct($x, $y) { $this->x = $x; $this->y = $y; } - + function setLable($lable) { $this->lable = $lable; } @@ -281,25 +281,25 @@ echo "\n*** Testing possible variation in operation for isset(), empty() & unset echo "\n** Testing unset() variation 1: unset on static variable inside a function **\n"; function test_unset1() { static $static_var; - + // increment the value of the static. this change is in function context $static_var ++; - - echo "value of static_var before unset: $static_var\n"; + + echo "value of static_var before unset: $static_var\n"; // check using isset and empty var_dump( isset($static_var) ); var_dump( empty($static_var) ); - + // unset the static var unset($static_var); - echo "value of static_var after unset: $static_var\n"; + echo "value of static_var after unset: $static_var\n"; // check using isset and empty var_dump( isset($static_var) ); var_dump( empty($static_var) ); // assign a value to static var $static_var = 20; - echo "value of static_var after new assignment: $static_var\n"; + echo "value of static_var after new assignment: $static_var\n"; } // call the functiont test_unset1(); @@ -329,7 +329,7 @@ var_dump($value); test_unset2($value); var_dump($value); - + echo "\n** Testing unset() variation 3: unset on a global variable inside of a function **\n"; /* unset() variation2: unset on a global variable inside a function * If a globalized variable is unset() inside of a function, only the @@ -340,17 +340,17 @@ $global_var = 10; function test_unset3() { global $global_var; - + // check the $global_var using isset and empty - var_dump( isset($global_var) ); - var_dump( empty($global_var) ); - + var_dump( isset($global_var) ); + var_dump( empty($global_var) ); + // unset the global var unset($global_var); - + // check the $global_var using isset and empty - var_dump( isset($global_var) ); - var_dump( empty($global_var) ); + var_dump( isset($global_var) ); + var_dump( empty($global_var) ); } var_dump($global_var); diff --git a/Zend/tests/020.phpt b/Zend/tests/020.phpt index 73a3a17e8a..1e2bcff387 100644 --- a/Zend/tests/020.phpt +++ b/Zend/tests/020.phpt @@ -19,7 +19,7 @@ foo(1,2); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: func_get_arg() expects exactly 1 parameter, 3 given in %s on line %d NULL diff --git a/Zend/tests/030.phpt b/Zend/tests/030.phpt index 2318420319..6f3bda27d7 100644 --- a/Zend/tests/030.phpt +++ b/Zend/tests/030.phpt @@ -7,7 +7,7 @@ class foo { public $test = 0; private $test_2 = 1; protected $test_3 = 2; - + public function bar() { try { throw new Exception('foo'); @@ -15,13 +15,13 @@ class foo { var_dump($this); } - $this->baz(); + $this->baz(); } - + public function baz() { foreach ($this as $k => $v) { printf("'%s' => '%s'\n", $k, $v); - } + } print "ok\n"; } } diff --git a/Zend/tests/031.phpt b/Zend/tests/031.phpt index 8db52a5deb..116a0e8f2c 100644 --- a/Zend/tests/031.phpt +++ b/Zend/tests/031.phpt @@ -1,7 +1,7 @@ --TEST-- Testing array with '[]' passed as argument by value --FILE-- -<?php +<?php function test($var) { } test($arr[]); diff --git a/Zend/tests/032.phpt b/Zend/tests/032.phpt index 8f7f994647..1c7f59e937 100644 --- a/Zend/tests/032.phpt +++ b/Zend/tests/032.phpt @@ -1,7 +1,7 @@ --TEST-- Testing array with '[]' passed as argument by reference --FILE-- -<?php +<?php function test(&$var) { } test($arr[]); diff --git a/Zend/tests/033.phpt b/Zend/tests/033.phpt index 5ff0089058..b506f9172e 100644 --- a/Zend/tests/033.phpt +++ b/Zend/tests/033.phpt @@ -1,7 +1,7 @@ --TEST-- Using undefined multidimensional array --FILE-- -<?php +<?php $arr[1][2][3][4][5]; diff --git a/Zend/tests/034.phpt b/Zend/tests/034.phpt index 0bcfa23f19..132fbf78f5 100644 --- a/Zend/tests/034.phpt +++ b/Zend/tests/034.phpt @@ -1,7 +1,7 @@ --TEST-- Testing multiples 'default:' in switch --FILE-- -<?php +<?php switch (1) { case 2: diff --git a/Zend/tests/ErrorException_getSeverity.phpt b/Zend/tests/ErrorException_getSeverity.phpt index c3d171c2d2..2673065a87 100644 --- a/Zend/tests/ErrorException_getSeverity.phpt +++ b/Zend/tests/ErrorException_getSeverity.phpt @@ -649,7 +649,7 @@ try { var_dump($e->getPrevious() === NULL); var_dump($e->getFile() === __FILE__); var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG); - } + } } try { @@ -665,7 +665,7 @@ try { var_dump($e->getPrevious() === NULL); var_dump($e->getFile() === __FILE__); var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG); - } + } } try { @@ -681,7 +681,7 @@ try { var_dump($e->getPrevious() === NULL); var_dump($e->getFile() === __FILE__); var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG); - } + } } @@ -698,7 +698,7 @@ try { var_dump($e->getPrevious() === NULL); var_dump($e->getFile() === __FILE__); var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG); - } + } } try { @@ -714,7 +714,7 @@ try { var_dump($e->getPrevious() === NULL); var_dump($e->getFile() === __FILE__); var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG); - } + } } try { @@ -730,7 +730,7 @@ try { var_dump($e->getPrevious() === NULL); var_dump($e->getFile() === __FILE__); var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG); - } + } } try { @@ -746,7 +746,7 @@ try { var_dump($e->getPrevious() === NULL); var_dump($e->getFile() === __FILE__); var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG); - } + } } try { @@ -762,7 +762,7 @@ try { var_dump($e->getPrevious() === NULL); var_dump($e->getFile() === __FILE__); var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG); - } + } } try { @@ -778,7 +778,7 @@ try { var_dump($e->getPrevious() === NULL); var_dump($e->getFile() === __FILE__); var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG); - } + } } try { @@ -794,7 +794,7 @@ try { var_dump($e->getPrevious() === NULL); var_dump($e->getFile() === __FILE__); var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG); - } + } } try { @@ -810,7 +810,7 @@ try { var_dump($e->getPrevious() === NULL); var_dump($e->getFile() === __FILE__); var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG); - } + } } try { @@ -826,7 +826,7 @@ try { var_dump($e->getPrevious() === NULL); var_dump($e->getFile() === __FILE__); var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG); - } + } } try { @@ -842,7 +842,7 @@ try { var_dump($e->getPrevious() === NULL); var_dump($e->getFile() === __FILE__); var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG); - } + } } try { @@ -858,7 +858,7 @@ try { var_dump($e->getPrevious() === NULL); var_dump($e->getFile() === __FILE__); var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG); - } + } } ?> diff --git a/Zend/tests/abstract_inheritance_001.phpt b/Zend/tests/abstract_inheritance_001.phpt index 9e061e65d5..2bef85f8b3 100644 --- a/Zend/tests/abstract_inheritance_001.phpt +++ b/Zend/tests/abstract_inheritance_001.phpt @@ -8,5 +8,5 @@ abstract class B extends A { abstract function bar($x); } echo "DONE"; ?> ---EXPECT-- +--EXPECT-- DONE diff --git a/Zend/tests/abstract_inheritance_002.phpt b/Zend/tests/abstract_inheritance_002.phpt index 78f53c85c8..916dbb3e32 100644 --- a/Zend/tests/abstract_inheritance_002.phpt +++ b/Zend/tests/abstract_inheritance_002.phpt @@ -8,5 +8,5 @@ abstract class B extends A { abstract function bar($x, $y = 0); } echo "DONE"; ?> ---EXPECT-- +--EXPECT-- DONE diff --git a/Zend/tests/abstract_inheritance_003.phpt b/Zend/tests/abstract_inheritance_003.phpt index 24d5920cc1..6af55b7d86 100644 --- a/Zend/tests/abstract_inheritance_003.phpt +++ b/Zend/tests/abstract_inheritance_003.phpt @@ -8,5 +8,5 @@ abstract class B extends A { abstract function bar($x); } echo "DONE"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Declaration of B::bar($x) must be compatible with A::bar($x, $y = 0) in %s diff --git a/Zend/tests/access_modifiers_001.phpt b/Zend/tests/access_modifiers_001.phpt index 989b926be3..f89d55bd93 100644 --- a/Zend/tests/access_modifiers_001.phpt +++ b/Zend/tests/access_modifiers_001.phpt @@ -10,5 +10,5 @@ class test { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Multiple access type modifiers are not allowed in %s on line %d diff --git a/Zend/tests/access_modifiers_002.phpt b/Zend/tests/access_modifiers_002.phpt index cc5df306f1..f0b15e43dc 100644 --- a/Zend/tests/access_modifiers_002.phpt +++ b/Zend/tests/access_modifiers_002.phpt @@ -9,5 +9,5 @@ class test { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Multiple access type modifiers are not allowed in %s on line %d diff --git a/Zend/tests/access_modifiers_003.phpt b/Zend/tests/access_modifiers_003.phpt index 2b3a88242f..7f5d922f3b 100644 --- a/Zend/tests/access_modifiers_003.phpt +++ b/Zend/tests/access_modifiers_003.phpt @@ -9,5 +9,5 @@ final final class test { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Multiple final modifiers are not allowed in %s on line %d diff --git a/Zend/tests/access_modifiers_004.phpt b/Zend/tests/access_modifiers_004.phpt index c023d2cb6d..2be203a917 100644 --- a/Zend/tests/access_modifiers_004.phpt +++ b/Zend/tests/access_modifiers_004.phpt @@ -10,5 +10,5 @@ class test { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Multiple abstract modifiers are not allowed in %s on line %d diff --git a/Zend/tests/access_modifiers_005.phpt b/Zend/tests/access_modifiers_005.phpt index b32394d7f6..7780cf4ca6 100644 --- a/Zend/tests/access_modifiers_005.phpt +++ b/Zend/tests/access_modifiers_005.phpt @@ -10,5 +10,5 @@ class test { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Multiple final modifiers are not allowed in %s on line %d diff --git a/Zend/tests/access_modifiers_006.phpt b/Zend/tests/access_modifiers_006.phpt index 293fc1c64c..aefe27c68a 100644 --- a/Zend/tests/access_modifiers_006.phpt +++ b/Zend/tests/access_modifiers_006.phpt @@ -10,5 +10,5 @@ class test { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Multiple static modifiers are not allowed in %s on line %d diff --git a/Zend/tests/access_modifiers_007.phpt b/Zend/tests/access_modifiers_007.phpt index 26779e6e68..4860c52c29 100644 --- a/Zend/tests/access_modifiers_007.phpt +++ b/Zend/tests/access_modifiers_007.phpt @@ -9,5 +9,5 @@ class test { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Cannot use the final modifier on an abstract class member in %s on line %d diff --git a/Zend/tests/access_modifiers_010.phpt b/Zend/tests/access_modifiers_010.phpt index 342ef522af..dd2e3e36b9 100644 --- a/Zend/tests/access_modifiers_010.phpt +++ b/Zend/tests/access_modifiers_010.phpt @@ -21,7 +21,7 @@ abstract class b extends a { class c extends b { public function __construct() { $this->test(); - } + } } new c; diff --git a/Zend/tests/access_modifiers_011.phpt b/Zend/tests/access_modifiers_011.phpt index b79f060f4f..23846fc040 100644 --- a/Zend/tests/access_modifiers_011.phpt +++ b/Zend/tests/access_modifiers_011.phpt @@ -32,7 +32,7 @@ echo $a->func1(),"\n"; echo $a->func2(),"\n"; ?> ---EXPECT-- +--EXPECT-- var1 value var2 value in func1 diff --git a/Zend/tests/add_001.phpt b/Zend/tests/add_001.phpt index 315d1e86e2..af22e0df43 100644 --- a/Zend/tests/add_001.phpt +++ b/Zend/tests/add_001.phpt @@ -29,7 +29,7 @@ var_dump($c); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(3) { [0]=> int(1) diff --git a/Zend/tests/add_002.phpt b/Zend/tests/add_002.phpt index 1e9148ffa5..de0a3e8a63 100644 --- a/Zend/tests/add_002.phpt +++ b/Zend/tests/add_002.phpt @@ -19,7 +19,7 @@ var_dump($c); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Notice: Object of class stdClass could not be converted to number in %sadd_002.php on line %d Exception: Unsupported operand types diff --git a/Zend/tests/add_003.phpt b/Zend/tests/add_003.phpt index cc2a0dd1a7..d3363f80f4 100644 --- a/Zend/tests/add_003.phpt +++ b/Zend/tests/add_003.phpt @@ -19,7 +19,7 @@ var_dump($c); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Notice: Object of class stdClass could not be converted to number in %sadd_003.php on line %d Exception: Unsupported operand types diff --git a/Zend/tests/add_004.phpt b/Zend/tests/add_004.phpt index 026d2494dc..a46f70b818 100644 --- a/Zend/tests/add_004.phpt +++ b/Zend/tests/add_004.phpt @@ -16,7 +16,7 @@ var_dump($c); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Exception: Unsupported operand types Fatal error: Uncaught Error: Unsupported operand types in %s:%d diff --git a/Zend/tests/add_005.phpt b/Zend/tests/add_005.phpt index 24b08fbf8e..f5c20124cc 100644 --- a/Zend/tests/add_005.phpt +++ b/Zend/tests/add_005.phpt @@ -16,7 +16,7 @@ var_dump($c); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- float(2834756759.1231) float(2834756759.1231) Done diff --git a/Zend/tests/add_006.phpt b/Zend/tests/add_006.phpt index fe1c0830e2..c1124e026c 100644 --- a/Zend/tests/add_006.phpt +++ b/Zend/tests/add_006.phpt @@ -37,7 +37,7 @@ var_dump($c); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: A non-numeric value encountered in %s on line %d int(75636) diff --git a/Zend/tests/add_007.phpt b/Zend/tests/add_007.phpt index 089b24ae0b..9c8bbc8ca2 100644 --- a/Zend/tests/add_007.phpt +++ b/Zend/tests/add_007.phpt @@ -18,7 +18,7 @@ var_dump($c); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: A non-numeric value encountered in %s on line %d diff --git a/Zend/tests/and_001.phpt b/Zend/tests/and_001.phpt index cf879c0086..c49af66a20 100644 --- a/Zend/tests/and_001.phpt +++ b/Zend/tests/and_001.phpt @@ -30,7 +30,7 @@ var_dump($s); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(3) "020" string(4) "pead" string(4) "pead" diff --git a/Zend/tests/anonymous_func_001.phpt b/Zend/tests/anonymous_func_001.phpt index 8e4bc42a0b..97b91b6544 100644 --- a/Zend/tests/anonymous_func_001.phpt +++ b/Zend/tests/anonymous_func_001.phpt @@ -1,12 +1,12 @@ --TEST-- Testing calls to anonymous function --FILE-- -<?php +<?php for ($i = 0; $i < 10; $i++) { $a = create_function('', 'return '. $i .';'); var_dump($a()); - + $b = "\0lambda_". ($i + 1); var_dump($b()); } diff --git a/Zend/tests/anonymous_func_002.phpt b/Zend/tests/anonymous_func_002.phpt index 1b9375c89f..28adc357da 100644 --- a/Zend/tests/anonymous_func_002.phpt +++ b/Zend/tests/anonymous_func_002.phpt @@ -1,7 +1,7 @@ --TEST-- Testing anonymous function return as array key and accessing $GLOBALS --FILE-- -<?php +<?php $test = create_function('$v', 'return $v;'); diff --git a/Zend/tests/anonymous_func_003.phpt b/Zend/tests/anonymous_func_003.phpt index f06a463727..d2610310f7 100644 --- a/Zend/tests/anonymous_func_003.phpt +++ b/Zend/tests/anonymous_func_003.phpt @@ -1,7 +1,7 @@ --TEST-- Using throw $var with anonymous function return --FILE-- -<?php +<?php try { $a = create_function('', 'return new Exception("test");'); diff --git a/Zend/tests/argument_restriction_001.phpt b/Zend/tests/argument_restriction_001.phpt index be4c734b59..9c21dc2cce 100644 --- a/Zend/tests/argument_restriction_001.phpt +++ b/Zend/tests/argument_restriction_001.phpt @@ -4,12 +4,12 @@ Bug #55719 (Argument restriction should come with a more specific error message) <?php Class Base { public function &test($foo, array $bar, $option = NULL, $extra = "lllllllllllllllllllllllllllllllllllllllllllllllllll") { - } + } } class Sub extends Base { public function &test() { - } + } } ?> --EXPECTF-- diff --git a/Zend/tests/argument_restriction_002.phpt b/Zend/tests/argument_restriction_002.phpt index cbb3ec97d0..4deb2d206b 100644 --- a/Zend/tests/argument_restriction_002.phpt +++ b/Zend/tests/argument_restriction_002.phpt @@ -4,12 +4,12 @@ Bug #55719 (Argument restriction should come with a more specific error message) <?php Abstract Class Base { public function test($foo, array &$bar, $option = NULL, $extra = 3.141592653589793238462643383279502884197169399375105 ) { - } + } } class Sub extends Base { public function test($foo, array &$bar) { - } + } } ?> --EXPECTF-- diff --git a/Zend/tests/argument_restriction_003.phpt b/Zend/tests/argument_restriction_003.phpt index 6979810e37..c24e0ba852 100644 --- a/Zend/tests/argument_restriction_003.phpt +++ b/Zend/tests/argument_restriction_003.phpt @@ -7,12 +7,12 @@ class Foo { Abstract Class Base { public function test(Foo $foo, array $bar, $option = NULL, $extra = "lllllllllllllllllllllllllllllllllllllllllllllllllll") { - } + } } class Sub extends Base { public function test() { - } + } } ?> --EXPECTF-- diff --git a/Zend/tests/argument_restriction_004.phpt b/Zend/tests/argument_restriction_004.phpt index 379ea9b3e9..8313d6908c 100644 --- a/Zend/tests/argument_restriction_004.phpt +++ b/Zend/tests/argument_restriction_004.phpt @@ -11,7 +11,7 @@ Abstract Class Base { class Sub extends Base { public function test(Foo $foo, array $bar, $option = NULL, $extra = 0xffffff ) { - } + } } ?> --EXPECT-- diff --git a/Zend/tests/argument_restriction_005.phpt b/Zend/tests/argument_restriction_005.phpt index 2826fe6a81..712ccc878a 100644 --- a/Zend/tests/argument_restriction_005.phpt +++ b/Zend/tests/argument_restriction_005.phpt @@ -4,7 +4,7 @@ Bug #55719 (Argument restriction should come with a more specific error message) <?php class Sub implements ArrayAccess { public function offsetSet() { - } + } } ?> --EXPECTF-- diff --git a/Zend/tests/argument_restriction_006.phpt b/Zend/tests/argument_restriction_006.phpt index dd744d5ea9..2df0e1e90d 100644 --- a/Zend/tests/argument_restriction_006.phpt +++ b/Zend/tests/argument_restriction_006.phpt @@ -4,12 +4,12 @@ Bug #60174 (Notice when array in method prototype error) <?php Abstract Class Base { public function test($foo, $extra = array("test")) { - } + } } class Sub extends Base { public function test($foo, $extra) { - } + } } ?> --EXPECTF-- diff --git a/Zend/tests/array_offset.phpt b/Zend/tests/array_offset.phpt index 76c25f9298..0879f80918 100644 --- a/Zend/tests/array_offset.phpt +++ b/Zend/tests/array_offset.phpt @@ -10,7 +10,7 @@ Ensure "undefined offset" notice formats message corectly when undefined key is echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Notice: Undefined offset: -1 in %s on line 3 Notice: Undefined offset: -1 in %s on line 4 diff --git a/Zend/tests/assign_to_obj_001.phpt b/Zend/tests/assign_to_obj_001.phpt index 37b6c594d0..a4eb7c0141 100644 --- a/Zend/tests/assign_to_obj_001.phpt +++ b/Zend/tests/assign_to_obj_001.phpt @@ -20,5 +20,5 @@ $a->test(); $a->test(); echo "okey"; ?> ---EXPECT-- +--EXPECT-- okey diff --git a/Zend/tests/assign_to_var_001.phpt b/Zend/tests/assign_to_var_001.phpt index 17187abe64..c6b8c6298c 100644 --- a/Zend/tests/assign_to_var_001.phpt +++ b/Zend/tests/assign_to_var_001.phpt @@ -12,7 +12,7 @@ var_dump($var1); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- int(2) int(2) Done diff --git a/Zend/tests/assign_to_var_002.phpt b/Zend/tests/assign_to_var_002.phpt index ddee1b92de..5cb54dfbc2 100644 --- a/Zend/tests/assign_to_var_002.phpt +++ b/Zend/tests/assign_to_var_002.phpt @@ -12,7 +12,7 @@ var_dump($var1); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(1) "g" string(1) "g" Done diff --git a/Zend/tests/assign_to_var_003.phpt b/Zend/tests/assign_to_var_003.phpt index 1fcd41a7f1..b915c7231e 100644 --- a/Zend/tests/assign_to_var_003.phpt +++ b/Zend/tests/assign_to_var_003.phpt @@ -12,7 +12,7 @@ var_dump($var1); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- NULL NULL Done diff --git a/Zend/tests/assign_to_var_004.phpt b/Zend/tests/assign_to_var_004.phpt index a12c5aaa4a..004dd4f299 100644 --- a/Zend/tests/assign_to_var_004.phpt +++ b/Zend/tests/assign_to_var_004.phpt @@ -15,7 +15,7 @@ var_dump($var2); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(5) "space" string(5) "space" string(5) "space" diff --git a/Zend/tests/bug18556.phpt b/Zend/tests/bug18556.phpt index f8e48c2772..da083937c5 100644 --- a/Zend/tests/bug18556.phpt +++ b/Zend/tests/bug18556.phpt @@ -3,7 +3,7 @@ Bug #18556 (Setting locale to 'tr_TR' lowercases class names) --FILE-- <?php $g_lang = 'tr_TR'; -putenv("LANG=$g_lang"); +putenv("LANG=$g_lang"); setlocale(LC_ALL, $g_lang); class InfoBlob { diff --git a/Zend/tests/bug21478.phpt b/Zend/tests/bug21478.phpt index 22c28a19c9..8da1980400 100644 --- a/Zend/tests/bug21478.phpt +++ b/Zend/tests/bug21478.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #21478 (Zend/zend_alloc.c :: shutdown_memory_manager produces segfault) +Bug #21478 (Zend/zend_alloc.c :: shutdown_memory_manager produces segfault) --FILE-- <?php class debugfilter extends php_user_filter { @@ -23,7 +23,7 @@ fwrite($fp, "This is a test.\n"); print "Done.\n"; fclose($fp); // Uncommenting the following 'print' line causes the segfault to stop occurring -// print "2\n"; +// print "2\n"; readfile(dirname(__FILE__)."/test.txt"); unlink(dirname(__FILE__)."/test.txt"); ?> diff --git a/Zend/tests/bug21888.phpt b/Zend/tests/bug21888.phpt index b32bd35607..b79db58e14 100644 --- a/Zend/tests/bug21888.phpt +++ b/Zend/tests/bug21888.phpt @@ -8,19 +8,19 @@ class mom { protected function prot() { print "protected method\n"; - } + } } class child extends mom { - + public function callMom() { $this->prot(); } - + public function viewMom() { print $this->prot; } - + } $c = new child(); diff --git a/Zend/tests/bug24635.phpt b/Zend/tests/bug24635.phpt index 758a803a06..cd733f83f2 100644 --- a/Zend/tests/bug24635.phpt +++ b/Zend/tests/bug24635.phpt @@ -20,7 +20,7 @@ class SectionClass { } } function out($code) { return; } -$site = new SiteClass(); +$site = new SiteClass(); $site->page->Display(); echo "OK\n"; ?> diff --git a/Zend/tests/bug26229.phpt b/Zend/tests/bug26229.phpt index b3a237016f..cf23f157f8 100644 --- a/Zend/tests/bug26229.phpt +++ b/Zend/tests/bug26229.phpt @@ -5,7 +5,7 @@ Bug #26229 (getIterator() segfaults when it returns arrays or scalars) class array_iterator implements IteratorAggregate { public function getIterator() { - return array('foo', 'bar'); + return array('foo', 'bar'); } } diff --git a/Zend/tests/bug26802.phpt b/Zend/tests/bug26802.phpt index ab0ad25aa5..833f81bdb3 100644 --- a/Zend/tests/bug26802.phpt +++ b/Zend/tests/bug26802.phpt @@ -14,7 +14,7 @@ $function(); class foo { static $method = 'global_func'; - + static public function foo_func() { echo __METHOD__ . "\n"; diff --git a/Zend/tests/bug27304.phpt b/Zend/tests/bug27304.phpt index 0f248346cf..9eb1ececf7 100644 --- a/Zend/tests/bug27304.phpt +++ b/Zend/tests/bug27304.phpt @@ -14,7 +14,7 @@ class Staticexample $b = new Staticexample(); Staticexample::test(); $b->test(); - + ?> ===DONE=== --EXPECT-- diff --git a/Zend/tests/bug27798.phpt b/Zend/tests/bug27798.phpt index 9e54efa833..2545d9e100 100644 --- a/Zend/tests/bug27798.phpt +++ b/Zend/tests/bug27798.phpt @@ -8,7 +8,7 @@ class Base public $Foo = 1; protected $Bar = 2; private $Baz = 3; - + function __construct() { echo __METHOD__ . "\n"; diff --git a/Zend/tests/bug28072.phpt b/Zend/tests/bug28072.phpt index 76208733f8..3acd156320 100644 --- a/Zend/tests/bug28072.phpt +++ b/Zend/tests/bug28072.phpt @@ -4,8 +4,8 @@ Bug #28072 (static array with some constant keys will be incorrectly ordered) <?php define("FIRST_KEY", "a"); define("THIRD_KEY", "c"); - - + + function test() { static $arr = array( @@ -16,7 +16,7 @@ function test() ); print_r($arr); } - + function test2() { static $arr = array( @@ -27,7 +27,7 @@ function test2() ); print_r($arr); } - + test(); test2(); ?> diff --git a/Zend/tests/bug28377.phpt b/Zend/tests/bug28377.phpt index 9d1b43472c..78c865d795 100644 --- a/Zend/tests/bug28377.phpt +++ b/Zend/tests/bug28377.phpt @@ -8,14 +8,14 @@ function doit($a, $b) custom_callback('dereferenced', $trace); custom_callback('direct', debug_backtrace()); } - + function custom_callback($traceName, $btInfo) { echo $traceName ." -- args: "; echo isset($btInfo[0]['args']) ? count($btInfo[0]['args']) : 'does not exist'; echo "\n"; } - + doit('a','b'); ?> --EXPECT-- diff --git a/Zend/tests/bug29104.phpt b/Zend/tests/bug29104.phpt index 788b2190bf..168f534138 100644 --- a/Zend/tests/bug29104.phpt +++ b/Zend/tests/bug29104.phpt @@ -3,15 +3,15 @@ Bug #29104 (Function declaration in method doesn't work) --FILE-- <?php class A -{ - function g() - { +{ + function g() + { echo "function g - begin\n"; - - function f() - { + + function f() + { echo "function f\n"; - } + } echo "function g - end\n"; } diff --git a/Zend/tests/bug29674.phpt b/Zend/tests/bug29674.phpt index 39bc302463..60f08a6df2 100644 --- a/Zend/tests/bug29674.phpt +++ b/Zend/tests/bug29674.phpt @@ -6,7 +6,7 @@ Bug #29674 (inherited method doesn't have access to private variables of the der class BaseClass { private $private_base = "Base"; - + function printVars () { var_dump($this->private_base); diff --git a/Zend/tests/bug30080.phpt b/Zend/tests/bug30080.phpt index ff4a82b21f..d1d6302e85 100644 --- a/Zend/tests/bug30080.phpt +++ b/Zend/tests/bug30080.phpt @@ -2,13 +2,13 @@ Bug #30080 (Passing array or non array of objects) --FILE-- <?php -class foo { - function __construct($arrayobj) { +class foo { + function __construct($arrayobj) { var_dump($arrayobj); - } -} + } +} -new foo(array(new stdClass)); +new foo(array(new stdClass)); ?> --EXPECTF-- array(1) { diff --git a/Zend/tests/bug30161.phpt b/Zend/tests/bug30161.phpt index 22f8fb59e8..b824cd56f5 100644 --- a/Zend/tests/bug30161.phpt +++ b/Zend/tests/bug30161.phpt @@ -18,7 +18,7 @@ class hariCow extends FIIFO { } catch(Exception $e) { } } - + public function __toString() { return "ok\n"; } diff --git a/Zend/tests/bug30162.phpt b/Zend/tests/bug30162.phpt index a011292a13..9cd3e9d524 100644 --- a/Zend/tests/bug30162.phpt +++ b/Zend/tests/bug30162.phpt @@ -24,7 +24,7 @@ class hariCow extends FIIFO { } catch(Exception $e) { } } - + public function __toString() { return "Rusticus in asino sedet."; } diff --git a/Zend/tests/bug30346.phpt b/Zend/tests/bug30346.phpt index 30f36fbde2..8db080f820 100644 --- a/Zend/tests/bug30346.phpt +++ b/Zend/tests/bug30346.phpt @@ -5,7 +5,7 @@ Bug #30346 (arrayAccess and using $this) class Test implements ArrayAccess { - public function __construct() { } + public function __construct() { } public function offsetExists( $offset ) { return false; } public function offsetGet( $offset ) { return $offset; } public function offsetSet( $offset, $data ) { } diff --git a/Zend/tests/bug30394.phpt b/Zend/tests/bug30394.phpt index b69eda4fef..516bea2d2d 100644 --- a/Zend/tests/bug30394.phpt +++ b/Zend/tests/bug30394.phpt @@ -8,12 +8,12 @@ class Container { return $this->_p[ $what ]; } - + public function __set( $what, $value ) { $this->_p[ $what ] = $value; } - + private $_p = array(); } diff --git a/Zend/tests/bug30451.phpt b/Zend/tests/bug30451.phpt index 210f087574..5e9696f128 100644 --- a/Zend/tests/bug30451.phpt +++ b/Zend/tests/bug30451.phpt @@ -6,7 +6,7 @@ Bug #30451 (static properties permissions broken) class A { protected static $property = TRUE; - + protected static function method() { return TRUE; } @@ -16,15 +16,15 @@ class A { class B extends A { public function __construct() { - + var_dump(self::method()); var_dump(parent::method()); - + var_dump(self::$property); var_dump(parent::$property); - + } - + } new B; diff --git a/Zend/tests/bug30707.phpt b/Zend/tests/bug30707.phpt index d37d32974e..89db55c36a 100644 --- a/Zend/tests/bug30707.phpt +++ b/Zend/tests/bug30707.phpt @@ -14,7 +14,7 @@ class C { } } - function plap($a) { + function plap($a) { } function plop() { diff --git a/Zend/tests/bug30725.phpt b/Zend/tests/bug30725.phpt index ce6c9a50a2..75cb04843c 100644 --- a/Zend/tests/bug30725.phpt +++ b/Zend/tests/bug30725.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #30725 (PHP segfaults when an exception is thrown in getIterator() within foreach) --FILE-- -<?php +<?php class Test implements IteratorAggregate { @@ -12,7 +12,7 @@ class Test implements IteratorAggregate } try -{ +{ $it = new Test; foreach($it as $v) { diff --git a/Zend/tests/bug30998.phpt b/Zend/tests/bug30998.phpt index 032da3d3bc..2ff3068e5c 100644 --- a/Zend/tests/bug30998.phpt +++ b/Zend/tests/bug30998.phpt @@ -3,14 +3,14 @@ Bug #30998 (Crash when user error handler returns false) --FILE-- <?php error_reporting(-1); - + function my_error($errno, $errstr, $errfile, $errline) { print "$errstr ($errno) in $errfile:$errline\n"; return false; } set_error_handler('my_error'); - + $f = fopen("/tmp/blah", "r"); ?> ===DONE=== diff --git a/Zend/tests/bug31177.phpt b/Zend/tests/bug31177.phpt index 5e84573624..c443420118 100644 --- a/Zend/tests/bug31177.phpt +++ b/Zend/tests/bug31177.phpt @@ -7,7 +7,7 @@ class DbGow { public function query() { throw new Exception; } - + public function select() { return new DbGowRecordSet($this->query()); } @@ -32,7 +32,7 @@ try { } catch(Exception $e) { echo "ok\n"; } - + try { $db->select2(); } catch(Exception $e) { diff --git a/Zend/tests/bug31683.phpt b/Zend/tests/bug31683.phpt index 205aca0746..26a048dad0 100644 --- a/Zend/tests/bug31683.phpt +++ b/Zend/tests/bug31683.phpt @@ -6,42 +6,42 @@ Bug #31683 (changes to $name in __get($name) override future parameters) class Foo implements ArrayAccess { function __get($test) { - var_dump($test); + var_dump($test); $test = 'bug'; } function __set($test, $val) { - var_dump($test); + var_dump($test); var_dump($val); $test = 'bug'; $val = 'bug'; } function __call($test, $arg) { - var_dump($test); + var_dump($test); $test = 'bug'; } function offsetget($test) { - var_dump($test); + var_dump($test); $test = 'bug'; return 123; } function offsetset($test, $val) { - var_dump($test); - var_dump($val); + var_dump($test); + var_dump($val); $test = 'bug'; $val = 'bug'; } function offsetexists($test) { - var_dump($test); + var_dump($test); $test = 'bug'; } function offsetunset($test) { - var_dump($test); + var_dump($test); $test = 'bug'; } diff --git a/Zend/tests/bug32322.phpt b/Zend/tests/bug32322.phpt index 9f05e3f41f..6d444ac2b3 100644 --- a/Zend/tests/bug32322.phpt +++ b/Zend/tests/bug32322.phpt @@ -8,8 +8,8 @@ class test { private static $instance = null; private $myname = ''; - - private function __construct( $value = '' ) + + private function __construct( $value = '' ) { echo "New class $value created \n"; $this -> myname = $value; @@ -38,7 +38,7 @@ class test } return $instance2; } - public function __destruct() + public function __destruct() { if ( defined('SCRIPT_END') ) { @@ -47,7 +47,7 @@ class test echo "Class " . $this -> myname . " destroyed beforce script end\n"; } } -} +} echo "Try static instance inside class :\n"; $getCopyofSingleton = test::getInstance(); $getCopyofSingleton = null; diff --git a/Zend/tests/bug32428.phpt b/Zend/tests/bug32428.phpt index e75148fec1..7c1b298e06 100644 --- a/Zend/tests/bug32428.phpt +++ b/Zend/tests/bug32428.phpt @@ -1,12 +1,12 @@ --TEST-- Bug #32428 (The @ warning error suppression operator is broken) --FILE-- -<?php - $data = @$not_exists; - $data = @($not_exists); - $data = @!$not_exists; - $data = !@$not_exists; - $data = @($not_exists+1); +<?php + $data = @$not_exists; + $data = @($not_exists); + $data = @!$not_exists; + $data = !@$not_exists; + $data = @($not_exists+1); echo "ok\n"; ?> --EXPECT-- diff --git a/Zend/tests/bug32596.phpt b/Zend/tests/bug32596.phpt index 2dd0cfe9f0..287495d150 100644 --- a/Zend/tests/bug32596.phpt +++ b/Zend/tests/bug32596.phpt @@ -4,7 +4,7 @@ Bug #32596 (Segfault/Memory Leak by getClass (etc) in __destruct) <?php class BUG { public $error = "please fix this thing, it wasted a nice part of my life!\n"; - static function instance() {return new BUG();} + static function instance() {return new BUG();} function __destruct() { diff --git a/Zend/tests/bug32674.phpt b/Zend/tests/bug32674.phpt index 0e08fa72dd..f932517d9b 100644 --- a/Zend/tests/bug32674.phpt +++ b/Zend/tests/bug32674.phpt @@ -52,7 +52,7 @@ try { //irrelevant } echo 'shouldn`t get here'; - //$dummy = 'this will not crash'; + //$dummy = 'this will not crash'; $obj->dummy = 'this will crash'; } catch (Exception $e) { echo "ok\n"; diff --git a/Zend/tests/bug32833.phpt b/Zend/tests/bug32833.phpt index e58c8453d9..08ef1462e1 100644 --- a/Zend/tests/bug32833.phpt +++ b/Zend/tests/bug32833.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #32833 (Invalid opcode with $a[] .= '') --FILE-- -<?php +<?php $test = array(); $test[] .= "ok\n"; echo $test[0]; diff --git a/Zend/tests/bug33171.phpt b/Zend/tests/bug33171.phpt index 27f5264bad..a342e10439 100644 --- a/Zend/tests/bug33171.phpt +++ b/Zend/tests/bug33171.phpt @@ -10,7 +10,7 @@ class A class B extends A { private $c = "B's c"; - + public function go() { foreach ($this as $key => $val) diff --git a/Zend/tests/bug33277.phpt b/Zend/tests/bug33277.phpt index 859c449633..5a84d365dc 100644 --- a/Zend/tests/bug33277.phpt +++ b/Zend/tests/bug33277.phpt @@ -7,20 +7,20 @@ class foo { echo "private!\n"; } } - + class fooson extends foo { function barson() { $this->bar(); } } - + class foo2son extends fooson { - + function bar() { echo "public!\n"; } } - + $b = new foo2son(); $b->barson(); ?> diff --git a/Zend/tests/bug33282.phpt b/Zend/tests/bug33282.phpt index 65e3c16cf5..27f399046e 100644 --- a/Zend/tests/bug33282.phpt +++ b/Zend/tests/bug33282.phpt @@ -8,7 +8,7 @@ Bug #33282 (Re-assignment by reference does not clear the is_ref flag) $r = &$a[2]; var_dump($a); ?> ---EXPECT-- +--EXPECT-- array(3) { [0]=> int(1) diff --git a/Zend/tests/bug33512.phpt b/Zend/tests/bug33512.phpt index dcb8f0417e..0a0e4e7b11 100644 --- a/Zend/tests/bug33512.phpt +++ b/Zend/tests/bug33512.phpt @@ -41,7 +41,7 @@ class TheObj { var_dump($SomeObj->RealVar1); print $SomeObj->{'RealVar'.(3)}."\n"; - + unset($SomeObj->RealVar1); unset($SomeObj->{'RealVar'.(3)}); diff --git a/Zend/tests/bug33710.phpt b/Zend/tests/bug33710.phpt index 330bb584a4..f65576074b 100644 --- a/Zend/tests/bug33710.phpt +++ b/Zend/tests/bug33710.phpt @@ -9,12 +9,12 @@ class Foo implements ArrayAccess function offsetGet($offset) {/*...*/} function offsetSet($offset, $value) {/*...*/} function offsetUnset($offset) {/*...*/} - + function fail() { $this['blah']; } - + function succeed() { $this; diff --git a/Zend/tests/bug33771.phpt b/Zend/tests/bug33771.phpt index f1b42ce7c8..0f3dd9815f 100644 --- a/Zend/tests/bug33771.phpt +++ b/Zend/tests/bug33771.phpt @@ -33,7 +33,7 @@ var_dump(error_reporting()); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- int(32767) int(32767) int(30719) diff --git a/Zend/tests/bug34260.phpt b/Zend/tests/bug34260.phpt index fa393d065c..7e35886fae 100644 --- a/Zend/tests/bug34260.phpt +++ b/Zend/tests/bug34260.phpt @@ -16,7 +16,7 @@ class Faulty function NormalMethod($Args) { - echo "I heart me\n"; + echo "I heart me\n"; } } diff --git a/Zend/tests/bug34467.phpt b/Zend/tests/bug34467.phpt index 5f0ccafc4f..fa1d8de2cd 100644 --- a/Zend/tests/bug34467.phpt +++ b/Zend/tests/bug34467.phpt @@ -8,10 +8,10 @@ class abc { function __set ($key, $value) { $this->arr[$key] = $value; } - + function __get ($key) { return $this->arr[$key]; - } + } } $abc = new abc(); foreach (array (1,2,3) as $abc->k => $abc->v) { diff --git a/Zend/tests/bug34617.phpt b/Zend/tests/bug34617.phpt index ded1aec2fd..171db4b3f4 100644 --- a/Zend/tests/bug34617.phpt +++ b/Zend/tests/bug34617.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #34617 (zend_deactivate: objects_store used after zend_objects_store_destroy is called) +Bug #34617 (zend_deactivate: objects_store used after zend_objects_store_destroy is called) --SKIPIF-- <?php if (!extension_loaded("xml")) print "skip the xml extension not available"; ?> --FILE-- diff --git a/Zend/tests/bug34873.phpt b/Zend/tests/bug34873.phpt index 7d9eb78ab7..da11276458 100644 --- a/Zend/tests/bug34873.phpt +++ b/Zend/tests/bug34873.phpt @@ -22,6 +22,6 @@ $myPwa->test(); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(7) "myvalue" Done diff --git a/Zend/tests/bug35017.phpt b/Zend/tests/bug35017.phpt index 3cd28a3755..9944df55e0 100644 --- a/Zend/tests/bug35017.phpt +++ b/Zend/tests/bug35017.phpt @@ -10,7 +10,7 @@ try { echo "0\n"; } echo "?\n"; -} catch(Exception $e) { +} catch(Exception $e) { echo "This Exception should be caught\n"; } function errorHandler($errno, $errstr, $errfile, $errline, $vars) { diff --git a/Zend/tests/bug35239.phpt b/Zend/tests/bug35239.phpt index 869971e2a2..8a2ed501b6 100644 --- a/Zend/tests/bug35239.phpt +++ b/Zend/tests/bug35239.phpt @@ -2,7 +2,7 @@ Bug #35239 (Objects can lose references) --FILE-- <?php -$a = new stdClass; +$a = new stdClass; $a->x0 = new stdClass; $a->x0->y0 = 'a'; $a->x0->y1 =& $a->x0; diff --git a/Zend/tests/bug36513.phpt b/Zend/tests/bug36513.phpt index f46da4efc5..06cf5e416a 100644 --- a/Zend/tests/bug36513.phpt +++ b/Zend/tests/bug36513.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #36513 (comment will be outputed in last line) --FILE-- -<?php +<?php function test($s) { echo "'".trim(str_replace(" ", " ", htmlspecialchars_decode(strip_tags(highlight_string($s,1)))))."'\n"; } diff --git a/Zend/tests/bug37251.phpt b/Zend/tests/bug37251.phpt index 12d1e3d974..0e5ac8fd48 100644 --- a/Zend/tests/bug37251.phpt +++ b/Zend/tests/bug37251.phpt @@ -1,8 +1,8 @@ --TEST-- -Bug #37251 (deadlock when custom error handler is to catch array type hint error) +Bug #37251 (deadlock when custom error handler is to catch array type hint error) --FILE-- <?php -class Foo { +class Foo { function bar(array $foo) { } } diff --git a/Zend/tests/bug38624.phpt b/Zend/tests/bug38624.phpt index 322ccc7fb3..7e341ec0e7 100644 --- a/Zend/tests/bug38624.phpt +++ b/Zend/tests/bug38624.phpt @@ -25,7 +25,7 @@ $impl = new impl(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Uncaught Exception: doesn't work in %s:%d Stack trace: #0 %s(%d): impl->__get('counter') diff --git a/Zend/tests/bug38772.phpt b/Zend/tests/bug38772.phpt index 0e97c291c3..0be6457d72 100644 --- a/Zend/tests/bug38772.phpt +++ b/Zend/tests/bug38772.phpt @@ -3,11 +3,11 @@ Bug #38772 (inconsistent overriding of methods in different visibility contexts) --FILE-- <?php class A { - + public function __construct() { $this -> foo(); } - + private function foo() { echo __METHOD__ . "\r\n"; } @@ -19,7 +19,7 @@ class B extends A { } } -class C extends A { +class C extends A { protected function foo() { echo __METHOD__ . "\r\n"; } diff --git a/Zend/tests/bug38779.phpt b/Zend/tests/bug38779.phpt index 5ffe990a0c..2d0949714e 100644 --- a/Zend/tests/bug38779.phpt +++ b/Zend/tests/bug38779.phpt @@ -28,5 +28,5 @@ require 'Loader://qqq.php'; echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Parse error: %s error%sin Loader://qqq.php on line %d diff --git a/Zend/tests/bug38779_1.phpt b/Zend/tests/bug38779_1.phpt index 1cd25f90f3..2b69653eb0 100644 --- a/Zend/tests/bug38779_1.phpt +++ b/Zend/tests/bug38779_1.phpt @@ -47,6 +47,6 @@ if (file_exists($filename)) { @unlink(dirname(__FILE__)."/bug38779.txt"); } ?> ---EXPECTF-- +--EXPECTF-- Parse error: %s error%sin %s on line %d string(6) "close!" diff --git a/Zend/tests/bug39003.phpt b/Zend/tests/bug39003.phpt index 01761faa98..dc1c69e8c7 100644 --- a/Zend/tests/bug39003.phpt +++ b/Zend/tests/bug39003.phpt @@ -19,7 +19,7 @@ test($obj); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Uncaught TypeError: Argument 1 passed to test() must be an instance of OtherClassName, instance of ClassName given, called in %s on line %d and defined in %s:%d Stack trace: #0 %s(%d): test(Object(ClassName)) diff --git a/Zend/tests/bug39036.phpt b/Zend/tests/bug39036.phpt index 017012fddf..419810eaa1 100644 --- a/Zend/tests/bug39036.phpt +++ b/Zend/tests/bug39036.phpt @@ -13,7 +13,7 @@ var_dump($key); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Notice: Undefined variable: key in %s on line %d NULL Done diff --git a/Zend/tests/bug39127.phpt b/Zend/tests/bug39127.phpt index 2f5b0fd2bf..31fb6d27d5 100644 --- a/Zend/tests/bug39127.phpt +++ b/Zend/tests/bug39127.phpt @@ -3,17 +3,17 @@ Bug #39127 (Old-style constructor fallbacks produce strange results) --FILE-- <?php -class a { function a() { var_dump("a::a() called"); } } -class b extends a {} +class a { function a() { var_dump("a::a() called"); } } +class b extends a {} -$b = new b; +$b = new b; var_dump(is_callable(array($b,"a"))); var_dump(is_callable(array($b,"b"))); var_dump(is_callable(array($b,"__construct"))); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; a has a deprecated constructor in %s on line %d string(13) "a::a() called" bool(true) diff --git a/Zend/tests/bug39297.phpt b/Zend/tests/bug39297.phpt index 92f91a5557..36c0af7dbb 100644 --- a/Zend/tests/bug39297.phpt +++ b/Zend/tests/bug39297.phpt @@ -21,8 +21,8 @@ class MyTree implements ArrayAccess { $cannonicalName = strtolower($offset); $this->children[$cannonicalName] = $value; $value->parent = $this; - } - + } + public function offsetGet($offset) { echo "offsetGet()\n"; $cannonicalName = strtolower($offset); diff --git a/Zend/tests/bug39304.phpt b/Zend/tests/bug39304.phpt index 77da1a8bb8..4394cae1d4 100644 --- a/Zend/tests/bug39304.phpt +++ b/Zend/tests/bug39304.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #39304 (Segmentation fault with list unpacking of string offset) --FILE-- -<?php +<?php $s = ""; list($a, $b) = $s[0]; var_dump($a,$b); diff --git a/Zend/tests/bug39346.phpt b/Zend/tests/bug39346.phpt index 4a614c9e9a..bde88edb9d 100644 --- a/Zend/tests/bug39346.phpt +++ b/Zend/tests/bug39346.phpt @@ -6,12 +6,12 @@ class test { protected $_id; static $instances; - + public function __construct($id) { - $this->_id = $id; + $this->_id = $id; self::$instances[$this->_id] = $this; } - + function __destruct() { unset(self::$instances[$this->_id]); } diff --git a/Zend/tests/bug39438.phpt b/Zend/tests/bug39438.phpt index e1ed8e8866..ef985afd23 100644 --- a/Zend/tests/bug39438.phpt +++ b/Zend/tests/bug39438.phpt @@ -19,8 +19,8 @@ $test2=array( 'lastuploaddate' => 1088427240, 'dependencies' => array ( 'depends' => array( - 'typo3' =>'', - 'php' =>'', + 'typo3' =>'', + 'php' =>'', 'cms' => '' ), 'conflicts' => array('' =>'') @@ -34,7 +34,7 @@ $test2=array( ) ); $test=array(); -while($i<1200) { +while($i<1200) { $test[]=$test2; $i++; } diff --git a/Zend/tests/bug39721.phpt b/Zend/tests/bug39721.phpt index 63edfc23ed..aa0df793ff 100644 --- a/Zend/tests/bug39721.phpt +++ b/Zend/tests/bug39721.phpt @@ -5,18 +5,18 @@ Bug #39721 (Runtime inheritance causes data corruption) class test2 { private static $instances = 0; public $instance; - + public function __construct() { $this->instance = ++self::$instances; } - + } $foo = new test2(); if (is_object($foo)) { class test2_child extends test2 { - + } } diff --git a/Zend/tests/bug39825.phpt b/Zend/tests/bug39825.phpt index 791b329f71..a241e0de36 100644 --- a/Zend/tests/bug39825.phpt +++ b/Zend/tests/bug39825.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #39825 (foreach produces memory error) --FILE-- -<?php +<?php $array = array(1 => 2, "foo" => "bar"); $obj = (object)$array; foreach ($obj as $name => $value) { diff --git a/Zend/tests/bug39944.phpt b/Zend/tests/bug39944.phpt index 4249988ffd..d602a45b88 100644 --- a/Zend/tests/bug39944.phpt +++ b/Zend/tests/bug39944.phpt @@ -35,12 +35,12 @@ function addToArray(&$arr, $strToAdd) { } addToArray(getArray(), "xx1"); -$a = getArray(); +$a = getArray(); addToArray($a, "xx2"); $b = &$arrTheArray; addToArray($b, "xx3"); addToArray(getArray(), "xx4"); -$a = getArray(); +$a = getArray(); addToArray($a, "xx5"); echo "arrTheArray = " . print_r($arrTheArray, 1); @@ -51,7 +51,7 @@ class RefTest { function Add($strToAdd) { $this->addToArray($this->getArray(), $strToAdd); - } + } function &getArray() { if (!$this->arr) diff --git a/Zend/tests/bug39990.phpt b/Zend/tests/bug39990.phpt index d7545eeecb..9aa44cdbab 100644 --- a/Zend/tests/bug39990.phpt +++ b/Zend/tests/bug39990.phpt @@ -4,10 +4,10 @@ Bug #39990 (Cannot "foreach" over overloaded properties) <?php class Foo { public function __get($name) { - return array('Hello', 'World'); + return array('Hello', 'World'); } } - + $obj=new Foo(); foreach($obj->arr as $value) echo "$value\n"; diff --git a/Zend/tests/bug40509.phpt b/Zend/tests/bug40509.phpt index 65e32533ef..5b7dfa09c8 100644 --- a/Zend/tests/bug40509.phpt +++ b/Zend/tests/bug40509.phpt @@ -5,7 +5,7 @@ Bug #40509 (key() function changed behaviour if global array is used within func function foo() { global $arr; - + $c = $arr["v"]; foreach ($c as $v) {} } diff --git a/Zend/tests/bug40621.phpt b/Zend/tests/bug40621.phpt index 5ed16bd173..b56a28e58b 100644 --- a/Zend/tests/bug40621.phpt +++ b/Zend/tests/bug40621.phpt @@ -14,7 +14,7 @@ Foo::get(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Deprecated: Non-static method Foo::get() should not be called statically in %s on line %d Fatal error: Uncaught Error: Non-static method Foo::__construct() cannot be called statically in %s:%d diff --git a/Zend/tests/bug40784.phpt b/Zend/tests/bug40784.phpt index a103d4a01c..ac2b2331b2 100644 --- a/Zend/tests/bug40784.phpt +++ b/Zend/tests/bug40784.phpt @@ -18,7 +18,7 @@ $b = new B; echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; A has a deprecated constructor in %s on line %d I'm A I'm A diff --git a/Zend/tests/bug40815.phpt b/Zend/tests/bug40815.phpt index 5ca5fd8368..3386097523 100644 --- a/Zend/tests/bug40815.phpt +++ b/Zend/tests/bug40815.phpt @@ -14,5 +14,5 @@ set_exception_handler("ehandle::exh"); throw new Exception ("Whiii"); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- foo diff --git a/Zend/tests/bug40833.phpt b/Zend/tests/bug40833.phpt index c56ca4c3ba..625103a6c0 100644 --- a/Zend/tests/bug40833.phpt +++ b/Zend/tests/bug40833.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #40833 (Crash when using unset() on an ArrayAccess object retrieved via __get) +Bug #40833 (Crash when using unset() on an ArrayAccess object retrieved via __get) --FILE-- <?php class entity diff --git a/Zend/tests/bug41026.phpt b/Zend/tests/bug41026.phpt index f9ad1cec4e..e159ad36f6 100644 --- a/Zend/tests/bug41026.phpt +++ b/Zend/tests/bug41026.phpt @@ -20,7 +20,7 @@ try_class::main (); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- Done Warning: (Registered shutdown functions) Unable to call self::on_shutdown() - function does not exist in Unknown on line 0 diff --git a/Zend/tests/bug41075.phpt b/Zend/tests/bug41075.phpt index 3ce2ad6514..03cf3a42f3 100644 --- a/Zend/tests/bug41075.phpt +++ b/Zend/tests/bug41075.phpt @@ -26,6 +26,6 @@ try { echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(40) "Creating default object from empty value" Done diff --git a/Zend/tests/bug41209.phpt b/Zend/tests/bug41209.phpt index 5e61750fa7..3924f99ac8 100644 --- a/Zend/tests/bug41209.phpt +++ b/Zend/tests/bug41209.phpt @@ -38,7 +38,7 @@ var_dump(isset($cache[$id])); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Uncaught ErrorException: Undefined variable: id in %s:%d Stack trace: #0 %s(%d): env::errorHandler(8, '%s', '%s', 34, Array) diff --git a/Zend/tests/bug41351.phpt b/Zend/tests/bug41351.phpt index 62af6a0336..6e40669341 100644 --- a/Zend/tests/bug41351.phpt +++ b/Zend/tests/bug41351.phpt @@ -10,5 +10,5 @@ foreach($a[] as $b) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Cannot use [] for reading in %s on line %d diff --git a/Zend/tests/bug41351_2.phpt b/Zend/tests/bug41351_2.phpt index 7009eaa457..0a36189d74 100644 --- a/Zend/tests/bug41351_2.phpt +++ b/Zend/tests/bug41351_2.phpt @@ -10,5 +10,5 @@ foreach($a[]['test'] as $b) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Cannot use [] for reading in %s on line %d diff --git a/Zend/tests/bug41351_3.phpt b/Zend/tests/bug41351_3.phpt index 9cb23882c2..0137ff7920 100644 --- a/Zend/tests/bug41351_3.phpt +++ b/Zend/tests/bug41351_3.phpt @@ -10,5 +10,5 @@ foreach($a['test'][] as $b) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Cannot use [] for reading in %s on line %d diff --git a/Zend/tests/bug41421.phpt b/Zend/tests/bug41421.phpt index e223e6fc78..e4fa9447de 100644 --- a/Zend/tests/bug41421.phpt +++ b/Zend/tests/bug41421.phpt @@ -18,7 +18,7 @@ feof($fp); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: feof(): wrapper::stream_eof is not implemented! Assuming EOF in %s on line %d Fatal error: Uncaught Exception in %s:%d diff --git a/Zend/tests/bug41813.phpt b/Zend/tests/bug41813.phpt index 9a609d09c8..af73344f5d 100644 --- a/Zend/tests/bug41813.phpt +++ b/Zend/tests/bug41813.phpt @@ -8,7 +8,7 @@ $foo[0]->bar = "xyz"; echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Uncaught Error: Cannot use string offset as an object in %s:%d Stack trace: #0 {main} diff --git a/Zend/tests/bug41929.phpt b/Zend/tests/bug41929.phpt index c332aba2d4..736736d237 100644 --- a/Zend/tests/bug41929.phpt +++ b/Zend/tests/bug41929.phpt @@ -10,7 +10,7 @@ class C { foreach ($this as $k=>$v) { echo "$k: $v\n"; } - } + } } class D extends C { diff --git a/Zend/tests/bug41961.phpt b/Zend/tests/bug41961.phpt index 514265b601..5df08d94d1 100644 --- a/Zend/tests/bug41961.phpt +++ b/Zend/tests/bug41961.phpt @@ -3,26 +3,26 @@ Bug #41961 (Ensure search for hidden private methods does not stray from class h --FILE-- <?php X::test(); - + /** Class X is related to neither ParentClass nor ChildClass. */ class X { public static function test() { - $myChild = new ChildClass; + $myChild = new ChildClass; $myChild->secret(); // bug - invokes X::secret() instead of ChildClass::secret() } private function secret() { echo "Called private " . __METHOD__ . "() on an instance of: " . get_class($this) . "\n"; - } + } } - -class ParentClass { + +class ParentClass { private function secret() { } } - + class ChildClass extends ParentClass { public function secret() { echo "Called public " . __METHOD__ . "() on an instance of: " . get_class($this) . "\n"; - } + } } ?> --EXPECT-- diff --git a/Zend/tests/bug43201.phpt b/Zend/tests/bug43201.phpt index 53bb5ba98d..2ab26ca4b9 100644 --- a/Zend/tests/bug43201.phpt +++ b/Zend/tests/bug43201.phpt @@ -16,7 +16,7 @@ $c = new Foo(); $c->arr[0]["k"] = 1; $c->arr[0]["k2"] = $ref; for($cnt=0;$cnt<6;$cnt++) { - $ref = chop($undef); + $ref = chop($undef); $c->arr[$cnt]["k2"] = $ref; } echo "ok\n"; diff --git a/Zend/tests/bug43426.phpt b/Zend/tests/bug43426.phpt index 73c38df2ba..7364494dc1 100644 --- a/Zend/tests/bug43426.phpt +++ b/Zend/tests/bug43426.phpt @@ -32,7 +32,7 @@ $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c); -function foo2($d) {} +function foo2($d) {} echo "ok\n"; ?> --EXPECT-- diff --git a/Zend/tests/bug43450.phpt b/Zend/tests/bug43450.phpt index 223eb87442..549dfc91b9 100644 --- a/Zend/tests/bug43450.phpt +++ b/Zend/tests/bug43450.phpt @@ -16,7 +16,7 @@ class Foo $num_repeats = 100000; $start = memory_get_usage() / 1024; -for ($i=1;$i<$num_repeats;$i++) +for ($i=1;$i<$num_repeats;$i++) { $foo = new Foo(); md5($foo); diff --git a/Zend/tests/bug44653.phpt b/Zend/tests/bug44653.phpt index 1abf9747c7..28e1d8ef71 100644 --- a/Zend/tests/bug44653.phpt +++ b/Zend/tests/bug44653.phpt @@ -8,7 +8,7 @@ function fooBar() { echo __FUNCTION__ . PHP_EOL; } namespace B; class A { - static function fooBar() { echo "bag1\n"; } + static function fooBar() { echo "bag1\n"; } } class B { static function fooBar() { echo "bag2\n"; } diff --git a/Zend/tests/bug44899_2.phpt b/Zend/tests/bug44899_2.phpt index e98714929b..f3ff50604c 100644 --- a/Zend/tests/bug44899_2.phpt +++ b/Zend/tests/bug44899_2.phpt @@ -16,7 +16,7 @@ class myclass { return isset($this->_data[$field_name]); } - + function __get($var) { var_dump(empty($this->_data[$var])); return $this->_data[$var]; diff --git a/Zend/tests/bug45186.phpt b/Zend/tests/bug45186.phpt index bcf88a1897..411c2ea072 100644 --- a/Zend/tests/bug45186.phpt +++ b/Zend/tests/bug45186.phpt @@ -20,7 +20,7 @@ class bar { call_user_func(array('self', 'y')); call_user_func('self::y'); } - static function x() { + static function x() { print "ok\n"; } } diff --git a/Zend/tests/bug45186_2.phpt b/Zend/tests/bug45186_2.phpt index 9a707ace87..7c813a909c 100644 --- a/Zend/tests/bug45186_2.phpt +++ b/Zend/tests/bug45186_2.phpt @@ -16,7 +16,7 @@ class bar { call_user_func(array('self', 'y')); call_user_func('self::y'); } - static function x() { + static function x() { print "ok\n"; } } diff --git a/Zend/tests/bug45744.phpt b/Zend/tests/bug45744.phpt index 029efcfe63..c1e2a4841c 100644 --- a/Zend/tests/bug45744.phpt +++ b/Zend/tests/bug45744.phpt @@ -6,7 +6,7 @@ class Foo { public function __construct(array $data) { var_dump(array_map(array($this, 'callback'), $data)); } - + private function callback($value) { if (!is_array($value)) { return stripslashes($value); @@ -24,7 +24,7 @@ class Foo2 { public function __construct(array $data) { var_dump(array_map(array($this, 'callBack'), $data)); } - + private function callBack($value) { } } diff --git a/Zend/tests/bug45910.phpt b/Zend/tests/bug45910.phpt index 1041877fee..7f2ea8b205 100644 --- a/Zend/tests/bug45910.phpt +++ b/Zend/tests/bug45910.phpt @@ -14,7 +14,7 @@ class foo { self::CCC => 'b', self::DDD => self::AAA ); - + public static function test() { self::$foo; } diff --git a/Zend/tests/bug45910_2.phpt b/Zend/tests/bug45910_2.phpt index 68ca9a1176..dec6565c0e 100644 --- a/Zend/tests/bug45910_2.phpt +++ b/Zend/tests/bug45910_2.phpt @@ -14,7 +14,7 @@ class foo { self::CCC => 'b', self::DDD => 11 ); - + public static function test() { self::$foo; } diff --git a/Zend/tests/bug46196.phpt b/Zend/tests/bug46196.phpt index d4e62779e9..d8ecc721ad 100644 --- a/Zend/tests/bug46196.phpt +++ b/Zend/tests/bug46196.phpt @@ -7,7 +7,7 @@ Olivier Doucet /* Prototype : void restore_error_handler(void) * Description: Restores the previously defined error handler function * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing restore_error_handler() : error bug #46196 ***\n"; diff --git a/Zend/tests/bug46241.phpt b/Zend/tests/bug46241.phpt index 40ed7c8e8d..0626857554 100644 --- a/Zend/tests/bug46241.phpt +++ b/Zend/tests/bug46241.phpt @@ -33,7 +33,7 @@ function errorHandler1( $errno, $errstr ) } function errorHandler2( $errno, $errstr ) -{ +{ echo "Caught on second level: '$errstr'\n"; return true; } diff --git a/Zend/tests/bug46246.phpt b/Zend/tests/bug46246.phpt index a57222bf2a..12be587d74 100644 --- a/Zend/tests/bug46246.phpt +++ b/Zend/tests/bug46246.phpt @@ -8,7 +8,7 @@ class A { echo 'Hello from '.get_class($this)."\n"; } - + public function call($method, $args = array()) { $this->Test(); diff --git a/Zend/tests/bug46381.phpt b/Zend/tests/bug46381.phpt index bfe11cdf28..ce4e399284 100644 --- a/Zend/tests/bug46381.phpt +++ b/Zend/tests/bug46381.phpt @@ -13,7 +13,7 @@ $test->method(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Uncaught Error: Non-static method ArrayIterator::current() cannot be called statically in %s:%d Stack trace: #0 %s(%d): test->method() diff --git a/Zend/tests/bug46409.phpt b/Zend/tests/bug46409.phpt index 1986e88b10..79e82b5f81 100644 --- a/Zend/tests/bug46409.phpt +++ b/Zend/tests/bug46409.phpt @@ -4,7 +4,7 @@ Bug #46409 (__invoke method called outside of object context when using array_ma <?php class Callback { protected $val = 'hello, world'; - + public function __invoke() { return $this->val; } diff --git a/Zend/tests/bug46701.phpt b/Zend/tests/bug46701.phpt index e9cb99e77a..523a96735f 100644 --- a/Zend/tests/bug46701.phpt +++ b/Zend/tests/bug46701.phpt @@ -10,13 +10,13 @@ $test_array = array( 0xce331a00 => 2 ); $test_array[0xce359000] = 3; - + var_dump($test_array); var_dump($test_array[0xce331a00]); class foo { public $x; - + public function __construct() { $this->x[0xce359000] = 3; var_dump($this->x); diff --git a/Zend/tests/bug46813.phpt b/Zend/tests/bug46813.phpt index 91837db1ff..b1505fc07d 100644 --- a/Zend/tests/bug46813.phpt +++ b/Zend/tests/bug46813.phpt @@ -6,7 +6,7 @@ namespace test; { class inner { - + } } diff --git a/Zend/tests/bug47343.phpt b/Zend/tests/bug47343.phpt index b0b7977beb..bf1a5d2b31 100644 --- a/Zend/tests/bug47343.phpt +++ b/Zend/tests/bug47343.phpt @@ -8,7 +8,7 @@ class A { gc_collect_cycles(); } - + public function getB() { $this->data['foo'] = new B($this); diff --git a/Zend/tests/bug47353.phpt b/Zend/tests/bug47353.phpt index aafce9b944..189b1f51a6 100644 --- a/Zend/tests/bug47353.phpt +++ b/Zend/tests/bug47353.phpt @@ -22,5 +22,5 @@ $a = new A(); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- Done diff --git a/Zend/tests/bug47593.phpt b/Zend/tests/bug47593.phpt index 98aa19a91c..ffbe7c8dbb 100644 --- a/Zend/tests/bug47593.phpt +++ b/Zend/tests/bug47593.phpt @@ -12,7 +12,7 @@ class foo { } interface baz { -} +} function bar() { } diff --git a/Zend/tests/bug47771.phpt b/Zend/tests/bug47771.phpt index a17fcf3b58..c4350b9d95 100644 --- a/Zend/tests/bug47771.phpt +++ b/Zend/tests/bug47771.phpt @@ -7,21 +7,21 @@ function throw_exc() { } class Test { - + public function __construct() { echo 'Constr' ."\n"; } - + public function __destruct() { echo 'Destr' ."\n"; } - + } try { - + $T =new Test(throw_exc()); - + } catch( Exception $e) { echo 'Exception: ' . $e->getMessage() . "\n"; } diff --git a/Zend/tests/bug48215_2.phpt b/Zend/tests/bug48215_2.phpt index 458e68144f..67380063c6 100644 --- a/Zend/tests/bug48215_2.phpt +++ b/Zend/tests/bug48215_2.phpt @@ -7,7 +7,7 @@ class a { public function a() { echo __METHOD__ . "\n"; } } class b extends a {} -class c extends b { +class c extends b { function __construct() { b::b(); } diff --git a/Zend/tests/bug48409.phpt b/Zend/tests/bug48409.phpt index 238b52ed74..7ba99cdbf4 100644 --- a/Zend/tests/bug48409.phpt +++ b/Zend/tests/bug48409.phpt @@ -15,7 +15,7 @@ class BBB return array('foo' => 'xyz'); } } - + class CCC { public function process($p) diff --git a/Zend/tests/bug48533.phpt b/Zend/tests/bug48533.phpt index 3b4777884e..4fa49a2f22 100644 --- a/Zend/tests/bug48533.phpt +++ b/Zend/tests/bug48533.phpt @@ -5,7 +5,7 @@ Bug #48533 (__callStatic is not invoked for private/protected methods) class foo { private function a() { - var_dump(1); + var_dump(1); } public function b() { var_dump(2); diff --git a/Zend/tests/bug48770.phpt b/Zend/tests/bug48770.phpt index a69838aa6d..6ae972a7ab 100644 --- a/Zend/tests/bug48770.phpt +++ b/Zend/tests/bug48770.phpt @@ -4,7 +4,7 @@ Bug #48770 (call_user_func_array() fails to call parent from inheriting class) See Bug #48770 --FILE-- <?php - + class A { public function func($str) { var_dump(__METHOD__ .': '. $str); @@ -13,22 +13,22 @@ class A { var_dump(__METHOD__ .': '. $str); } protected function func3($str) { - var_dump(__METHOD__ .': '. $str); + var_dump(__METHOD__ .': '. $str); } private function func22($str) { - var_dump(__METHOD__ .': '. $str); + var_dump(__METHOD__ .': '. $str); } } class B extends A { public function func($str) { static $avoid_crash = 0; - + if ($avoid_crash++ == 1) { print "This method shouldn't be called when using parent::func!\n"; return; } - + call_user_func_array(array($this, 'parent::func'), array($str)); } private function func2($str) { diff --git a/Zend/tests/bug48770_2.phpt b/Zend/tests/bug48770_2.phpt index 54ce92fa61..d7984eac4f 100644 --- a/Zend/tests/bug48770_2.phpt +++ b/Zend/tests/bug48770_2.phpt @@ -4,7 +4,7 @@ Bug #48770 (call_user_func_array() fails to call parent from inheriting class) See Bug #48770 --FILE-- <?php - + class A { public function func($str) { var_dump(__METHOD__ .': '. $str); @@ -13,10 +13,10 @@ class A { var_dump(__METHOD__ .': '. $str); } protected function func3($str) { - var_dump(__METHOD__ .': '. $str); + var_dump(__METHOD__ .': '. $str); } private function func22($str) { - var_dump(__METHOD__ .': '. $str); + var_dump(__METHOD__ .': '. $str); } } diff --git a/Zend/tests/bug48770_3.phpt b/Zend/tests/bug48770_3.phpt index 43311df533..5c6eacb470 100644 --- a/Zend/tests/bug48770_3.phpt +++ b/Zend/tests/bug48770_3.phpt @@ -4,7 +4,7 @@ Bug #48770 (call_user_func_array() fails to call parent from inheriting class) See Bug #48770 --FILE-- <?php - + class A { public function func($str) { var_dump(__METHOD__ .': '. $str); @@ -13,10 +13,10 @@ class A { var_dump(__METHOD__ .': '. $str); } protected function func3($str) { - var_dump(__METHOD__ .': '. $str); + var_dump(__METHOD__ .': '. $str); } private function func22($str) { - var_dump(__METHOD__ .': '. $str); + var_dump(__METHOD__ .': '. $str); } } diff --git a/Zend/tests/bug49472.phpt b/Zend/tests/bug49472.phpt index 1803d1848c..2d7ae514f2 100644 --- a/Zend/tests/bug49472.phpt +++ b/Zend/tests/bug49472.phpt @@ -14,7 +14,7 @@ class Foo implements ia { class FooBar extends Foo implements ia { const x = 1; const c = 'Ocean'; - + public function show() { return ia::c; } diff --git a/Zend/tests/bug49908.phpt b/Zend/tests/bug49908.phpt index 6999b9e0aa..2f33080258 100644 --- a/Zend/tests/bug49908.phpt +++ b/Zend/tests/bug49908.phpt @@ -5,7 +5,7 @@ Bug #49908 (throwing exception in __autoload crashes when interface is not defin spl_autoload_register(function ($className) { var_dump($className); - + if ($className == 'Foo') { class Foo implements Bar {}; } else { diff --git a/Zend/tests/bug50261.phpt b/Zend/tests/bug50261.phpt index ce120b9416..321e9cfb8b 100644 --- a/Zend/tests/bug50261.phpt +++ b/Zend/tests/bug50261.phpt @@ -12,12 +12,12 @@ class testClass { class testClass2 extends testClass { function __construct() { static $x = 0; - + if ($x) { print "Infinite loop...\n"; } else { $x++; - + parent::__construct(1); testclass::__construct(2); call_user_func(array('parent', '__construct'), 3); diff --git a/Zend/tests/bug50394.phpt b/Zend/tests/bug50394.phpt index e6069d3666..4e6c9761dd 100644 --- a/Zend/tests/bug50394.phpt +++ b/Zend/tests/bug50394.phpt @@ -17,7 +17,7 @@ $proxy = new Proxy; call_user_func_array( array( $proxy, 'bar' ), $args ); call_user_func_array( array( $proxy, 'bar' ), array(&$arg) ); var_dump($arg); ---EXPECT-- +--EXPECT-- bar called! bar called! int(3) diff --git a/Zend/tests/bug50810.phpt b/Zend/tests/bug50810.phpt index 8b4d7190eb..b2a2931651 100644 --- a/Zend/tests/bug50810.phpt +++ b/Zend/tests/bug50810.phpt @@ -7,31 +7,31 @@ class ExampleSuperClass { private $foo; static protected $bar; - + private function foo() { } - + public function propertyFooExists() { return property_exists($this, 'foo'); } - + } - + class ExampleSubClass extends ExampleSuperClass { public function methodExists() { return method_exists($this, 'foo'); } - + public function propertyBarExists() { return property_exists($this, 'bar'); } } - + $example = new ExampleSubClass(); var_dump($example->methodExists()); var_dump(method_exists($example, 'propertyFooExists')); diff --git a/Zend/tests/bug51176.phpt b/Zend/tests/bug51176.phpt index 1b0e285c64..272ba1286f 100644 --- a/Zend/tests/bug51176.phpt +++ b/Zend/tests/bug51176.phpt @@ -10,12 +10,12 @@ class Foo static::bar(); Foo::bar(); } - + public function __call($n, $a) { echo "instance\n"; } - + public static function __callStatic($n, $a) { echo "static\n"; diff --git a/Zend/tests/bug51822.phpt b/Zend/tests/bug51822.phpt index cffae7bb1a..c097395283 100644 --- a/Zend/tests/bug51822.phpt +++ b/Zend/tests/bug51822.phpt @@ -7,14 +7,14 @@ class DestructableObject public function __destruct() { echo "2\n"; - } + } } class DestructorCreator { public function __destruct() { - $this->test = new DestructableObject; + $this->test = new DestructableObject; echo "1\n"; } } diff --git a/Zend/tests/bug52484.phpt b/Zend/tests/bug52484.phpt index 1d2c2d7cdc..b8202a4504 100644 --- a/Zend/tests/bug52484.phpt +++ b/Zend/tests/bug52484.phpt @@ -3,7 +3,7 @@ Bug #52484 (__set() ignores setting properties with empty names) --FILE-- <?php -class A { +class A { function __unset($prop) { unset($this->$prop); } diff --git a/Zend/tests/bug52484_3.phpt b/Zend/tests/bug52484_3.phpt index 408dd453fd..995e624dfc 100644 --- a/Zend/tests/bug52484_3.phpt +++ b/Zend/tests/bug52484_3.phpt @@ -3,7 +3,7 @@ Bug #52484.3 (__set() ignores setting properties with empty names) --FILE-- <?php -class A { +class A { function __get($prop) { var_dump($this->$prop); } diff --git a/Zend/tests/bug52614.phpt b/Zend/tests/bug52614.phpt index d220881679..0a1dca6882 100644 --- a/Zend/tests/bug52614.phpt +++ b/Zend/tests/bug52614.phpt @@ -8,7 +8,7 @@ class foo { public $a3; public $o1; public $o2; - + public function f1() { return $this->a1; } diff --git a/Zend/tests/bug52940.phpt b/Zend/tests/bug52940.phpt index f8d31c0dbe..51137c091e 100644 --- a/Zend/tests/bug52940.phpt +++ b/Zend/tests/bug52940.phpt @@ -4,7 +4,7 @@ Bug #52940 (call_user_func_array still allows call-time pass-by-reference) <?php function foo($a) { $a++; - var_dump($a); + var_dump($a); } function bar(&$a) { $a++; diff --git a/Zend/tests/bug53632.phpt b/Zend/tests/bug53632.phpt index 74dfb5c5a3..2b62f30dbf 100644 --- a/Zend/tests/bug53632.phpt +++ b/Zend/tests/bug53632.phpt @@ -6,5 +6,5 @@ $d = 2.2250738585072011e-308; echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- Done diff --git a/Zend/tests/bug54910.phpt b/Zend/tests/bug54910.phpt index 8808cd0609..a63f10fa7f 100644 --- a/Zend/tests/bug54910.phpt +++ b/Zend/tests/bug54910.phpt @@ -6,14 +6,14 @@ class A { public function __call($method, $args) { if (stripos($method, 'get') === 0) { return $this->get(); - } + } die("No such method - '$method'\n"); } protected function get() { $class = get_class($this); $call = array($class, 'noSuchMethod'); - + if (is_callable($call)) { call_user_func($call); } diff --git a/Zend/tests/bug55007.phpt b/Zend/tests/bug55007.phpt index c3fb3c47f9..fe8dfb3dcb 100644 --- a/Zend/tests/bug55007.phpt +++ b/Zend/tests/bug55007.phpt @@ -14,7 +14,7 @@ function shutdown() { register_shutdown_function('shutdown'); - + new CompileErrorClass(); ?> diff --git a/Zend/tests/bug55156.phpt b/Zend/tests/bug55156.phpt index fcd602cacf..53cdf1337a 100644 --- a/Zend/tests/bug55156.phpt +++ b/Zend/tests/bug55156.phpt @@ -8,23 +8,23 @@ opcache.save_comments=1 /** test */ namespace foo { function test() { } - + $x = new \ReflectionFunction('foo\test'); - var_dump($x->getDocComment()); - + var_dump($x->getDocComment()); + /** test1 */ class bar { } - + /** test2 */ class foo extends namespace\bar { } - + $x = new \ReflectionClass('foo\bar'); var_dump($x->getDocComment()); - + $x = new \ReflectionClass('foo\foo'); var_dump($x->getDocComment()); } - + ?> --EXPECT-- bool(false) diff --git a/Zend/tests/bug55247.phpt b/Zend/tests/bug55247.phpt index 6fa893f892..8c21019abd 100644 --- a/Zend/tests/bug55247.phpt +++ b/Zend/tests/bug55247.phpt @@ -7,7 +7,7 @@ class Test{ { echo $method . PHP_EOL; } - public function __call($method, $arguments) + public function __call($method, $arguments) { echo $method . PHP_EOL; } diff --git a/Zend/tests/bug55578.phpt b/Zend/tests/bug55578.phpt index 4a8604a23b..b67d3824e0 100644 --- a/Zend/tests/bug55578.phpt +++ b/Zend/tests/bug55578.phpt @@ -1,14 +1,14 @@ --TEST-- Bug #55578 (Segfault on implode/concat) --FILE-- -<?php +<?php $options = array(); class Foo { public function __toString() { return 'Foo'; } -} +} function test($options, $queryPart) { return ''. (0 ? 1 : $queryPart); diff --git a/Zend/tests/bug60536_002.phpt b/Zend/tests/bug60536_002.phpt index eee24ec83f..a69b33acff 100644 --- a/Zend/tests/bug60536_002.phpt +++ b/Zend/tests/bug60536_002.phpt @@ -4,7 +4,7 @@ The same rules are applied for properties that are defined in the class hierarch <?php class Base { - private $hello; + private $hello; } trait THello1 { @@ -30,7 +30,7 @@ echo "POST-CLASS-GUARD2\n"; $t = new TraitsTest; $t->hello = "foo"; ?> ---EXPECTF-- +--EXPECTF-- PRE-CLASS-GUARD POST-CLASS-GUARD diff --git a/Zend/tests/bug60536_003.phpt b/Zend/tests/bug60536_003.phpt index 4088f16340..3ba23b9288 100644 --- a/Zend/tests/bug60536_003.phpt +++ b/Zend/tests/bug60536_003.phpt @@ -30,7 +30,7 @@ $b = new SubclassB; var_dump($b); ?> ---EXPECTF-- +--EXPECTF-- object(SubclassA)#%d (2) { ["hello":"SubclassA":private]=> int(0) diff --git a/Zend/tests/bug60536_004.phpt b/Zend/tests/bug60536_004.phpt index a78cecc30f..3a81b704c8 100644 --- a/Zend/tests/bug60536_004.phpt +++ b/Zend/tests/bug60536_004.phpt @@ -4,7 +4,7 @@ Introducing new private variables of the same name in a subclass is ok, and does <?php class Base { - private $hello; + private $hello; } trait THello1 { @@ -28,7 +28,7 @@ class Notice extends Base { } echo "POST-CLASS-GUARD2\n"; ?> ---EXPECT-- +--EXPECT-- PRE-CLASS-GUARD POST-CLASS-GUARD POST-CLASS-GUARD2 diff --git a/Zend/tests/bug60536_005.phpt b/Zend/tests/bug60536_005.phpt index c007e0ae18..6434e450ba 100644 --- a/Zend/tests/bug60536_005.phpt +++ b/Zend/tests/bug60536_005.phpt @@ -4,7 +4,7 @@ Introducing new private variables of the same name in a subclass is ok, and does <?php class Base { - protected $hello; + protected $hello; } trait THello1 { @@ -27,7 +27,7 @@ class Notice extends Base { } echo "POST-CLASS-GUARD2\n"; ?> ---EXPECT-- +--EXPECT-- PRE-CLASS-GUARD POST-CLASS-GUARD POST-CLASS-GUARD2 diff --git a/Zend/tests/bug61011.phpt b/Zend/tests/bug61011.phpt index 1e91a55078..dc0aca64f8 100644 --- a/Zend/tests/bug61011.phpt +++ b/Zend/tests/bug61011.phpt @@ -6,7 +6,7 @@ spl_autoload_register(function ($name) { throw new Exception($name); }); -try { +try { echo AAA::$a; //zend_fetch_var_address_helper } catch (Exception $e) { try { @@ -22,7 +22,7 @@ try { isset(AAAA::$a); // ZEND_ISSET_ISEMPTY_VAR } catch (Exception $e) { try { - $a = array("AAA", "foo"); + $a = array("AAA", "foo"); $a(); //ZEND_INIT_FCALL_BY_NAME } catch (Exception $e) { } diff --git a/Zend/tests/bug61681.phpt b/Zend/tests/bug61681.phpt index acc0275398..00a23e97d7 100644 --- a/Zend/tests/bug61681.phpt +++ b/Zend/tests/bug61681.phpt @@ -4,7 +4,7 @@ Bug #61681: Malformed grammar <?php $la = "ooxx"; -echo "${substr('laruence', 0, 2)}"; +echo "${substr('laruence', 0, 2)}"; ?> --EXPECT-- diff --git a/Zend/tests/bug62358.phpt b/Zend/tests/bug62358.phpt index 8509383d46..97381c3403 100644 --- a/Zend/tests/bug62358.phpt +++ b/Zend/tests/bug62358.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #62358 (Segfault when using traits a lot) --FILE-- -<?php +<?php trait T { public function foo() { @@ -19,7 +19,7 @@ abstract class A implements I{ class B extends A { public function foo($var) { - } + } } ?> --EXPECTF-- diff --git a/Zend/tests/bug62441.phpt b/Zend/tests/bug62441.phpt index 3299f4967d..fba76cb290 100644 --- a/Zend/tests/bug62441.phpt +++ b/Zend/tests/bug62441.phpt @@ -11,7 +11,7 @@ namespace ns { class Foo implements \Iface { function method(stdClass $o) { } } - + (new Foo)->method(new \stdClass); } ?> diff --git a/Zend/tests/bug62763.phpt b/Zend/tests/bug62763.phpt index 50c27bdf35..e74438dca6 100644 --- a/Zend/tests/bug62763.phpt +++ b/Zend/tests/bug62763.phpt @@ -4,16 +4,16 @@ Bug #62763 (register_shutdown_function and extending class) <?php class test1 { public function __construct() { - register_shutdown_function(array($this, 'shutdown')); + register_shutdown_function(array($this, 'shutdown')); } - public function shutdown() { + public function shutdown() { exit(__METHOD__); } } class test2 extends test1 { - public function __destruct() { - exit (__METHOD__); + public function __destruct() { + exit (__METHOD__); } } new test1; diff --git a/Zend/tests/bug62892.phpt b/Zend/tests/bug62892.phpt index db25c83466..b4fb88f858 100644 --- a/Zend/tests/bug62892.phpt +++ b/Zend/tests/bug62892.phpt @@ -2,7 +2,7 @@ Bug #62892 (ReflectionClass::getTraitAliases crashes on importing trait methods as private) --FILE-- <?php - + trait myTrait { public function run() {} } diff --git a/Zend/tests/bug62907.phpt b/Zend/tests/bug62907.phpt index c47c34bbe7..81aa5b225c 100644 --- a/Zend/tests/bug62907.phpt +++ b/Zend/tests/bug62907.phpt @@ -6,10 +6,10 @@ spl_autoload_register(function ($name) { if ($name == "B") { eval ("abstract class B extends A { }"); } else if ($name == "A") { - eval ("abstract class A { use T { T::__construct as __asconstruct; }}"); + eval ("abstract class A { use T { T::__construct as __asconstruct; }}"); } else if ($name == "T") { - eval ("trait T { public function __construct() { } }"); - } + eval ("trait T { public function __construct() { } }"); + } return TRUE; }); diff --git a/Zend/tests/bug63635.phpt b/Zend/tests/bug63635.phpt index a72d3dd31d..035588b295 100644 --- a/Zend/tests/bug63635.phpt +++ b/Zend/tests/bug63635.phpt @@ -5,17 +5,17 @@ Bug #63635 (Segfault in gc_collect_cycles) class Node { public $parent = NULL; public $children = array(); - + function __construct(Node $parent=NULL) { if ($parent) { $parent->children[] = $this; } $this->children[] = $this; } - + function __destruct() { $this->children = NULL; - } + } } define("MAX", 16); diff --git a/Zend/tests/bug64354.phpt b/Zend/tests/bug64354.phpt index 737b2fd46a..3746c1fef8 100644 --- a/Zend/tests/bug64354.phpt +++ b/Zend/tests/bug64354.phpt @@ -16,7 +16,7 @@ $data = array(new B); try { serialize($data); -} catch (Exception $e) { +} catch (Exception $e) { var_dump($e->getMessage()); } ?> diff --git a/Zend/tests/bug64555.phpt b/Zend/tests/bug64555.phpt index d5226af7a9..23bfd4a5e9 100644 --- a/Zend/tests/bug64555.phpt +++ b/Zend/tests/bug64555.phpt @@ -2,14 +2,14 @@ Bug #64555: Array key within interned string gets wrong hash value --FILE-- <?php - + class Foo { protected $unsetme = 1; protected $keepme = 2; - + public function test() { $a = get_object_vars($this); - + foreach ($a as $k => $v) { if ($k == 'unsetme') { echo "Unsetting: $k\n"; @@ -20,14 +20,14 @@ class Foo { $a['keepme'] = 43; } } - + var_dump($a, array_keys($a)); } } - + $f = new Foo; $f->test(); - + ?> --EXPECT-- Unsetting: unsetme diff --git a/Zend/tests/bug64720.phpt b/Zend/tests/bug64720.phpt index efe3379bd4..cbc5f3b01f 100644 --- a/Zend/tests/bug64720.phpt +++ b/Zend/tests/bug64720.phpt @@ -10,7 +10,7 @@ class Stat { } return self::$requests[1]; } - + public function __destruct() { unset(self::$requests[1]); } diff --git a/Zend/tests/bug64896.phpt b/Zend/tests/bug64896.phpt index 3ff4a2167d..59c59b7fe2 100644 --- a/Zend/tests/bug64896.phpt +++ b/Zend/tests/bug64896.phpt @@ -29,7 +29,7 @@ gc_disable(); unserialize(serialize($foo)); gc_collect_cycles(); -var_dump($bar); +var_dump($bar); gc_enable(); /* will output: object(bad)#4 (1) { diff --git a/Zend/tests/bug64960.phpt b/Zend/tests/bug64960.phpt index cf36fef6da..52af0bbe32 100644 --- a/Zend/tests/bug64960.phpt +++ b/Zend/tests/bug64960.phpt @@ -21,7 +21,7 @@ set_error_handler(function() { $e = new Exception; $e->_trace = debug_backtrace(); - + throw $e; }); diff --git a/Zend/tests/bug65372.phpt b/Zend/tests/bug65372.phpt index 50fc2dbb1b..1fd419e94d 100644 --- a/Zend/tests/bug65372.phpt +++ b/Zend/tests/bug65372.phpt @@ -10,7 +10,7 @@ class ParentClass public static function Get() { self::$_OBJECTS[1] = new ChildClass(); - return self::$_OBJECTS[1]; + return self::$_OBJECTS[1]; } } diff --git a/Zend/tests/bug66252.phpt b/Zend/tests/bug66252.phpt index e692a8e706..93f6253a55 100644 --- a/Zend/tests/bug66252.phpt +++ b/Zend/tests/bug66252.phpt @@ -8,7 +8,7 @@ class A { class B extends A { const BHW = parent::HW . " extended by B"; } -const C = B::BHW; +const C = B::BHW; echo C, "\n"; --EXPECT-- this is A extended by B diff --git a/Zend/tests/bug66286.phpt b/Zend/tests/bug66286.phpt index 457e282402..d5b9bd7161 100644 --- a/Zend/tests/bug66286.phpt +++ b/Zend/tests/bug66286.phpt @@ -5,10 +5,10 @@ Bug #66286: Incorrect object comparison with inheritance abstract class first { protected $someArray = array(); -} +} -class second extends first { - protected $someArray = array(); +class second extends first { + protected $someArray = array(); protected $someValue = null; public function __construct($someValue) { @@ -16,10 +16,10 @@ class second extends first { } } -$objFirst = new second('123'); -$objSecond = new second('321'); +$objFirst = new second('123'); +$objSecond = new second('321'); -var_dump ($objFirst == $objSecond); +var_dump ($objFirst == $objSecond); ?> --EXPECT-- diff --git a/Zend/tests/bug68118.phpt b/Zend/tests/bug68118.phpt index c56e70a112..a485b11dbf 100644 --- a/Zend/tests/bug68118.phpt +++ b/Zend/tests/bug68118.phpt @@ -8,7 +8,7 @@ set_error_handler(function() { $obj->test = 'meow'; return true; }); - + $a = new stdClass; $a->undefined .= 'test'; var_dump($a); diff --git a/Zend/tests/bug68797.phpt b/Zend/tests/bug68797.phpt index c192ebd415..db0306049f 100644 --- a/Zend/tests/bug68797.phpt +++ b/Zend/tests/bug68797.phpt @@ -5,9 +5,9 @@ precision=17 --FILE-- <?php -echo 2.2250738585072012e-308, "\n"; +echo 2.2250738585072012e-308, "\n"; ?> ==DONE== ---EXPECT-- +--EXPECT-- 2.2250738585072014E-308 ==DONE== diff --git a/Zend/tests/bug69167.phpt b/Zend/tests/bug69167.phpt index 79326ed583..cae3528406 100644 --- a/Zend/tests/bug69167.phpt +++ b/Zend/tests/bug69167.phpt @@ -5,10 +5,10 @@ Bug #69167 (call_user_func does not support references anymore) function l($m) { echo $m . "\n"; } - + $cb = 'l'; call_user_func($cb, 'hi'); - + $cb2 = &$cb; call_user_func($cb2, 'hi2'); ?> diff --git a/Zend/tests/bug69676_2.phpt b/Zend/tests/bug69676_2.phpt index 6ec3d499e5..4c5036ad96 100644 --- a/Zend/tests/bug69676_2.phpt +++ b/Zend/tests/bug69676_2.phpt @@ -7,7 +7,7 @@ class Foo { const A = 'Foo::A'; const B = self::A . ' and ' . self::C; const C = 'Foo::C'; - + } class Bar extends Foo { diff --git a/Zend/tests/bug69732.phpt b/Zend/tests/bug69732.phpt index 8d5fccd712..06dd5389dd 100644 --- a/Zend/tests/bug69732.phpt +++ b/Zend/tests/bug69732.phpt @@ -4,17 +4,17 @@ Bug #69732 (can induce segmentation fault with basic php code) <?php class wpq { private $unreferenced; - + public function __get($name) { return $this->$name . "XXX"; } } - + function ret_assoc() { $x = "XXX"; return array('foo' => 'bar', $x); } - + $wpq = new wpq; $wpq->interesting =& ret_assoc(); $x = $wpq->interesting; diff --git a/Zend/tests/bug70124.phpt b/Zend/tests/bug70124.phpt index 3138430b8f..f32a8613fe 100644 --- a/Zend/tests/bug70124.phpt +++ b/Zend/tests/bug70124.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #70124 (null ptr deref / seg fault in ZEND_HANDLE_EXCEPTION_SPEC_HANDLER) --FILE-- -<?php +<?php try { echo base_convert([array_search(chr(48),chr(48),chr(48),chr(48),chr(48),$f("test"))],chr(48)); diff --git a/Zend/tests/bug70805_1.phpt b/Zend/tests/bug70805_1.phpt index 51595668a1..035ec6884f 100644 --- a/Zend/tests/bug70805_1.phpt +++ b/Zend/tests/bug70805_1.phpt @@ -26,7 +26,7 @@ $a->b->a = $a; $i = 0; $c = new A; -$array = array($c); +$array = array($c); unset($c); while ($i++ < 9998) { diff --git a/Zend/tests/bug70898.phpt b/Zend/tests/bug70898.phpt index 41777072cc..e31ee894bf 100644 --- a/Zend/tests/bug70898.phpt +++ b/Zend/tests/bug70898.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #70895 null ptr deref and segfault with crafted callable --FILE-- -<?php +<?php function m($f,$a){ return array_map($f,0); } diff --git a/Zend/tests/bug70997.phpt b/Zend/tests/bug70997.phpt index bdb3377c74..119eb6cbbe 100644 --- a/Zend/tests/bug70997.phpt +++ b/Zend/tests/bug70997.phpt @@ -4,7 +4,7 @@ Bug #70997 (When using parentClass:: instead of parent::, static context changed <?php class A { const TEST = false; - + public function test() { var_dump(static::TEST); @@ -13,7 +13,7 @@ class A { class B extends A { const TEST = true; - + public function test() { A::test(); diff --git a/Zend/tests/bug71163.phpt b/Zend/tests/bug71163.phpt index 2f6cbd5a45..f87b951480 100644 --- a/Zend/tests/bug71163.phpt +++ b/Zend/tests/bug71163.phpt @@ -2,7 +2,7 @@ Bug #71163 (Segmentation Fault (cleanup_unfinished_calls)) --FILE-- <?php -spl_autoload_register(function ($name) { +spl_autoload_register(function ($name) { eval ("class $name extends Exception { public static function foo() {}}"); throw new Exception("boom"); }); diff --git a/Zend/tests/bug71221.phpt b/Zend/tests/bug71221.phpt index e735302d9e..0f6ee16946 100644 --- a/Zend/tests/bug71221.phpt +++ b/Zend/tests/bug71221.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #71221 (Null pointer deref (segfault) in get_defined_vars via ob_start) --FILE-- -<?php +<?php ob_start("get_defined_vars"); ob_end_clean(); ?> diff --git a/Zend/tests/bug72543.phpt b/Zend/tests/bug72543.phpt index 4244b8ce41..a826b1d6fb 100644 --- a/Zend/tests/bug72543.phpt +++ b/Zend/tests/bug72543.phpt @@ -6,20 +6,20 @@ function create_references(&$array) { foreach ($array as $key => $value) { create_references($array[$key]); } -} +} function change_copy($copy) { $copy['b']['z']['z'] = $copy['b']; -} +} $data = [ 'a' => [ 'b' => [], ], -]; - +]; + create_references($data); - + $copy = $data['a']; var_dump($copy); diff --git a/Zend/tests/bug72813.phpt b/Zend/tests/bug72813.phpt index 85ba066adb..fd1d98508c 100644 --- a/Zend/tests/bug72813.phpt +++ b/Zend/tests/bug72813.phpt @@ -10,13 +10,13 @@ class Test { return $this->props[$prop]; } - + public function __set($prop, $value) { if ($prop === 'b') $value = [$value]; $this->props[$prop] = $value; } - + public function getProperties() { return [$this->props]; diff --git a/Zend/tests/bug74084.phpt b/Zend/tests/bug74084.phpt index b27bbb4647..2e65471bcc 100644 --- a/Zend/tests/bug74084.phpt +++ b/Zend/tests/bug74084.phpt @@ -4,15 +4,15 @@ Bug #74084 (Out of bound read - zend_mm_alloc_small) error_reporting=0 --FILE-- <?php -$$A += $$B->a = &$$C; +$$A += $$B->a = &$$C; unset($$A); -$$A -= $$B->a = &$$C; +$$A -= $$B->a = &$$C; unset($$A); -$$A *= $$B->a = &$$C; +$$A *= $$B->a = &$$C; unset($$A); -$$A /= $$B->a = &$$C; +$$A /= $$B->a = &$$C; unset($$A); -$$A **= $$B->a = &$$C; +$$A **= $$B->a = &$$C; var_dump($$A); ?> --EXPECT-- diff --git a/Zend/tests/bug74408.phpt b/Zend/tests/bug74408.phpt index fea4a77572..e770a51dc8 100644 --- a/Zend/tests/bug74408.phpt +++ b/Zend/tests/bug74408.phpt @@ -9,7 +9,7 @@ Bug #74408 (Endless loop bypassing execution time limit) $bla = new NonExistingClass2(); } - public function exception_handler(Error $e) { + public function exception_handler(Error $e) { echo "Caught, exception: " . $e->getMessage(); } } diff --git a/Zend/tests/bug74546.phpt b/Zend/tests/bug74546.phpt index 9c1582ad4f..2efa790766 100644 --- a/Zend/tests/bug74546.phpt +++ b/Zend/tests/bug74546.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #74546 (SIGILL in ZEND_FETCH_CLASS_CONSTANT_SPEC_CONST_CONST_HANDLER()) --FILE-- -<?php +<?php "000000"[0]::d; ?> --EXPECTF-- diff --git a/Zend/tests/bug74947.phpt b/Zend/tests/bug74947.phpt index 1dd91efb9b..4119d3dd3a 100644 --- a/Zend/tests/bug74947.phpt +++ b/Zend/tests/bug74947.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #74947 (Segfault in scanner on INF number) --FILE-- -<?php +<?php echo 200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000; diff --git a/Zend/tests/bug75079_2.phpt b/Zend/tests/bug75079_2.phpt index 6e0b1cd27f..92518555b4 100644 --- a/Zend/tests/bug75079_2.phpt +++ b/Zend/tests/bug75079_2.phpt @@ -6,7 +6,7 @@ Bug #75079 variation without traits class Foo { private static $bar = 123; - + static function test(){ return function(){ return function(){ @@ -22,7 +22,7 @@ $f = Foo::test(); var_dump($f()()); class A{} -$a = new A; +$a = new A; var_dump($f->bindTo($a, A::CLASS)()()); ?> diff --git a/Zend/tests/bug_debug_backtrace.phpt b/Zend/tests/bug_debug_backtrace.phpt index 3e4a0ec946..71ce129201 100644 --- a/Zend/tests/bug_debug_backtrace.phpt +++ b/Zend/tests/bug_debug_backtrace.phpt @@ -5,17 +5,17 @@ Bug - crash in debug_backtrace when trace starts in eval function foo() { bar(); } - + function bar() { boo(); } - + function boo(){ debug_print_backtrace(); } - + eval("foo();"); - + echo "Done\n"; ?> ===DONE=== diff --git a/Zend/tests/call_user_func_001.phpt b/Zend/tests/call_user_func_001.phpt index b4b29c850a..15d0aec263 100644 --- a/Zend/tests/call_user_func_001.phpt +++ b/Zend/tests/call_user_func_001.phpt @@ -7,7 +7,7 @@ namespace testing { function foobar($str) { var_dump($str); } - + abstract class bar { protected function prot($str) { print "Shouldn't be called!\n"; @@ -18,9 +18,9 @@ namespace testing { print "Shouldn't be called!\n"; } } - + call_user_func(__NAMESPACE__ .'\foobar', 'foobar'); - + $class = __NAMESPACE__ .'\foo'; call_user_func(array(new $class, 'priv'), 'foobar'); call_user_func(array(new $class, 'prot'), 'foobar'); diff --git a/Zend/tests/call_user_func_003.phpt b/Zend/tests/call_user_func_003.phpt index 102433f557..1aad22fba7 100644 --- a/Zend/tests/call_user_func_003.phpt +++ b/Zend/tests/call_user_func_003.phpt @@ -5,14 +5,14 @@ Testing call_user_func() with closures $foo = function() { static $instance; - + if (is_null($instance)) { $instance = function () { return 'OK!'; }; } - - return $instance; + + return $instance; }; var_dump(call_user_func(array($foo, '__invoke'))->__invoke()); diff --git a/Zend/tests/call_user_func_005.phpt b/Zend/tests/call_user_func_005.phpt index 3191a714cc..9305e5849c 100644 --- a/Zend/tests/call_user_func_005.phpt +++ b/Zend/tests/call_user_func_005.phpt @@ -8,7 +8,7 @@ class foo { var_dump($x,$y); return 1; } - + public function teste() { return foo::x(function &($a=1,$b) { }); } diff --git a/Zend/tests/call_with_refs.phpt b/Zend/tests/call_with_refs.phpt index 84c4edfc20..f7b18365b4 100644 --- a/Zend/tests/call_with_refs.phpt +++ b/Zend/tests/call_with_refs.phpt @@ -12,6 +12,6 @@ $oldhandler = set_error_handler("my_errorhandler"); $my_var = str_repeat("A",64); $data = call_user_func_array("substr_replace",array(&$my_var, new StdClass(),1)); echo "OK!"; ---EXPECT-- +--EXPECT-- Object of class stdClass could not be converted to string OK! diff --git a/Zend/tests/cast_to_array_fixed.phpt b/Zend/tests/cast_to_array_fixed.phpt Binary files differnew file mode 100644 index 0000000000..12261c8e84 --- /dev/null +++ b/Zend/tests/cast_to_array_fixed.phpt diff --git a/Zend/tests/cast_to_bool.phpt b/Zend/tests/cast_to_bool.phpt index 66cec7c3c3..ebb1df6dfd 100644 --- a/Zend/tests/cast_to_bool.phpt +++ b/Zend/tests/cast_to_bool.phpt @@ -36,7 +36,7 @@ foreach ($vars as $var) { echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- bool(true) bool(true) bool(false) diff --git a/Zend/tests/cast_to_double.phpt b/Zend/tests/cast_to_double.phpt index a1a1adc1dc..7776992bc8 100644 --- a/Zend/tests/cast_to_double.phpt +++ b/Zend/tests/cast_to_double.phpt @@ -38,7 +38,7 @@ foreach ($vars as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- float(0) float(8754456) float(0) diff --git a/Zend/tests/cast_to_int.phpt b/Zend/tests/cast_to_int.phpt index 28c57ddf63..2a637e15e5 100644 --- a/Zend/tests/cast_to_int.phpt +++ b/Zend/tests/cast_to_int.phpt @@ -36,7 +36,7 @@ foreach ($vars as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(0) int(8754456) int(0) diff --git a/Zend/tests/class_alias_005.phpt b/Zend/tests/class_alias_005.phpt index 47c825b41b..ecc96c8cfa 100644 --- a/Zend/tests/class_alias_005.phpt +++ b/Zend/tests/class_alias_005.phpt @@ -3,7 +3,7 @@ Testing static call method using the original class name --FILE-- <?php -class foo { +class foo { static public function msg() { print "hello\n"; } @@ -14,10 +14,10 @@ interface test { } class_alias('foo', 'baz'); -class bar extends baz { +class bar extends baz { public function __construct() { foo::msg(); - } + } } new bar; diff --git a/Zend/tests/class_alias_011.phpt b/Zend/tests/class_alias_011.phpt index 58ba28a2bb..6db2ec7b58 100644 --- a/Zend/tests/class_alias_011.phpt +++ b/Zend/tests/class_alias_011.phpt @@ -3,7 +3,7 @@ Testing callback in alias --FILE-- <?php -class foo { +class foo { static public function test() { print "hello\n"; } diff --git a/Zend/tests/class_alias_012.phpt b/Zend/tests/class_alias_012.phpt index dd1c9b1072..0e39061c13 100644 --- a/Zend/tests/class_alias_012.phpt +++ b/Zend/tests/class_alias_012.phpt @@ -5,7 +5,7 @@ Testing dynamic alias name namespace test\baz; -class foo { +class foo { } new foo; diff --git a/Zend/tests/class_alias_013.phpt b/Zend/tests/class_alias_013.phpt index 4991d0fd31..3b19dcd5da 100644 --- a/Zend/tests/class_alias_013.phpt +++ b/Zend/tests/class_alias_013.phpt @@ -5,7 +5,7 @@ Testing alias of alias namespace test\baz; -class foo { +class foo { } new foo; diff --git a/Zend/tests/class_alias_018.phpt b/Zend/tests/class_alias_018.phpt index 4666e76f89..b514115285 100644 --- a/Zend/tests/class_alias_018.phpt +++ b/Zend/tests/class_alias_018.phpt @@ -9,7 +9,7 @@ class foo { class_alias('foo', 'bar'); -class baz extends bar { +class baz extends bar { } var_dump(is_subclass_of(new foo, 'foo')); diff --git a/Zend/tests/class_alias_020.phpt b/Zend/tests/class_alias_020.phpt index c7ba609f51..ba330e4ae5 100644 --- a/Zend/tests/class_alias_020.phpt +++ b/Zend/tests/class_alias_020.phpt @@ -13,7 +13,7 @@ class_alias(__NAMESPACE__ .'\foo', 'foo'); namespace foo\bar; -class foo { +class foo { } class_alias(__NAMESPACE__ .'\foo', 'bar'); diff --git a/Zend/tests/class_constants_001.phpt b/Zend/tests/class_constants_001.phpt index 664ac35698..f36b1af9f6 100644 --- a/Zend/tests/class_constants_001.phpt +++ b/Zend/tests/class_constants_001.phpt @@ -15,7 +15,7 @@ var_dump(test::val3); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(6) "string" int(1) diff --git a/Zend/tests/class_constants_002.phpt b/Zend/tests/class_constants_002.phpt index 48d0fd8502..259c724372 100644 --- a/Zend/tests/class_constants_002.phpt +++ b/Zend/tests/class_constants_002.phpt @@ -23,7 +23,7 @@ bar(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(1) int(5) int(10) diff --git a/Zend/tests/class_constants_003.phpt b/Zend/tests/class_constants_003.phpt index 1c3bfb737d..14222a4960 100644 --- a/Zend/tests/class_constants_003.phpt +++ b/Zend/tests/class_constants_003.phpt @@ -27,7 +27,7 @@ unlink($filename); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- int(1) int(5) Done diff --git a/Zend/tests/class_exists_001.phpt b/Zend/tests/class_exists_001.phpt index 8af96a49fc..a8fba7829c 100644 --- a/Zend/tests/class_exists_001.phpt +++ b/Zend/tests/class_exists_001.phpt @@ -6,7 +6,7 @@ Testing class_exists() inside namespace namespace foo; class foo { - + } class_alias(__NAMESPACE__ .'\foo', 'bar'); diff --git a/Zend/tests/class_exists_002.phpt b/Zend/tests/class_exists_002.phpt index d326f06aea..ebe04575af 100644 --- a/Zend/tests/class_exists_002.phpt +++ b/Zend/tests/class_exists_002.phpt @@ -4,7 +4,7 @@ Testing several valid and invalid parameters <?php class foo { - + } var_dump(class_exists('')); diff --git a/Zend/tests/clone_002.phpt b/Zend/tests/clone_002.phpt index 50156428e1..5d9c9aa8e7 100644 --- a/Zend/tests/clone_002.phpt +++ b/Zend/tests/clone_002.phpt @@ -1,7 +1,7 @@ --TEST-- Testing multiple clone statements --FILE-- -<?php +<?php $a = clone clone $b = new stdClass; var_dump($a == $b); diff --git a/Zend/tests/clone_004.phpt b/Zend/tests/clone_004.phpt index 80c21c6ba5..c97bb032c0 100644 --- a/Zend/tests/clone_004.phpt +++ b/Zend/tests/clone_004.phpt @@ -1,7 +1,7 @@ --TEST-- Testing usage of object as array on clone statement --FILE-- -<?php +<?php class foo { public function __get($a) { diff --git a/Zend/tests/closure_001.phpt b/Zend/tests/closure_001.phpt index ebac729b16..7385c42f12 100644 --- a/Zend/tests/closure_001.phpt +++ b/Zend/tests/closure_001.phpt @@ -20,7 +20,7 @@ call_user_func($lambda2, "Universe"); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- bool(true) bool(true) Hello World! diff --git a/Zend/tests/closure_005.phpt b/Zend/tests/closure_005.phpt index b9eb79eafd..b3be877216 100644 --- a/Zend/tests/closure_005.phpt +++ b/Zend/tests/closure_005.phpt @@ -25,13 +25,13 @@ class A { echo $this->x."\n"; }; } - + function getError() { return static function() { echo $this->x."\n"; }; } - + function printX() { echo $this->x."\n"; } diff --git a/Zend/tests/closure_018.phpt b/Zend/tests/closure_018.phpt index 2dcf15c6aa..0241d3e8ee 100644 --- a/Zend/tests/closure_018.phpt +++ b/Zend/tests/closure_018.phpt @@ -6,7 +6,7 @@ Closure 018: Assigning lambda to static var and returning by ref class foo { public function test(&$x) { static $lambda; - $lambda = function &() use (&$x) { + $lambda = function &() use (&$x) { return $x = $x * $x; }; return $lambda(); diff --git a/Zend/tests/closure_019.phpt b/Zend/tests/closure_019.phpt index c173108623..22aaec1bba 100644 --- a/Zend/tests/closure_019.phpt +++ b/Zend/tests/closure_019.phpt @@ -9,7 +9,7 @@ $lambda = function &(&$x) { function test() { global $lambda; - + $y = 3; var_dump($GLOBALS['lambda']($y)); var_dump($lambda($y)); diff --git a/Zend/tests/closure_020.phpt b/Zend/tests/closure_020.phpt index 3e019aaa42..9325e020c3 100644 --- a/Zend/tests/closure_020.phpt +++ b/Zend/tests/closure_020.phpt @@ -5,14 +5,14 @@ Closure 020: Trying to access private property outside class class foo { private $test = 3; - + public function x() { $a = &$this; $this->a = function() use (&$a) { return $a; }; var_dump($this->a->__invoke()); var_dump(is_a($this->a, 'closure')); var_dump(is_callable($this->a)); - + return $this->a; } } diff --git a/Zend/tests/closure_026.phpt b/Zend/tests/closure_026.phpt index 82a948d1a0..50c850e787 100644 --- a/Zend/tests/closure_026.phpt +++ b/Zend/tests/closure_026.phpt @@ -6,13 +6,13 @@ Closure 026: Assigning a closure object to an array in $this class foo { public function __construct() { $a =& $this; - + $a->a[] = function() { - return 1; + return 1; }; - + var_dump($this); - + var_dump($this->a[0]()); } } diff --git a/Zend/tests/closure_028.phpt b/Zend/tests/closure_028.phpt index 35840755da..c28849f448 100644 --- a/Zend/tests/closure_028.phpt +++ b/Zend/tests/closure_028.phpt @@ -3,8 +3,8 @@ Closure 028: Trying to use lambda directly in foreach --FILE-- <?php -foreach (function(){ return 1; } as $y) { - var_dump($y); +foreach (function(){ return 1; } as $y) { + var_dump($y); } print "ok\n"; diff --git a/Zend/tests/closure_035.phpt b/Zend/tests/closure_035.phpt index e39a991ab6..d06d0bb25b 100644 --- a/Zend/tests/closure_035.phpt +++ b/Zend/tests/closure_035.phpt @@ -7,7 +7,7 @@ $x = function () use (&$x) { $h = function () use ($x) { var_dump($x); return 1; - }; + }; return $h(); }; diff --git a/Zend/tests/closure_036.phpt b/Zend/tests/closure_036.phpt index ca87efec4b..f71188cd08 100644 --- a/Zend/tests/closure_036.phpt +++ b/Zend/tests/closure_036.phpt @@ -5,11 +5,11 @@ Closure 036: Rebinding closures, keep calling scope class A { private $x; - + public function __construct($v) { $this->x = $v; } - + public function getIncrementor() { return function() { return ++$this->x; }; } diff --git a/Zend/tests/closure_038.phpt b/Zend/tests/closure_038.phpt index 6d659be910..568db49b81 100644 --- a/Zend/tests/closure_038.phpt +++ b/Zend/tests/closure_038.phpt @@ -5,11 +5,11 @@ Closure 038: Rebinding closures, change scope, different runtime type class A { private $x; - + public function __construct($v) { $this->x = $v; } - + public function getIncrementor() { return function() { return ++$this->x; }; } diff --git a/Zend/tests/closure_039.phpt b/Zend/tests/closure_039.phpt index 5de432459f..f72223d206 100644 --- a/Zend/tests/closure_039.phpt +++ b/Zend/tests/closure_039.phpt @@ -5,11 +5,11 @@ Closure 039: Rebinding closures, change scope, same runtime type class A { private $x; - + public function __construct($v) { $this->x = $v; } - + public function getIncrementor() { return function() { return ++$this->x; }; } diff --git a/Zend/tests/closure_040.phpt b/Zend/tests/closure_040.phpt index a1b6cd604a..231ab4081c 100644 --- a/Zend/tests/closure_040.phpt +++ b/Zend/tests/closure_040.phpt @@ -6,11 +6,11 @@ Closure 040: Rebinding closures, bad arguments class A { private $x; private static $xs = 10; - + public function __construct($v) { $this->x = $v; } - + public function getIncrementor() { return function() { return ++$this->x; }; } diff --git a/Zend/tests/closure_047.phpt b/Zend/tests/closure_047.phpt index 2377bef6b7..736793448d 100644 --- a/Zend/tests/closure_047.phpt +++ b/Zend/tests/closure_047.phpt @@ -4,13 +4,13 @@ Closure 047: Use in preg_replace_callback() using variables by reference <?php function replace_variables($text, $params) { - + preg_replace_callback( '/(\?)/', function($matches) use (&$params, &$text) { - + $text = preg_replace( '/(\?)/', array_shift( $params ), $text, 1 ); - + }, $text ); - + return $text; } diff --git a/Zend/tests/closure_048.phpt b/Zend/tests/closure_048.phpt index 40f2e2fbac..47781641a8 100644 --- a/Zend/tests/closure_048.phpt +++ b/Zend/tests/closure_048.phpt @@ -4,13 +4,13 @@ Closure 048: Use in preg_replace_callback() using variables by reference <?php function replace_variables($text, $params) { - + $c = function($matches) use (&$params, &$text) { $text = preg_replace( '/(\?)/', array_shift( $params ), $text, 1 ); }; preg_replace_callback( '/(\?)/', $c, $text ); - + return $text; } diff --git a/Zend/tests/compare_001.phpt b/Zend/tests/compare_001.phpt index 51243da5df..d9f3f080bc 100644 --- a/Zend/tests/compare_001.phpt +++ b/Zend/tests/compare_001.phpt @@ -44,11 +44,11 @@ foreach($a as $var) { my_dump($a[$i]); echo "\n"; } -} +} echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} == array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} != string(0) "" array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} != int(1) diff --git a/Zend/tests/compare_001_64bit.phpt b/Zend/tests/compare_001_64bit.phpt index 6d5a175d3d..f72f91d17b 100644 --- a/Zend/tests/compare_001_64bit.phpt +++ b/Zend/tests/compare_001_64bit.phpt @@ -44,11 +44,11 @@ foreach($a as $var) { my_dump($a[$i]); echo "\n"; } -} +} echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} == array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} != string(0) "" array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} != int(1) diff --git a/Zend/tests/compare_002.phpt b/Zend/tests/compare_002.phpt index 33c883f5f4..9e3eb86d57 100644 --- a/Zend/tests/compare_002.phpt +++ b/Zend/tests/compare_002.phpt @@ -44,11 +44,11 @@ foreach($a as $var) { my_dump($a[$i]); echo "\n"; } -} +} echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} === array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} !== string(0) "" array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} !== int(1) diff --git a/Zend/tests/compare_002_64bit.phpt b/Zend/tests/compare_002_64bit.phpt index 517e7b9432..a18269e9f3 100644 --- a/Zend/tests/compare_002_64bit.phpt +++ b/Zend/tests/compare_002_64bit.phpt @@ -44,11 +44,11 @@ foreach($a as $var) { my_dump($a[$i]); echo "\n"; } -} +} echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} === array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} !== string(0) "" array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} !== int(1) diff --git a/Zend/tests/compare_003.phpt b/Zend/tests/compare_003.phpt index 3b293d1daa..4cb7a027cd 100644 --- a/Zend/tests/compare_003.phpt +++ b/Zend/tests/compare_003.phpt @@ -44,11 +44,11 @@ foreach($a as $var) { my_dump($a[$i]); echo "\n"; } -} +} echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} <= array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} > string(0) "" array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} > int(1) diff --git a/Zend/tests/compare_003_64bit.phpt b/Zend/tests/compare_003_64bit.phpt index eca4b5c8ff..2c361257ae 100644 --- a/Zend/tests/compare_003_64bit.phpt +++ b/Zend/tests/compare_003_64bit.phpt @@ -44,11 +44,11 @@ foreach($a as $var) { my_dump($a[$i]); echo "\n"; } -} +} echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} <= array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} > string(0) "" array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} > int(1) diff --git a/Zend/tests/compare_004.phpt b/Zend/tests/compare_004.phpt index 6f6d29b1fb..1d13f36334 100644 --- a/Zend/tests/compare_004.phpt +++ b/Zend/tests/compare_004.phpt @@ -44,11 +44,11 @@ foreach($a as $var) { my_dump($a[$i]); echo "\n"; } -} +} echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} >= array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} >= string(0) "" array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} >= int(1) diff --git a/Zend/tests/compare_004_64bit.phpt b/Zend/tests/compare_004_64bit.phpt index ef5083943b..8a69ae7816 100644 --- a/Zend/tests/compare_004_64bit.phpt +++ b/Zend/tests/compare_004_64bit.phpt @@ -44,11 +44,11 @@ foreach($a as $var) { my_dump($a[$i]); echo "\n"; } -} +} echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} >= array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} >= string(0) "" array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} >= int(1) diff --git a/Zend/tests/compare_005.phpt b/Zend/tests/compare_005.phpt index 38f4200ef7..43ed96e70b 100644 --- a/Zend/tests/compare_005.phpt +++ b/Zend/tests/compare_005.phpt @@ -44,11 +44,11 @@ foreach($a as $var) { my_dump($a[$i]); echo "\n"; } -} +} echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} >= array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} >= string(0) "" array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} >= int(1) diff --git a/Zend/tests/compare_005_64bit.phpt b/Zend/tests/compare_005_64bit.phpt index 86dcbe50f1..821f2a0ee4 100644 --- a/Zend/tests/compare_005_64bit.phpt +++ b/Zend/tests/compare_005_64bit.phpt @@ -44,11 +44,11 @@ foreach($a as $var) { my_dump($a[$i]); echo "\n"; } -} +} echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} >= array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} >= string(0) "" array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} >= int(1) diff --git a/Zend/tests/compare_006.phpt b/Zend/tests/compare_006.phpt index 43389fb250..1c212c5487 100644 --- a/Zend/tests/compare_006.phpt +++ b/Zend/tests/compare_006.phpt @@ -44,11 +44,11 @@ foreach($a as $var) { my_dump($a[$i]); echo "\n"; } -} +} echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} <= array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} > string(0) "" array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} > int(1) diff --git a/Zend/tests/compare_006_64bit.phpt b/Zend/tests/compare_006_64bit.phpt index 3870e189f0..41973a990d 100644 --- a/Zend/tests/compare_006_64bit.phpt +++ b/Zend/tests/compare_006_64bit.phpt @@ -44,11 +44,11 @@ foreach($a as $var) { my_dump($a[$i]); echo "\n"; } -} +} echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} <= array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} > string(0) "" array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} > int(1) diff --git a/Zend/tests/concat_001.phpt b/Zend/tests/concat_001.phpt index 1307c28930..805478a0cf 100644 --- a/Zend/tests/concat_001.phpt +++ b/Zend/tests/concat_001.phpt @@ -49,7 +49,7 @@ var_dump($d.$d); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Notice: Array to string conversion in %sconcat_001.php on line %d string(24) "Arraythis is test object" diff --git a/Zend/tests/concat_002.phpt b/Zend/tests/concat_002.phpt index 3cb182ee7d..4ec4f1fb32 100644 --- a/Zend/tests/concat_002.phpt +++ b/Zend/tests/concat_002.phpt @@ -18,7 +18,7 @@ for ($i = 0; $i < 25; ++$i) { var_dump(strlen($result)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- int(33554432) Done diff --git a/Zend/tests/constant_expressions_classes.phpt b/Zend/tests/constant_expressions_classes.phpt index 6298ff66d6..e394442b85 100644 --- a/Zend/tests/constant_expressions_classes.phpt +++ b/Zend/tests/constant_expressions_classes.phpt @@ -21,7 +21,7 @@ $classlist = [ 'G' => 'class G extends F { const XX = parent::XX." extended by G"; public static function get_me($x = "got ".self::XX) { return $x; } }', ]; -spl_autoload_register(function ($class) use ($classlist) { +spl_autoload_register(function ($class) use ($classlist) { if (isset($classlist[$class])) { eval($classlist[$class]); } else { @@ -36,7 +36,7 @@ printf("E::getHW() = %s\n", E::getHW()); printf("G::get_me() = %s\n", G::get_me()); ?> ---EXPECT-- +--EXPECT-- B::HW = this is A extended by B D::HW = this is space1\C extented by D E::getHW() = this is A extended by B diff --git a/Zend/tests/constants_009.phpt b/Zend/tests/constants_009.phpt index ea986dd3c7..35c64dff16 100644 --- a/Zend/tests/constants_009.phpt +++ b/Zend/tests/constants_009.phpt @@ -7,7 +7,7 @@ namespace foo\x; const x = 2; -class x { +class x { const x = 1; } diff --git a/Zend/tests/continue_targeting_switch_warning.phpt b/Zend/tests/continue_targeting_switch_warning.phpt index 67b5159b7d..05a51e5a22 100644 --- a/Zend/tests/continue_targeting_switch_warning.phpt +++ b/Zend/tests/continue_targeting_switch_warning.phpt @@ -10,7 +10,7 @@ function test() { case 1: break; } - + while ($foo) { switch ($bar) { case 0: @@ -21,7 +21,7 @@ function test() { break; } } - + while ($foo) { switch ($bar) { case 0: diff --git a/Zend/tests/debug_backtrace_options.phpt b/Zend/tests/debug_backtrace_options.phpt index 1b2d7e5485..a35eb64ff6 100644 --- a/Zend/tests/debug_backtrace_options.phpt +++ b/Zend/tests/debug_backtrace_options.phpt @@ -29,8 +29,8 @@ function doit($a, $b, $how) } class foo { - protected function doCall($dowhat, $how) - { + protected function doCall($dowhat, $how) + { $dowhat('a','b', $how); } static function statCall($dowhat, $how) diff --git a/Zend/tests/decrement_001.phpt b/Zend/tests/decrement_001.phpt index 6ade8ad163..b768b5a8e5 100644 --- a/Zend/tests/decrement_001.phpt +++ b/Zend/tests/decrement_001.phpt @@ -32,7 +32,7 @@ foreach ($a as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(3) { [0]=> int(1) diff --git a/Zend/tests/decrement_001_64bit.phpt b/Zend/tests/decrement_001_64bit.phpt index 7ad24b76f7..ac4f10d682 100644 --- a/Zend/tests/decrement_001_64bit.phpt +++ b/Zend/tests/decrement_001_64bit.phpt @@ -32,7 +32,7 @@ foreach ($a as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(3) { [0]=> int(1) diff --git a/Zend/tests/dereference_001.phpt b/Zend/tests/dereference_001.phpt index e09ad2992a..0b301db619 100644 --- a/Zend/tests/dereference_001.phpt +++ b/Zend/tests/dereference_001.phpt @@ -15,8 +15,8 @@ function b() { var_dump(b()[0]); // Notice: Undefined offset: 0 class foo { - public $y = 1; - + public $y = 1; + public function test() { return array(array(array('foobar'))); } diff --git a/Zend/tests/dereference_007.phpt b/Zend/tests/dereference_007.phpt index 2f7d66fd2e..e7df6a422d 100644 --- a/Zend/tests/dereference_007.phpt +++ b/Zend/tests/dereference_007.phpt @@ -7,17 +7,17 @@ error_reporting(E_ALL); class foo { public $x = array(); - + public function b() { return $this->x; } - + public function c() { return $x; } - + static public function d() { - + } } diff --git a/Zend/tests/dereference_008.phpt b/Zend/tests/dereference_008.phpt index 01c828f0c8..c615b9cd85 100644 --- a/Zend/tests/dereference_008.phpt +++ b/Zend/tests/dereference_008.phpt @@ -7,7 +7,7 @@ error_reporting(E_ALL); class foo { public $x = array(1); - + public function &b() { return $this->x; } diff --git a/Zend/tests/dereference_011.phpt b/Zend/tests/dereference_011.phpt index 17dc8b346b..43fec9b92a 100644 --- a/Zend/tests/dereference_011.phpt +++ b/Zend/tests/dereference_011.phpt @@ -7,7 +7,7 @@ error_reporting(E_ALL); class foo { public $arr; - + public function &a() { return $this->arr; } diff --git a/Zend/tests/dereference_012.phpt b/Zend/tests/dereference_012.phpt index f3ba774f06..ab70957a0a 100644 --- a/Zend/tests/dereference_012.phpt +++ b/Zend/tests/dereference_012.phpt @@ -5,12 +5,12 @@ Testing array dereferencing on return of a method with and without reference class foo { static $x = array(); - + public function &a() { self::$x = array(1, 2, 3); return self::$x; } - + public function b() { $x = array(1); $x[] = 2; diff --git a/Zend/tests/dereference_013.phpt b/Zend/tests/dereference_013.phpt index cfd89e71b5..139cd480b7 100644 --- a/Zend/tests/dereference_013.phpt +++ b/Zend/tests/dereference_013.phpt @@ -7,7 +7,7 @@ error_reporting(E_ALL); class foo { public $x = array(2); - + public function __call($x, $y) { if (count($this->x) == 1) { $this->x[] = $y[0]; diff --git a/Zend/tests/dereference_014.phpt b/Zend/tests/dereference_014.phpt index 859ac93348..f8910dd016 100644 --- a/Zend/tests/dereference_014.phpt +++ b/Zend/tests/dereference_014.phpt @@ -8,11 +8,11 @@ error_reporting(E_ALL); class foo { public $x; static public $y; - + public function a() { return $this->x; } - + static public function b() { return self::$y; } diff --git a/Zend/tests/div_001.phpt b/Zend/tests/div_001.phpt index 4f0b34b25f..051ed3f733 100644 --- a/Zend/tests/div_001.phpt +++ b/Zend/tests/div_001.phpt @@ -25,7 +25,7 @@ var_dump($c); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- float(394758.39454545) float(394758.39454545) float(394758.39454545) diff --git a/Zend/tests/div_002.phpt b/Zend/tests/div_002.phpt index bf5d512a65..be7b38e5b2 100644 --- a/Zend/tests/div_002.phpt +++ b/Zend/tests/div_002.phpt @@ -17,7 +17,7 @@ var_dump($c); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Exception: Unsupported operand types Fatal error: Uncaught Error: Unsupported operand types in %s:%d diff --git a/Zend/tests/double_to_string.phpt b/Zend/tests/double_to_string.phpt index 2948b0b54c..a778017a63 100644 --- a/Zend/tests/double_to_string.phpt +++ b/Zend/tests/double_to_string.phpt @@ -32,7 +32,7 @@ foreach ($doubles as $d) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(7) "2.9E+17" string(7) "2.9E+14" string(%d) "2%s" diff --git a/Zend/tests/dynamic_call_001.phpt b/Zend/tests/dynamic_call_001.phpt index 377ebf222e..7f8a6c0b3d 100644 --- a/Zend/tests/dynamic_call_001.phpt +++ b/Zend/tests/dynamic_call_001.phpt @@ -1,11 +1,11 @@ --TEST-- Testing dynamic call to constructor (old-style) --FILE-- -<?php +<?php -class foo { +class foo { public function foo() { - } + } } $a = 'foo'; diff --git a/Zend/tests/dynamic_call_002.phpt b/Zend/tests/dynamic_call_002.phpt index e94f642681..a090862258 100644 --- a/Zend/tests/dynamic_call_002.phpt +++ b/Zend/tests/dynamic_call_002.phpt @@ -1,7 +1,7 @@ --TEST-- Testing dynamic call with invalid value for method name --FILE-- -<?php +<?php $a = new stdClass; diff --git a/Zend/tests/dynamic_call_003.phpt b/Zend/tests/dynamic_call_003.phpt index b740ab3d4a..a400e33596 100644 --- a/Zend/tests/dynamic_call_003.phpt +++ b/Zend/tests/dynamic_call_003.phpt @@ -1,7 +1,7 @@ --TEST-- Testing dynamic call with invalid method name --FILE-- -<?php +<?php $a = new stdClass; $b = 1; diff --git a/Zend/tests/dynamic_call_004.phpt b/Zend/tests/dynamic_call_004.phpt index ad507c2953..2f444b3ee6 100644 --- a/Zend/tests/dynamic_call_004.phpt +++ b/Zend/tests/dynamic_call_004.phpt @@ -1,7 +1,7 @@ --TEST-- Testing dynamic call with undefined variables --FILE-- -<?php +<?php $a::$b(); diff --git a/Zend/tests/errmsg_001.phpt b/Zend/tests/errmsg_001.phpt index b85e032b90..c17764cdec 100644 --- a/Zend/tests/errmsg_001.phpt +++ b/Zend/tests/errmsg_001.phpt @@ -3,14 +3,14 @@ errmsg: Non-abstract method must contain body --FILE-- <?php -abstract class test { -} +abstract class test { +} -class Impl extends Test { - function Foo(); +class Impl extends Test { + function Foo(); } echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Non-abstract method Impl::Foo() must contain body in %s on line %d diff --git a/Zend/tests/errmsg_002.phpt b/Zend/tests/errmsg_002.phpt index b7330c9f1f..d1c4cb893f 100644 --- a/Zend/tests/errmsg_002.phpt +++ b/Zend/tests/errmsg_002.phpt @@ -10,5 +10,5 @@ abstract class test { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Abstract function test::foo() cannot be declared private in %s on line %d diff --git a/Zend/tests/errmsg_003.phpt b/Zend/tests/errmsg_003.phpt index 64e458781d..8daa66ae10 100644 --- a/Zend/tests/errmsg_003.phpt +++ b/Zend/tests/errmsg_003.phpt @@ -15,5 +15,5 @@ $t->foo(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Cannot re-assign $this in %s on line %d diff --git a/Zend/tests/errmsg_004.phpt b/Zend/tests/errmsg_004.phpt index e6d22d6aba..e322b66429 100644 --- a/Zend/tests/errmsg_004.phpt +++ b/Zend/tests/errmsg_004.phpt @@ -11,5 +11,5 @@ foo() = 1; echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Can't use function return value in write context in %s on line %d diff --git a/Zend/tests/errmsg_005.phpt b/Zend/tests/errmsg_005.phpt index 31c924cbb3..a7a2dc803c 100644 --- a/Zend/tests/errmsg_005.phpt +++ b/Zend/tests/errmsg_005.phpt @@ -14,5 +14,5 @@ $t->foo() = 1; echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Can't use method return value in write context in %s on line %d diff --git a/Zend/tests/errmsg_006.phpt b/Zend/tests/errmsg_006.phpt index 976093d854..1165770d4b 100644 --- a/Zend/tests/errmsg_006.phpt +++ b/Zend/tests/errmsg_006.phpt @@ -8,5 +8,5 @@ $b = $a[]; echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Cannot use [] for reading in %s on line %d diff --git a/Zend/tests/errmsg_007.phpt b/Zend/tests/errmsg_007.phpt index 1ac296695d..de0e9d1f10 100644 --- a/Zend/tests/errmsg_007.phpt +++ b/Zend/tests/errmsg_007.phpt @@ -8,5 +8,5 @@ isset($a[]); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Cannot use [] for reading in %s on line %d diff --git a/Zend/tests/errmsg_008.phpt b/Zend/tests/errmsg_008.phpt index e900603a89..f399afe414 100644 --- a/Zend/tests/errmsg_008.phpt +++ b/Zend/tests/errmsg_008.phpt @@ -8,5 +8,5 @@ unset($a[]); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Cannot use [] for unsetting in %s on line %d diff --git a/Zend/tests/errmsg_009.phpt b/Zend/tests/errmsg_009.phpt index 4834fa3e7a..c65b40e0d5 100644 --- a/Zend/tests/errmsg_009.phpt +++ b/Zend/tests/errmsg_009.phpt @@ -9,5 +9,5 @@ class test { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Multiple access type modifiers are not allowed in %s on line %d diff --git a/Zend/tests/errmsg_010.phpt b/Zend/tests/errmsg_010.phpt index ae2572f7bc..b283d2ce65 100644 --- a/Zend/tests/errmsg_010.phpt +++ b/Zend/tests/errmsg_010.phpt @@ -1,5 +1,5 @@ --TEST-- -errmsg: multiple access type modifiers are not allowed (methods) +errmsg: multiple access type modifiers are not allowed (methods) --FILE-- <?php @@ -9,5 +9,5 @@ class test { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Multiple access type modifiers are not allowed in %s on line %d diff --git a/Zend/tests/errmsg_011.phpt b/Zend/tests/errmsg_011.phpt index 9cfde0f8bb..5333f3b23c 100644 --- a/Zend/tests/errmsg_011.phpt +++ b/Zend/tests/errmsg_011.phpt @@ -12,5 +12,5 @@ class test { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Cannot redeclare test::foo() in %s on line %d diff --git a/Zend/tests/errmsg_012.phpt b/Zend/tests/errmsg_012.phpt index 183785be04..c914125af5 100644 --- a/Zend/tests/errmsg_012.phpt +++ b/Zend/tests/errmsg_012.phpt @@ -7,5 +7,5 @@ function __autoload($a, $b) {} echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: __autoload() must take exactly 1 argument in %s on line %d diff --git a/Zend/tests/errmsg_013.phpt b/Zend/tests/errmsg_013.phpt index 327d75eae7..606282458b 100644 --- a/Zend/tests/errmsg_013.phpt +++ b/Zend/tests/errmsg_013.phpt @@ -10,5 +10,5 @@ class test { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Default value for parameters with array type can only be an array or NULL in %s on line %d diff --git a/Zend/tests/errmsg_015.phpt b/Zend/tests/errmsg_015.phpt index 8e626e5092..948dee2f76 100644 --- a/Zend/tests/errmsg_015.phpt +++ b/Zend/tests/errmsg_015.phpt @@ -10,5 +10,5 @@ class test { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Method test::__clone() cannot accept any arguments in %s on line %d diff --git a/Zend/tests/errmsg_016.phpt b/Zend/tests/errmsg_016.phpt index ccda07b9a3..05e10b41ab 100644 --- a/Zend/tests/errmsg_016.phpt +++ b/Zend/tests/errmsg_016.phpt @@ -10,5 +10,5 @@ class test { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Method test::__isset() must take exactly 1 argument in %s on line %d diff --git a/Zend/tests/errmsg_017.phpt b/Zend/tests/errmsg_017.phpt index df2b665687..3ee18a5c40 100644 --- a/Zend/tests/errmsg_017.phpt +++ b/Zend/tests/errmsg_017.phpt @@ -10,5 +10,5 @@ class test { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Method test::__unset() must take exactly 1 argument in %s on line %d diff --git a/Zend/tests/errmsg_018.phpt b/Zend/tests/errmsg_018.phpt index dc136ef57b..fa10136b20 100644 --- a/Zend/tests/errmsg_018.phpt +++ b/Zend/tests/errmsg_018.phpt @@ -9,6 +9,6 @@ class test { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Class test contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (test::foo) in %s on line %d diff --git a/Zend/tests/errmsg_019.phpt b/Zend/tests/errmsg_019.phpt index 2b45650cf2..1204379587 100644 --- a/Zend/tests/errmsg_019.phpt +++ b/Zend/tests/errmsg_019.phpt @@ -10,5 +10,5 @@ class test { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Destructor test::__destruct() cannot take arguments in %s on line %d diff --git a/Zend/tests/errmsg_020.phpt b/Zend/tests/errmsg_020.phpt index 8199d5d06e..636e29d01f 100644 --- a/Zend/tests/errmsg_020.phpt +++ b/Zend/tests/errmsg_020.phpt @@ -9,6 +9,6 @@ phpinfo(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: phpinfo() has been disabled for security reasons in %s on line %d Done diff --git a/Zend/tests/errmsg_021.phpt b/Zend/tests/errmsg_021.phpt index 4e62f85111..7514e68359 100644 --- a/Zend/tests/errmsg_021.phpt +++ b/Zend/tests/errmsg_021.phpt @@ -12,6 +12,6 @@ $t = new test; echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: test() has been disabled for security reasons in %s on line %d Done diff --git a/Zend/tests/errmsg_022.phpt b/Zend/tests/errmsg_022.phpt index ea7b082f9e..aba8d750c6 100644 --- a/Zend/tests/errmsg_022.phpt +++ b/Zend/tests/errmsg_022.phpt @@ -10,5 +10,5 @@ foo(1); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Only variables can be passed by reference in %s on line %d diff --git a/Zend/tests/errmsg_023.phpt b/Zend/tests/errmsg_023.phpt index 9fd7804ea4..4532e2ad3a 100644 --- a/Zend/tests/errmsg_023.phpt +++ b/Zend/tests/errmsg_023.phpt @@ -7,11 +7,11 @@ class test1 { protected $var; } -class test extends test1 { +class test extends test1 { private $var; } echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Access level to test::$var must be protected (as in class test1) or weaker in %s on line %d diff --git a/Zend/tests/errmsg_024.phpt b/Zend/tests/errmsg_024.phpt index 25c8de3e58..0755d2b75c 100644 --- a/Zend/tests/errmsg_024.phpt +++ b/Zend/tests/errmsg_024.phpt @@ -13,5 +13,5 @@ class test extends test1 { echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- Done diff --git a/Zend/tests/errmsg_026.phpt b/Zend/tests/errmsg_026.phpt index 90fa87d4f1..2144a0707b 100644 --- a/Zend/tests/errmsg_026.phpt +++ b/Zend/tests/errmsg_026.phpt @@ -8,5 +8,5 @@ class stdclass { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Cannot declare class stdclass, because the name is already in use in %s on line %d diff --git a/Zend/tests/errmsg_027.phpt b/Zend/tests/errmsg_027.phpt index f4fec6155c..b2cd4e1655 100644 --- a/Zend/tests/errmsg_027.phpt +++ b/Zend/tests/errmsg_027.phpt @@ -12,5 +12,5 @@ class test { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Class declarations may not be nested in %s on line %d diff --git a/Zend/tests/errmsg_028.phpt b/Zend/tests/errmsg_028.phpt index 3331cb35bf..12fd36384f 100644 --- a/Zend/tests/errmsg_028.phpt +++ b/Zend/tests/errmsg_028.phpt @@ -8,5 +8,5 @@ class self { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Cannot use 'self' as class name as it is reserved in %s on line %d diff --git a/Zend/tests/errmsg_029.phpt b/Zend/tests/errmsg_029.phpt index 73b85ce6a5..e40cb2dc68 100644 --- a/Zend/tests/errmsg_029.phpt +++ b/Zend/tests/errmsg_029.phpt @@ -8,5 +8,5 @@ class parent { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Cannot use 'parent' as class name as it is reserved in %s on line %d diff --git a/Zend/tests/errmsg_030.phpt b/Zend/tests/errmsg_030.phpt index ab6ccbd41e..c0d42263c3 100644 --- a/Zend/tests/errmsg_030.phpt +++ b/Zend/tests/errmsg_030.phpt @@ -8,5 +8,5 @@ class test extends self { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Cannot use 'self' as class name as it is reserved in %s on line %d diff --git a/Zend/tests/errmsg_031.phpt b/Zend/tests/errmsg_031.phpt index 6e35648549..c847a26e64 100644 --- a/Zend/tests/errmsg_031.phpt +++ b/Zend/tests/errmsg_031.phpt @@ -8,5 +8,5 @@ class test extends parent { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Cannot use 'parent' as class name as it is reserved in %s on line %d diff --git a/Zend/tests/errmsg_032.phpt b/Zend/tests/errmsg_032.phpt index 6e34604cd8..f21e269a89 100644 --- a/Zend/tests/errmsg_032.phpt +++ b/Zend/tests/errmsg_032.phpt @@ -11,5 +11,5 @@ class test { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Constructor test::__construct() cannot be static in %s on line %d diff --git a/Zend/tests/errmsg_033.phpt b/Zend/tests/errmsg_033.phpt index 96938900ec..e5f36912b0 100644 --- a/Zend/tests/errmsg_033.phpt +++ b/Zend/tests/errmsg_033.phpt @@ -11,5 +11,5 @@ class test { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Destructor test::__destruct() cannot be static in %s on line %d diff --git a/Zend/tests/errmsg_034.phpt b/Zend/tests/errmsg_034.phpt index 1494fe5321..a8bfc80b9a 100644 --- a/Zend/tests/errmsg_034.phpt +++ b/Zend/tests/errmsg_034.phpt @@ -11,5 +11,5 @@ class test { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Clone method test::__clone() cannot be static in %s on line %d diff --git a/Zend/tests/errmsg_035.phpt b/Zend/tests/errmsg_035.phpt index 76cbe3d48b..e8fa8da8e8 100644 --- a/Zend/tests/errmsg_035.phpt +++ b/Zend/tests/errmsg_035.phpt @@ -8,5 +8,5 @@ class test implements self { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Cannot use 'self' as interface name as it is reserved in %s on line %d diff --git a/Zend/tests/errmsg_036.phpt b/Zend/tests/errmsg_036.phpt index d1f4274bd1..4f98f384d7 100644 --- a/Zend/tests/errmsg_036.phpt +++ b/Zend/tests/errmsg_036.phpt @@ -8,5 +8,5 @@ class test implements parent { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Cannot use 'parent' as interface name as it is reserved in %s on line %d diff --git a/Zend/tests/errmsg_037.phpt b/Zend/tests/errmsg_037.phpt index 6b98bb3339..b67ce0b5d0 100644 --- a/Zend/tests/errmsg_037.phpt +++ b/Zend/tests/errmsg_037.phpt @@ -9,5 +9,5 @@ class test { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Properties cannot be declared abstract in %s on line %d diff --git a/Zend/tests/errmsg_038.phpt b/Zend/tests/errmsg_038.phpt index 2927e945fe..6312ef64ce 100644 --- a/Zend/tests/errmsg_038.phpt +++ b/Zend/tests/errmsg_038.phpt @@ -9,5 +9,5 @@ class test { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Cannot declare property test::$var final, the final modifier is allowed only for methods and classes in %s on line %d diff --git a/Zend/tests/errmsg_039.phpt b/Zend/tests/errmsg_039.phpt index 0000811879..5371ba56c6 100644 --- a/Zend/tests/errmsg_039.phpt +++ b/Zend/tests/errmsg_039.phpt @@ -10,5 +10,5 @@ class test { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Cannot redeclare test::$var in %s on line %d diff --git a/Zend/tests/errmsg_040.phpt b/Zend/tests/errmsg_040.phpt index 088264176b..d8ebc67bf6 100644 --- a/Zend/tests/errmsg_040.phpt +++ b/Zend/tests/errmsg_040.phpt @@ -9,7 +9,7 @@ class test { var_dump(test::TEST); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(3) { [0]=> int(1) diff --git a/Zend/tests/errmsg_042.phpt b/Zend/tests/errmsg_042.phpt index 3b4ea7c267..3ed20415c4 100644 --- a/Zend/tests/errmsg_042.phpt +++ b/Zend/tests/errmsg_042.phpt @@ -9,5 +9,5 @@ foreach ($a as &$k=>$v) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Key element cannot be a reference in %s on line %d diff --git a/Zend/tests/error_reporting01.phpt b/Zend/tests/error_reporting01.phpt index 5153d41eab..75c4189ce2 100644 --- a/Zend/tests/error_reporting01.phpt +++ b/Zend/tests/error_reporting01.phpt @@ -11,7 +11,7 @@ function foo($arg) { function bar() { throw new Exception("test"); } - + try { @foo(@bar()); } catch (Exception $e) { @@ -21,6 +21,6 @@ var_dump(error_reporting()); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- int(32767) Done diff --git a/Zend/tests/error_reporting02.phpt b/Zend/tests/error_reporting02.phpt index f4786639c0..6ceb8deaa3 100644 --- a/Zend/tests/error_reporting02.phpt +++ b/Zend/tests/error_reporting02.phpt @@ -12,7 +12,7 @@ function bar() { error_reporting(E_ALL|E_STRICT); throw new Exception("test"); } - + try { @foo(@bar()); } catch (Exception $e) { @@ -22,6 +22,6 @@ var_dump(error_reporting()); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- int(32767) Done diff --git a/Zend/tests/error_reporting03.phpt b/Zend/tests/error_reporting03.phpt index 3c6595ceab..959a29b557 100644 --- a/Zend/tests/error_reporting03.phpt +++ b/Zend/tests/error_reporting03.phpt @@ -29,7 +29,7 @@ var_dump(error_reporting()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Notice: Undefined variable: undef2 in %s on line %d int(32767) Done diff --git a/Zend/tests/error_reporting05.phpt b/Zend/tests/error_reporting05.phpt index fe5374c4f7..6ea76fda3e 100644 --- a/Zend/tests/error_reporting05.phpt +++ b/Zend/tests/error_reporting05.phpt @@ -4,7 +4,7 @@ testing @ and error_reporting - 5 <?php error_reporting(E_ALL); - + class test { function __get($name) { return $undef_name; @@ -26,7 +26,7 @@ var_dump(error_reporting()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Notice: Undefined variable: undef_value in %s on line %d Notice: Undefined variable: undef_name in %s on line %d diff --git a/Zend/tests/error_reporting06.phpt b/Zend/tests/error_reporting06.phpt index e81e0a2653..8f286f75ae 100644 --- a/Zend/tests/error_reporting06.phpt +++ b/Zend/tests/error_reporting06.phpt @@ -4,7 +4,7 @@ testing @ and error_reporting - 6 <?php error_reporting(E_ALL); - + function foo1($arg) { } @@ -25,6 +25,6 @@ var_dump(error_reporting()); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- int(32767) Done diff --git a/Zend/tests/error_reporting07.phpt b/Zend/tests/error_reporting07.phpt index affc496716..84cf6264b9 100644 --- a/Zend/tests/error_reporting07.phpt +++ b/Zend/tests/error_reporting07.phpt @@ -4,7 +4,7 @@ testing @ and error_reporting - 7 <?php error_reporting(E_ALL); - + function foo1($arg) { } @@ -25,6 +25,6 @@ var_dump(error_reporting()); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- int(32767) Done diff --git a/Zend/tests/error_reporting08.phpt b/Zend/tests/error_reporting08.phpt index c9945046ee..13d32ca4bc 100644 --- a/Zend/tests/error_reporting08.phpt +++ b/Zend/tests/error_reporting08.phpt @@ -4,7 +4,7 @@ testing @ and error_reporting - 8 <?php error_reporting(E_ALL); - + function foo1($arg) { } @@ -26,7 +26,7 @@ var_dump(error_reporting()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Notice: Undefined variable: undef3 in %s on line %d int(32767) Done diff --git a/Zend/tests/error_reporting09.phpt b/Zend/tests/error_reporting09.phpt index 8d4e7e1b17..a3c254d94d 100644 --- a/Zend/tests/error_reporting09.phpt +++ b/Zend/tests/error_reporting09.phpt @@ -4,7 +4,7 @@ testing @ and error_reporting - 9 <?php error_reporting(E_ALL); - + function bar() { echo @$blah; echo $undef2; @@ -16,14 +16,14 @@ function foo() { echo $blah; return bar(); } - -@foo(); + +@foo(); var_dump(error_reporting()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Notice: Undefined variable: blah in %s on line %d Notice: Undefined variable: undef2 in %s on line %d diff --git a/Zend/tests/error_reporting10.phpt b/Zend/tests/error_reporting10.phpt index eb3711af11..8b0c7b9923 100644 --- a/Zend/tests/error_reporting10.phpt +++ b/Zend/tests/error_reporting10.phpt @@ -29,7 +29,7 @@ var_dump(error_reporting()); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- int(32767) int(32759) Done diff --git a/Zend/tests/exception_002.phpt b/Zend/tests/exception_002.phpt index 25f0c61f9d..4554200aab 100644 --- a/Zend/tests/exception_002.phpt +++ b/Zend/tests/exception_002.phpt @@ -1,17 +1,17 @@ --TEST-- Testing exception and GOTO --FILE-- -<?php +<?php goto foo; try { print 1; - + foo: print 2; } catch (Exception $e) { - + } ?> diff --git a/Zend/tests/exception_003.phpt b/Zend/tests/exception_003.phpt index 1f60f7874e..813246c5dd 100644 --- a/Zend/tests/exception_003.phpt +++ b/Zend/tests/exception_003.phpt @@ -1,7 +1,7 @@ --TEST-- Throwing exception in global scope --FILE-- -<?php +<?php throw new Exception(1); diff --git a/Zend/tests/exception_004.phpt b/Zend/tests/exception_004.phpt index 9afe81f9c1..29288e25ac 100644 --- a/Zend/tests/exception_004.phpt +++ b/Zend/tests/exception_004.phpt @@ -1,7 +1,7 @@ --TEST-- Throwing exception using a class that isn't derived from the Exception base class --FILE-- -<?php +<?php error_reporting(E_ALL|E_STRICT); diff --git a/Zend/tests/exception_008.phpt b/Zend/tests/exception_008.phpt index fe4ee0d8ea..b88198302b 100644 --- a/Zend/tests/exception_008.phpt +++ b/Zend/tests/exception_008.phpt @@ -13,7 +13,7 @@ class TestFirst class TestSecond { function __destruct() { - throw new Exception("Second"); + throw new Exception("Second"); } } diff --git a/Zend/tests/exception_011.phpt b/Zend/tests/exception_011.phpt index 850a3ecd9f..a9905cc2f7 100644 --- a/Zend/tests/exception_011.phpt +++ b/Zend/tests/exception_011.phpt @@ -4,7 +4,7 @@ Test exception doesn't cause RSHUTDOWN bypass, variation 0 assert.bail=1 assert.exception=1 --FILE-- -<?php +<?php define ("XXXXX", 1); assert(false); diff --git a/Zend/tests/exception_012.phpt b/Zend/tests/exception_012.phpt index a28e1643f5..4a1070330a 100644 --- a/Zend/tests/exception_012.phpt +++ b/Zend/tests/exception_012.phpt @@ -4,7 +4,7 @@ Test exception doesn't cause RSHUTDOWN bypass, variation 1 assert.bail=1 assert.exception=1 --FILE-- -<?php +<?php $func = create_function('', 'define("Mommy", 1); assert(false);'); $func(); diff --git a/Zend/tests/exception_handler_001.phpt b/Zend/tests/exception_handler_001.phpt index 34f6eb5966..d4e205cceb 100644 --- a/Zend/tests/exception_handler_001.phpt +++ b/Zend/tests/exception_handler_001.phpt @@ -16,5 +16,5 @@ throw new test(); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(12) "test thrown!" diff --git a/Zend/tests/exception_handler_002.phpt b/Zend/tests/exception_handler_002.phpt index 5fd018f32c..da57572300 100644 --- a/Zend/tests/exception_handler_002.phpt +++ b/Zend/tests/exception_handler_002.phpt @@ -17,7 +17,7 @@ throw new test(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(12) "test thrown!" Fatal error: Uncaught Exception in %sexception_handler_002.php:7 diff --git a/Zend/tests/exception_handler_003.phpt b/Zend/tests/exception_handler_003.phpt index 964b746d0e..8d3635c4b8 100644 --- a/Zend/tests/exception_handler_003.phpt +++ b/Zend/tests/exception_handler_003.phpt @@ -20,5 +20,5 @@ throw new Exception(); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(17) "Exception thrown!" diff --git a/Zend/tests/exception_handler_004.phpt b/Zend/tests/exception_handler_004.phpt index bf581bbed1..69a4136b08 100644 --- a/Zend/tests/exception_handler_004.phpt +++ b/Zend/tests/exception_handler_004.phpt @@ -10,7 +10,7 @@ set_exception_handler("foo", "bar"); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: set_exception_handler() expects the argument (fo) to be a valid callback in %s on line %d Warning: set_exception_handler() expects the argument (::) to be a valid callback in %s on line %d diff --git a/Zend/tests/exception_handler_005.phpt b/Zend/tests/exception_handler_005.phpt index 6b228e522b..af96627561 100644 --- a/Zend/tests/exception_handler_005.phpt +++ b/Zend/tests/exception_handler_005.phpt @@ -19,5 +19,5 @@ throw new excEption(); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(25) "foo1(): Exception thrown!" diff --git a/Zend/tests/exception_handler_006.phpt b/Zend/tests/exception_handler_006.phpt index 6f9f11870e..861a10ffa1 100644 --- a/Zend/tests/exception_handler_006.phpt +++ b/Zend/tests/exception_handler_006.phpt @@ -21,5 +21,5 @@ throw new excEption(); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(24) "foo(): Exception thrown!" diff --git a/Zend/tests/flexible-heredoc-error7.phpt b/Zend/tests/flexible-heredoc-error7.phpt index 2dbc99a1ea..a8016547b1 100644 --- a/Zend/tests/flexible-heredoc-error7.phpt +++ b/Zend/tests/flexible-heredoc-error7.phpt @@ -6,6 +6,6 @@ Note: the closing ?> has been deliberately elided. <?php echo <<<END - + --EXPECTF-- Parse error: syntax error, unexpected end of file, expecting variable (T_VARIABLE) or heredoc end (T_END_HEREDOC) or ${ (T_DOLLAR_OPEN_CURLY_BRACES) or {$ (T_CURLY_OPEN) in %s on line %d
\ No newline at end of file diff --git a/Zend/tests/flexible-nowdoc-error7.phpt b/Zend/tests/flexible-nowdoc-error7.phpt index 00d6604d18..d2cdc86713 100644 --- a/Zend/tests/flexible-nowdoc-error7.phpt +++ b/Zend/tests/flexible-nowdoc-error7.phpt @@ -6,6 +6,6 @@ Note: the closing ?> has been deliberately elided. <?php echo <<<'END' - + --EXPECTF-- Parse error: syntax error, unexpected end of file, expecting variable (T_VARIABLE) or heredoc end (T_END_HEREDOC) or ${ (T_DOLLAR_OPEN_CURLY_BRACES) or {$ (T_CURLY_OPEN) in %s on line %d
\ No newline at end of file diff --git a/Zend/tests/foreach.phpt b/Zend/tests/foreach.phpt index 041a7636ed..0835e40aaf 100644 --- a/Zend/tests/foreach.phpt +++ b/Zend/tests/foreach.phpt @@ -12,7 +12,7 @@ foreach($foo as $key => &$val) { } var_dump($foo); ?> ---EXPECT-- +--EXPECT-- array(4) { [0]=> int(2) diff --git a/Zend/tests/foreach_005.phpt b/Zend/tests/foreach_005.phpt index 6ed9fe940b..063dc70de0 100644 --- a/Zend/tests/foreach_005.phpt +++ b/Zend/tests/foreach_005.phpt @@ -6,7 +6,7 @@ $a = [1,2,3]; foreach($a as &$x) { foreach($a as &$y) { echo "$x-$y\n"; - $y++; + $y++; } } ?> diff --git a/Zend/tests/foreach_009.phpt b/Zend/tests/foreach_009.phpt index 6ce8384642..754d9acb2f 100644 --- a/Zend/tests/foreach_009.phpt +++ b/Zend/tests/foreach_009.phpt @@ -9,7 +9,7 @@ foreach ($a as &$ref) { echo "$ref-$ref2\n"; if ($ref == 5 && $ref2 == 6) { $a[42] = 8; - } + } } } ?> diff --git a/Zend/tests/foreach_010.phpt b/Zend/tests/foreach_010.phpt index 6ba7e7e9fd..a86f87f6df 100644 --- a/Zend/tests/foreach_010.phpt +++ b/Zend/tests/foreach_010.phpt @@ -9,7 +9,7 @@ foreach ($o as $v1) { echo "$v1-$v2\n"; if ($v1 == 5 && $v2 == 6) { $o->i = 8; - } + } } } ?> diff --git a/Zend/tests/foreach_list_002.phpt b/Zend/tests/foreach_list_002.phpt index 0ec1aac2c1..1c693651fd 100644 --- a/Zend/tests/foreach_list_002.phpt +++ b/Zend/tests/foreach_list_002.phpt @@ -10,7 +10,7 @@ foreach (array(array(1,2), array(3,4)) as list($a, )) { $array = [['a', 'b'], 'c', 'd']; foreach($array as list(, $a)) { - var_dump($a); + var_dump($a); } ?> diff --git a/Zend/tests/foreach_undefined.phpt b/Zend/tests/foreach_undefined.phpt index 101d9839e9..aa4a160e6c 100644 --- a/Zend/tests/foreach_undefined.phpt +++ b/Zend/tests/foreach_undefined.phpt @@ -7,7 +7,7 @@ foreach($a as $val); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Notice: Undefined variable: a in %s on line %d Warning: Invalid argument supplied for foreach() in %s on line %d diff --git a/Zend/tests/foreach_unset_globals.phpt b/Zend/tests/foreach_unset_globals.phpt index 7ed0460eee..8c505cdb04 100644 --- a/Zend/tests/foreach_unset_globals.phpt +++ b/Zend/tests/foreach_unset_globals.phpt @@ -11,7 +11,7 @@ foreach ($arr as $key => $val) { var_dump($arr); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(2) { ["a"]=> int(1) diff --git a/Zend/tests/function_arguments/call_with_trailing_comma_basic.phpt b/Zend/tests/function_arguments/call_with_trailing_comma_basic.phpt index f6a7603790..aec3008e92 100644 --- a/Zend/tests/function_arguments/call_with_trailing_comma_basic.phpt +++ b/Zend/tests/function_arguments/call_with_trailing_comma_basic.phpt @@ -17,12 +17,12 @@ class Foo echo __FUNCTION__ . "\n"; var_dump($args); } - + public function bar(...$args) { echo __FUNCTION__ . "\n"; var_dump($args); } - + public function __invoke(...$args) { echo __FUNCTION__ . "\n"; var_dump($args); diff --git a/Zend/tests/function_exists_basic.phpt b/Zend/tests/function_exists_basic.phpt index 469e3d8c9a..995caf1ab4 100644 --- a/Zend/tests/function_exists_basic.phpt +++ b/Zend/tests/function_exists_basic.phpt @@ -2,10 +2,10 @@ function_exists function : basic functionality --FILE-- <?php -/* +/* * proto bool function_exists(string function_name) * Function is implemented in Zend/zend_builtin_functions.c -*/ +*/ echo "*** Testing function_exists() : basic functionality ***\n"; diff --git a/Zend/tests/function_exists_error.phpt b/Zend/tests/function_exists_error.phpt index cbc3908f12..5b2f792773 100644 --- a/Zend/tests/function_exists_error.phpt +++ b/Zend/tests/function_exists_error.phpt @@ -2,10 +2,10 @@ Test function_exists() function : error conditions --FILE-- <?php -/* +/* * proto bool function_exists(string function_name) * Function is implemented in Zend/zend_builtin_functions.c -*/ +*/ echo "*** Testing function_exists() : error conditions ***\n"; diff --git a/Zend/tests/generators/yield_from_multi_tree_exception.phpt b/Zend/tests/generators/yield_from_multi_tree_exception.phpt index ec423606c2..2bdeedba7d 100644 --- a/Zend/tests/generators/yield_from_multi_tree_exception.phpt +++ b/Zend/tests/generators/yield_from_multi_tree_exception.phpt @@ -29,7 +29,7 @@ for ($level = 1; $level < $levels; $level++) { } } -for ($i = 0; $i < 2; $i++) { +for ($i = 0; $i < 2; $i++) { try { foreach ($all as $gen) { var_dump($gen->current()); diff --git a/Zend/tests/get_class_methods_001.phpt b/Zend/tests/get_class_methods_001.phpt index 78745219ba..d0d51220aa 100644 --- a/Zend/tests/get_class_methods_001.phpt +++ b/Zend/tests/get_class_methods_001.phpt @@ -3,16 +3,16 @@ get_class_methods(): Testing scope --FILE-- <?php -abstract class X { +abstract class X { public function a() { } private function b() { } - protected function c() { } + protected function c() { } } class Y extends X { private function bb() { } - - static public function test() { + + static public function test() { var_dump(get_class_methods('X')); var_dump(get_class_methods('Y')); } diff --git a/Zend/tests/get_class_methods_002.phpt b/Zend/tests/get_class_methods_002.phpt index 808a07046f..c049c1ced3 100644 --- a/Zend/tests/get_class_methods_002.phpt +++ b/Zend/tests/get_class_methods_002.phpt @@ -3,7 +3,7 @@ get_class_methods(): Testing with interface --FILE-- <?php -interface A { +interface A { function a(); function b(); } @@ -11,12 +11,12 @@ interface A { class B implements A { public function a() { } public function b() { } - + public function __construct() { var_dump(get_class_methods('A')); var_dump(get_class_methods('B')); } - + public function __destruct() { } } diff --git a/Zend/tests/get_class_methods_003.phpt b/Zend/tests/get_class_methods_003.phpt index 5c3c09f4e0..982b7cbc0f 100644 --- a/Zend/tests/get_class_methods_003.phpt +++ b/Zend/tests/get_class_methods_003.phpt @@ -3,7 +3,7 @@ get_class_methods(): Testing scope --FILE-- <?php -interface I { +interface I { function aa(); function bb(); static function cc(); @@ -13,7 +13,7 @@ class X { public function a() { } protected function b() { } private function c() { } - + static public function static_a() { } static protected function static_b() { } static private function static_c() { } @@ -22,15 +22,15 @@ class X { class Y extends X implements I { public function aa() { } public function bb() { } - + static function cc() { } - + public function __construct() { var_dump(get_class_methods('I')); var_dump(get_class_methods('Y')); var_dump(get_class_methods('X')); } - + public function __destruct() { } } diff --git a/Zend/tests/get_class_vars_002.phpt b/Zend/tests/get_class_vars_002.phpt index 721ebe692e..23531e458d 100644 --- a/Zend/tests/get_class_vars_002.phpt +++ b/Zend/tests/get_class_vars_002.phpt @@ -19,9 +19,9 @@ class C extends B { public function __construct() { var_dump(get_class_vars('A')); var_dump(get_class_vars('B')); - + var_dump($this->a, $this->b, $this->c); - } + } } new C; diff --git a/Zend/tests/get_class_vars_003.phpt b/Zend/tests/get_class_vars_003.phpt index d2c82bb593..5fe9f9971b 100644 --- a/Zend/tests/get_class_vars_003.phpt +++ b/Zend/tests/get_class_vars_003.phpt @@ -13,7 +13,7 @@ class B extends A { static public $aa = 4; static private $bb = 5; static protected $cc = 6; - + protected function __construct() { var_dump(get_class_vars('C')); } @@ -26,7 +26,7 @@ class C extends B { public function __construct() { parent::__construct(); - } + } } new C; diff --git a/Zend/tests/get_class_vars_004.phpt b/Zend/tests/get_class_vars_004.phpt index 26cd461ba4..9b21d165e1 100644 --- a/Zend/tests/get_class_vars_004.phpt +++ b/Zend/tests/get_class_vars_004.phpt @@ -12,11 +12,11 @@ class A { protected $c = 5; static protected $C = 6; - + public function __construct() { var_dump(get_class_vars('A')); } - + static public function test() { var_dump(get_class_vars('A')); } diff --git a/Zend/tests/get_class_vars_005.phpt b/Zend/tests/get_class_vars_005.phpt index 51f54900a9..47d28ca336 100644 --- a/Zend/tests/get_class_vars_005.phpt +++ b/Zend/tests/get_class_vars_005.phpt @@ -13,7 +13,7 @@ class B extends A { public function __construct() { var_dump(get_class_vars('A')); var_dump(get_class_vars('B')); - } + } } var_dump(get_class_vars('A')); diff --git a/Zend/tests/get_class_vars_006.phpt b/Zend/tests/get_class_vars_006.phpt index d1c2844aeb..34da051fd5 100644 --- a/Zend/tests/get_class_vars_006.phpt +++ b/Zend/tests/get_class_vars_006.phpt @@ -21,7 +21,7 @@ class D extends B { public function __construct() { var_dump(get_class_vars('A')); var_dump(get_class_vars('B')); - var_dump(get_class_vars('C')); + var_dump(get_class_vars('C')); } } diff --git a/Zend/tests/get_defined_functions_basic.phpt b/Zend/tests/get_defined_functions_basic.phpt index a849e32c78..55b497f45c 100644 --- a/Zend/tests/get_defined_functions_basic.phpt +++ b/Zend/tests/get_defined_functions_basic.phpt @@ -29,7 +29,7 @@ if (!is_array($func)) { if (!is_array($func["internal"])) { echo "TEST FAILED: no element in result array with key 'internal'\n"; -} +} $internal = $func["internal"]; @@ -37,7 +37,7 @@ $internal = $func["internal"]; if (!in_array("cos", $internal) || !in_array("strlen", $internal)) { echo "TEST FAILED: missing elements from 'internal' array\n"; var_dump($internal); -} +} if (!is_array($func["user"])) { echo "TEST FAILED: no element in result array with key 'user'\n"; @@ -49,7 +49,7 @@ if (count($user) == 2 && in_array("foo", $user) && in_array("helloworld", $user) } else { echo "TEST FAILED: missing elements from 'user' array\n"; var_dump($user); -} +} ?> ===Done=== diff --git a/Zend/tests/get_defined_vars.phpt b/Zend/tests/get_defined_vars.phpt index 15e33b8a94..8fe32c8937 100644 --- a/Zend/tests/get_defined_vars.phpt +++ b/Zend/tests/get_defined_vars.phpt @@ -34,7 +34,7 @@ $arr = get_defined_vars(); /* Displaying various variable through the array captured by the get_defined_vars function call */ echo "\n*** Displaying various variables through the array captured by the get_defined_vars function call ***\n"; -var_dump( $arr["argc"] ); +var_dump( $arr["argc"] ); var_dump( $arr["number"] ); var_dump( $arr["string"] ); var_dump( $arr["array1"] ); @@ -63,7 +63,7 @@ func2(); func1(); echo "\nDone"; -?> +?> --EXPECT-- *** Displaying various variables through the array captured by the get_defined_vars function call *** int(1) diff --git a/Zend/tests/get_parent_class_001.phpt b/Zend/tests/get_parent_class_001.phpt index dfef5e08cc..95395f935b 100644 --- a/Zend/tests/get_parent_class_001.phpt +++ b/Zend/tests/get_parent_class_001.phpt @@ -4,7 +4,7 @@ Testing get_parent_class() <?php interface ITest { - function foo(); + function foo(); } abstract class bar implements ITest { diff --git a/Zend/tests/globals_001.phpt b/Zend/tests/globals_001.phpt index 8efa71d31b..551ab7f5f5 100644 --- a/Zend/tests/globals_001.phpt +++ b/Zend/tests/globals_001.phpt @@ -19,7 +19,7 @@ var_dump($_SERVER); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) bool(false) string(5) "array" diff --git a/Zend/tests/globals_002.phpt b/Zend/tests/globals_002.phpt index e5d518ac56..d57e350092 100644 --- a/Zend/tests/globals_002.phpt +++ b/Zend/tests/globals_002.phpt @@ -22,7 +22,7 @@ test(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) bool(false) string(5) "array" diff --git a/Zend/tests/globals_003.phpt b/Zend/tests/globals_003.phpt index 6de7c53e35..cdd4d211af 100644 --- a/Zend/tests/globals_003.phpt +++ b/Zend/tests/globals_003.phpt @@ -28,7 +28,7 @@ test::bar(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) bool(false) string(5) "array" diff --git a/Zend/tests/globals_004.phpt b/Zend/tests/globals_004.phpt index 07dfc7806d..123fbc80e5 100644 --- a/Zend/tests/globals_004.phpt +++ b/Zend/tests/globals_004.phpt @@ -13,7 +13,7 @@ test(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) bool(false) string(5) "array" diff --git a/Zend/tests/grammar/semi_reserved_008.phpt b/Zend/tests/grammar/semi_reserved_008.phpt index a267291886..c10f96b6de 100644 --- a/Zend/tests/grammar/semi_reserved_008.phpt +++ b/Zend/tests/grammar/semi_reserved_008.phpt @@ -27,7 +27,7 @@ class Foo // /** doc comment */ # - catch /* comment */ + catch /* comment */ // comment # comment insteadof TraitB; diff --git a/Zend/tests/heredoc_011.phpt b/Zend/tests/heredoc_011.phpt index d3b152ae62..4f0adfd7e9 100644 --- a/Zend/tests/heredoc_011.phpt +++ b/Zend/tests/heredoc_011.phpt @@ -6,7 +6,7 @@ STATIC heredocs CAN be used as static scalars. require_once 'nowdoc.inc'; class e { - + const E = <<<THISMUSTNOTERROR If you DON'T see this, something's wrong. THISMUSTNOTERROR; diff --git a/Zend/tests/heredoc_015.phpt b/Zend/tests/heredoc_015.phpt index 21658cf8a5..6c368f8318 100644 --- a/Zend/tests/heredoc_015.phpt +++ b/Zend/tests/heredoc_015.phpt @@ -1,7 +1,7 @@ --TEST-- Testing heredoc with escape sequences --FILE-- -<?php +<?php $test = <<<TEST TEST; diff --git a/Zend/tests/heredoc_016.phpt b/Zend/tests/heredoc_016.phpt index de00036ccd..3c8831e275 100644 --- a/Zend/tests/heredoc_016.phpt +++ b/Zend/tests/heredoc_016.phpt @@ -1,7 +1,7 @@ --TEST-- Testing heredoc (double quotes) with escape sequences --FILE-- -<?php +<?php $test = <<<"TEST" TEST; diff --git a/Zend/tests/hex_overflow_32bit.phpt b/Zend/tests/hex_overflow_32bit.phpt index 0f192f3497..529757dd56 100644 --- a/Zend/tests/hex_overflow_32bit.phpt +++ b/Zend/tests/hex_overflow_32bit.phpt @@ -21,7 +21,7 @@ foreach ($doubles as $d) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- float(4.0833602971%dE+14) float(4.7223664828%dE+21) float(1.3521606402%dE+31) diff --git a/Zend/tests/increment_001.phpt b/Zend/tests/increment_001.phpt index 3638474971..16323381b8 100644 --- a/Zend/tests/increment_001.phpt +++ b/Zend/tests/increment_001.phpt @@ -32,7 +32,7 @@ foreach ($a as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(3) { [0]=> int(1) diff --git a/Zend/tests/indirect_call_string_001.phpt b/Zend/tests/indirect_call_string_001.phpt index 9151de717b..89707caf04 100644 --- a/Zend/tests/indirect_call_string_001.phpt +++ b/Zend/tests/indirect_call_string_001.phpt @@ -10,7 +10,7 @@ namespace TestNamespace { echo "Static method called!\n"; } - + public static function staticMethodWithArgs($arg1, $arg2, $arg3) { printf("Static method called with args: %s, %s, %s\n", $arg1, $arg2, $arg3); diff --git a/Zend/tests/instanceof_001.phpt b/Zend/tests/instanceof_001.phpt index 9c86136c54..8c13a0478c 100644 --- a/Zend/tests/instanceof_001.phpt +++ b/Zend/tests/instanceof_001.phpt @@ -1,7 +1,7 @@ --TEST-- Testing instanceof operator with several operators --FILE-- -<?php +<?php $a = new stdClass; var_dump($a instanceof stdClass); diff --git a/Zend/tests/instanceof_002.phpt b/Zend/tests/instanceof_002.phpt index d3f4a35358..0d37304262 100644 --- a/Zend/tests/instanceof_002.phpt +++ b/Zend/tests/instanceof_002.phpt @@ -1,7 +1,7 @@ --TEST-- Testing instanceof operator with class and interface inheriteds --FILE-- -<?php +<?php interface ITest { } diff --git a/Zend/tests/int_overflow_32bit.phpt b/Zend/tests/int_overflow_32bit.phpt index 0764e495f7..cfbf059630 100644 --- a/Zend/tests/int_overflow_32bit.phpt +++ b/Zend/tests/int_overflow_32bit.phpt @@ -20,7 +20,7 @@ foreach ($doubles as $d) { echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- int(-2147483648) int(-2147483647) int(-2147483638) diff --git a/Zend/tests/inter_007.phpt b/Zend/tests/inter_007.phpt index 13b18883b1..610210a7da 100644 --- a/Zend/tests/inter_007.phpt +++ b/Zend/tests/inter_007.phpt @@ -4,11 +4,11 @@ Trying inherit abstract function twice <?php interface d { - static function B(); + static function B(); } interface c { - function b(); + function b(); } class_alias('c', 'w'); diff --git a/Zend/tests/inter_01.phpt b/Zend/tests/inter_01.phpt index c73397c91a..f39d5a4181 100644 --- a/Zend/tests/inter_01.phpt +++ b/Zend/tests/inter_01.phpt @@ -11,7 +11,7 @@ class foobar implements foo { const foo = 'bar'; public function bar($x = foo::foo) { var_dump($x); - } + } } ?> --EXPECTF-- diff --git a/Zend/tests/inter_03.phpt b/Zend/tests/inter_03.phpt index c91f4aa142..48c1b5eec2 100644 --- a/Zend/tests/inter_03.phpt +++ b/Zend/tests/inter_03.phpt @@ -4,11 +4,11 @@ Testing interface constants with inheritance <?php interface a { - const b = 2; + const b = 2; } interface b extends a { - const c = self::b; + const c = self::b; } var_dump(b::c, a::b); diff --git a/Zend/tests/inter_04.phpt b/Zend/tests/inter_04.phpt index 6bac3fe339..97fddf73b2 100644 --- a/Zend/tests/inter_04.phpt +++ b/Zend/tests/inter_04.phpt @@ -1,7 +1,7 @@ --TEST-- Trying declare interface with repeated name of inherited method --FILE-- -<?php +<?php interface a { function b(); diff --git a/Zend/tests/jump04.phpt b/Zend/tests/jump04.phpt index 2bbf1f5c01..29ec25d8bd 100644 --- a/Zend/tests/jump04.phpt +++ b/Zend/tests/jump04.phpt @@ -3,18 +3,18 @@ jump 04: goto from loop (backward) --FILE-- <?php $s = "X"; -echo "1: ok\n"; +echo "1: ok\n"; L1: if ($s != "X") { - echo "4: ok\n"; -} else { - echo "2: ok\n"; + echo "4: ok\n"; +} else { + echo "2: ok\n"; while ($s != "XXX") { - echo "3: ok\n"; + echo "3: ok\n"; $s .= "X"; goto L1; - echo "bug\n"; + echo "bug\n"; } - echo "bug\n"; + echo "bug\n"; } ?> --EXPECT-- diff --git a/Zend/tests/jump11.phpt b/Zend/tests/jump11.phpt index bd1107c4ab..4c4c4f30a2 100644 --- a/Zend/tests/jump11.phpt +++ b/Zend/tests/jump11.phpt @@ -4,16 +4,16 @@ jump 08: goto inside switch in constructor <?php class foobar { public function __construct() { - switch (1) { + switch (1) { default: goto b; a: print "ok!\n"; - break; + break; b: print "ok!\n"; goto a; - } + } print "ok!\n"; } } diff --git a/Zend/tests/jump13.phpt b/Zend/tests/jump13.phpt index 2d57f4aabb..c281d8c93b 100644 --- a/Zend/tests/jump13.phpt +++ b/Zend/tests/jump13.phpt @@ -13,12 +13,12 @@ try { } catch(Exception $e) { c: print 3; - goto d; - } + goto d; + } } catch(Exception $e) { d: print 4; - goto e; + goto e; } ?> --EXPECT-- diff --git a/Zend/tests/jump14.phpt b/Zend/tests/jump14.phpt index 2cc6391ce9..f55480acc7 100644 --- a/Zend/tests/jump14.phpt +++ b/Zend/tests/jump14.phpt @@ -1,13 +1,13 @@ --TEST-- Testing GOTO inside blocks --FILE-- -<?php +<?php goto A; { B: - goto C; + goto C; return; } diff --git a/Zend/tests/lsb_001.phpt b/Zend/tests/lsb_001.phpt index f22649dcea..075109259a 100644 --- a/Zend/tests/lsb_001.phpt +++ b/Zend/tests/lsb_001.phpt @@ -10,7 +10,7 @@ class TestClass { protected static function staticFunction() { return 'TestClassFunction'; } - + public static function testStaticVar() { return static::$staticVar; } diff --git a/Zend/tests/lsb_002.phpt b/Zend/tests/lsb_002.phpt index 9dbc496cc0..1f433c3038 100644 --- a/Zend/tests/lsb_002.phpt +++ b/Zend/tests/lsb_002.phpt @@ -10,7 +10,7 @@ class TestClass { protected static function staticFunction() { return 'TestClassFunction'; } - + public function testStaticVar() { return static::$staticVar; } diff --git a/Zend/tests/lsb_015.phpt b/Zend/tests/lsb_015.phpt index 0c21012ca8..cdfa4113b9 100644 --- a/Zend/tests/lsb_015.phpt +++ b/Zend/tests/lsb_015.phpt @@ -11,7 +11,7 @@ class C { } public static function getException() { return new Exception(); - + } } class A { diff --git a/Zend/tests/lsb_019.phpt b/Zend/tests/lsb_019.phpt index 154a78a849..12ef60dbd6 100644 --- a/Zend/tests/lsb_019.phpt +++ b/Zend/tests/lsb_019.phpt @@ -8,7 +8,7 @@ class TestClass { protected static function staticFunction() { return 'TestClassFunction'; } - + public static function testStaticVar() { TestClass::$staticVar = 'TestClassStatic'; ChildClass1::$staticVar = 'ChildClassStatic'; diff --git a/Zend/tests/lsb_020.phpt b/Zend/tests/lsb_020.phpt index a7f5b42e67..e95ea53875 100644 --- a/Zend/tests/lsb_020.phpt +++ b/Zend/tests/lsb_020.phpt @@ -8,7 +8,7 @@ class TestClass { public static function staticFunction() { return 'TestClassFunction'; } - + public static function testStaticVar() { TestClass::$staticVar = 'TestClassStatic'; ChildClass1::$staticVar = 'ChildClassStatic'; diff --git a/Zend/tests/magic_by_ref_001.phpt b/Zend/tests/magic_by_ref_001.phpt index e9bcf8fa28..09d744418f 100644 --- a/Zend/tests/magic_by_ref_001.phpt +++ b/Zend/tests/magic_by_ref_001.phpt @@ -13,5 +13,5 @@ $t->$name = 1; echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Method test::__set() cannot take arguments by reference in %s on line %d diff --git a/Zend/tests/magic_by_ref_002.phpt b/Zend/tests/magic_by_ref_002.phpt index cb62f67f56..4129446857 100644 --- a/Zend/tests/magic_by_ref_002.phpt +++ b/Zend/tests/magic_by_ref_002.phpt @@ -12,5 +12,5 @@ $t->prop = 1; echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Method test::__set() cannot take arguments by reference in %s on line %d diff --git a/Zend/tests/magic_by_ref_003.phpt b/Zend/tests/magic_by_ref_003.phpt index 022cbd563c..c328b422ab 100644 --- a/Zend/tests/magic_by_ref_003.phpt +++ b/Zend/tests/magic_by_ref_003.phpt @@ -13,5 +13,5 @@ var_dump($t->$name); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Method test::__get() cannot take arguments by reference in %s on line %d diff --git a/Zend/tests/magic_by_ref_004.phpt b/Zend/tests/magic_by_ref_004.phpt index aa04d1aee6..a3a941d742 100644 --- a/Zend/tests/magic_by_ref_004.phpt +++ b/Zend/tests/magic_by_ref_004.phpt @@ -14,5 +14,5 @@ var_dump($t->$name); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Method test::__unset() cannot take arguments by reference in %s on line %d diff --git a/Zend/tests/magic_by_ref_005.phpt b/Zend/tests/magic_by_ref_005.phpt index 513c0618df..5c451cac13 100644 --- a/Zend/tests/magic_by_ref_005.phpt +++ b/Zend/tests/magic_by_ref_005.phpt @@ -14,5 +14,5 @@ var_dump(isset($t->$name)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Method test::__isset() cannot take arguments by reference in %s on line %d diff --git a/Zend/tests/magic_by_ref_006.phpt b/Zend/tests/magic_by_ref_006.phpt index 14d7d708b8..0d22c0ef4d 100644 --- a/Zend/tests/magic_by_ref_006.phpt +++ b/Zend/tests/magic_by_ref_006.phpt @@ -14,5 +14,5 @@ $t->$func(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Method test::__call() cannot take arguments by reference in %s on line %d diff --git a/Zend/tests/magic_by_ref_007.phpt b/Zend/tests/magic_by_ref_007.phpt index c962d45813..d38227b985 100644 --- a/Zend/tests/magic_by_ref_007.phpt +++ b/Zend/tests/magic_by_ref_007.phpt @@ -15,5 +15,5 @@ $t->$func($arg); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Method test::__call() cannot take arguments by reference in %s on line %d diff --git a/Zend/tests/magic_methods_001.phpt b/Zend/tests/magic_methods_001.phpt index 45701bf0a4..412702ded5 100644 --- a/Zend/tests/magic_methods_001.phpt +++ b/Zend/tests/magic_methods_001.phpt @@ -3,12 +3,12 @@ Testing several magic methods --FILE-- <?php -class foo { +class foo { function __unset($a) { print "unset\n"; var_dump($a); } - + public function __call($a, $b) { print "call\n"; var_dump($a); @@ -19,7 +19,7 @@ class foo { static public function __callstatic($a, $b) { print "callstatic\n"; } - + public function __tostring() { return 'foo'; } diff --git a/Zend/tests/magic_methods_002.phpt b/Zend/tests/magic_methods_002.phpt index fe0a4dcc3d..08b7f4497f 100644 --- a/Zend/tests/magic_methods_002.phpt +++ b/Zend/tests/magic_methods_002.phpt @@ -3,7 +3,7 @@ Testing __unset with private visibility --FILE-- <?php -class foo { +class foo { private function __unset($a) { print "unset\n"; } diff --git a/Zend/tests/magic_methods_003.phpt b/Zend/tests/magic_methods_003.phpt index be354ecc30..7e965ba3fd 100644 --- a/Zend/tests/magic_methods_003.phpt +++ b/Zend/tests/magic_methods_003.phpt @@ -3,7 +3,7 @@ Testing __unset declaring as static --FILE-- <?php -class foo { +class foo { static function __unset($a) { print "unset\n"; } diff --git a/Zend/tests/magic_methods_004.phpt b/Zend/tests/magic_methods_004.phpt index 33a0a60c09..8caf5d4aa1 100644 --- a/Zend/tests/magic_methods_004.phpt +++ b/Zend/tests/magic_methods_004.phpt @@ -3,7 +3,7 @@ Testing __unset() with protected visibility --FILE-- <?php -class foo { +class foo { protected function __unset($a) { print "unset\n"; } diff --git a/Zend/tests/method_exists_002.phpt b/Zend/tests/method_exists_002.phpt index cd49bdfc9e..385506b0b7 100644 --- a/Zend/tests/method_exists_002.phpt +++ b/Zend/tests/method_exists_002.phpt @@ -5,12 +5,12 @@ Testing method_exists() class bar { static public function stat_a2() { - } + } static private function stat_b2() { } static protected function stat_c2() { } - + private function method_a() { } protected function method_b() { @@ -23,12 +23,12 @@ class bar { class baz extends bar { static public function stat_a() { - } + } static private function stat_b() { } static protected function stat_c() { } - + private function method_a() { } protected function method_b() { diff --git a/Zend/tests/method_static_var.phpt b/Zend/tests/method_static_var.phpt index c5e82fef72..438982bd71 100644 --- a/Zend/tests/method_static_var.phpt +++ b/Zend/tests/method_static_var.phpt @@ -18,9 +18,9 @@ foo::test(); new Foo; foo::test(); -/** +/** * function_add_ref() makes a clone of static variables for inherited functions, so $i in Bar::test gets initial value 1 - */ + */ Bar::test(); Bar::test(); --EXPECT-- diff --git a/Zend/tests/mul_001.phpt b/Zend/tests/mul_001.phpt index d5843eef5f..ea587902d0 100644 --- a/Zend/tests/mul_001.phpt +++ b/Zend/tests/mul_001.phpt @@ -17,7 +17,7 @@ var_dump($c); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Exception: Unsupported operand types Fatal error: Uncaught Error: Unsupported operand types in %s:%d diff --git a/Zend/tests/nested_method_and_function.phpt b/Zend/tests/nested_method_and_function.phpt index 19f92ad260..3fa1b18da1 100644 --- a/Zend/tests/nested_method_and_function.phpt +++ b/Zend/tests/nested_method_and_function.phpt @@ -14,11 +14,11 @@ class Foo { } foo(); - + var_dump(__FUNCTION__); var_dump(__METHOD__); var_dump(__CLASS__); - + return function() {var_dump(__FUNCTION__); var_dump(__METHOD__); var_dump(__CLASS__); }; } } diff --git a/Zend/tests/not_001.phpt b/Zend/tests/not_001.phpt index 3f2c812a4c..2d7f85a8b4 100644 --- a/Zend/tests/not_001.phpt +++ b/Zend/tests/not_001.phpt @@ -16,7 +16,7 @@ var_dump(bin2hex($s1)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- int(-24) string(8) "8c90929a" Done diff --git a/Zend/tests/not_002.phpt b/Zend/tests/not_002.phpt index e59049c2a2..11efcaa2ea 100644 --- a/Zend/tests/not_002.phpt +++ b/Zend/tests/not_002.phpt @@ -17,7 +17,7 @@ var_dump($a); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Exception: Unsupported operand types Fatal error: Uncaught Error: Unsupported operand types in %s:%d diff --git a/Zend/tests/nowdoc_007.phpt b/Zend/tests/nowdoc_007.phpt index d9e941106f..35c9fddc36 100644 --- a/Zend/tests/nowdoc_007.phpt +++ b/Zend/tests/nowdoc_007.phpt @@ -4,7 +4,7 @@ braced and unbraced complex variable replacement test (nowdoc) <?php require_once 'nowdoc.inc'; - + print <<<'ENDOFNOWDOC' This is nowdoc test #s $a, {$b}, {$c['c']}, and {$d->d}. diff --git a/Zend/tests/nowdoc_011.phpt b/Zend/tests/nowdoc_011.phpt index 3d35989a9a..924125b1a2 100644 --- a/Zend/tests/nowdoc_011.phpt +++ b/Zend/tests/nowdoc_011.phpt @@ -6,7 +6,7 @@ Nowdocs CAN be used as static scalars. require_once 'nowdoc.inc'; class e { - + const E = <<<'THISMUSTNOTERROR' If you DON'T see this, something's wrong. THISMUSTNOTERROR; diff --git a/Zend/tests/nowdoc_016.phpt b/Zend/tests/nowdoc_016.phpt index 01eea4e751..6ad53692d2 100644 --- a/Zend/tests/nowdoc_016.phpt +++ b/Zend/tests/nowdoc_016.phpt @@ -1,7 +1,7 @@ --TEST-- Testing nowdocs with escape sequences --FILE-- -<?php +<?php $test = <<<'TEST' TEST; diff --git a/Zend/tests/nowdoc_017.phpt b/Zend/tests/nowdoc_017.phpt index 5d29a86ba8..3ac710811d 100644 --- a/Zend/tests/nowdoc_017.phpt +++ b/Zend/tests/nowdoc_017.phpt @@ -1,7 +1,7 @@ --TEST-- Testing nowdoc in default value for property --FILE-- -<?php +<?php class foo { public $bar = <<<'EOT' diff --git a/Zend/tests/ns_001.phpt b/Zend/tests/ns_001.phpt index 67715947af..100dbe50e9 100644 --- a/Zend/tests/ns_001.phpt +++ b/Zend/tests/ns_001.phpt @@ -9,11 +9,11 @@ class Foo { function __construct() { echo __CLASS__,"\n"; } - + function bar() { echo __CLASS__,"\n"; } - + static function baz() { echo __CLASS__,"\n"; } diff --git a/Zend/tests/ns_008.phpt b/Zend/tests/ns_008.phpt index 2c2c9180cf..a0ae4e2d8f 100644 --- a/Zend/tests/ns_008.phpt +++ b/Zend/tests/ns_008.phpt @@ -7,7 +7,7 @@ namespace test; class foo { } -$x = __NAMESPACE__ . "\\foo"; +$x = __NAMESPACE__ . "\\foo"; echo get_class(new $x),"\n"; --EXPECT-- test\foo diff --git a/Zend/tests/ns_009.phpt b/Zend/tests/ns_009.phpt index 3481316f28..21d2f00cc0 100644 --- a/Zend/tests/ns_009.phpt +++ b/Zend/tests/ns_009.phpt @@ -5,7 +5,7 @@ class foo { } -$x = __NAMESPACE__ . "\\foo"; +$x = __NAMESPACE__ . "\\foo"; echo get_class(new $x),"\n"; --EXPECT-- foo diff --git a/Zend/tests/ns_010.phpt b/Zend/tests/ns_010.phpt index 537757a66c..e0ccd349ed 100644 --- a/Zend/tests/ns_010.phpt +++ b/Zend/tests/ns_010.phpt @@ -4,7 +4,7 @@ <?php namespace X; use X as Y; -class Foo { +class Foo { const C = "const ok\n"; static $var = "var ok\n"; function __construct() { diff --git a/Zend/tests/ns_011.phpt b/Zend/tests/ns_011.phpt index 1706f2a00d..9ee6888a65 100644 --- a/Zend/tests/ns_011.phpt +++ b/Zend/tests/ns_011.phpt @@ -7,7 +7,7 @@ namespace test\ns1; function foo() { echo __FUNCTION__,"\n"; } - + foo(); \test\ns1\foo(); bar(); diff --git a/Zend/tests/ns_018.phpt b/Zend/tests/ns_018.phpt index 5c2495c631..9ad2fb89b5 100644 --- a/Zend/tests/ns_018.phpt +++ b/Zend/tests/ns_018.phpt @@ -8,7 +8,7 @@ function foo() { return __FUNCTION__; } -$x = __NAMESPACE__ . "\\foo"; +$x = __NAMESPACE__ . "\\foo"; echo $x(),"\n"; --EXPECT-- test\foo diff --git a/Zend/tests/ns_019.phpt b/Zend/tests/ns_019.phpt index c3db786867..91aea33e10 100644 --- a/Zend/tests/ns_019.phpt +++ b/Zend/tests/ns_019.phpt @@ -6,7 +6,7 @@ function foo() { return __FUNCTION__; } -$x = __NAMESPACE__ . "\\foo"; +$x = __NAMESPACE__ . "\\foo"; echo $x(),"\n"; --EXPECT-- foo diff --git a/Zend/tests/ns_041.phpt b/Zend/tests/ns_041.phpt index cf5c3929b5..e1f0ba3a97 100644 --- a/Zend/tests/ns_041.phpt +++ b/Zend/tests/ns_041.phpt @@ -5,7 +5,7 @@ namespace test\ns1; const FOO = "ok\n"; - + echo(FOO); echo(\test\ns1\FOO); echo(\test\ns1\FOO); diff --git a/Zend/tests/ns_064.phpt b/Zend/tests/ns_064.phpt index e287a1e9b2..546d3f6375 100644 --- a/Zend/tests/ns_064.phpt +++ b/Zend/tests/ns_064.phpt @@ -7,11 +7,11 @@ namespace test; class foo { public $e = array(); - + public function __construct() { $this->e[] = $this; } - + public function __set($a, $b) { var_dump($a, $b); } diff --git a/Zend/tests/ns_072.phpt b/Zend/tests/ns_072.phpt index 34a9bbf6ad..932a38b3ba 100644 --- a/Zend/tests/ns_072.phpt +++ b/Zend/tests/ns_072.phpt @@ -6,7 +6,7 @@ Testing parameter type-hinted with interface namespace foo; interface foo { - + } class bar { @@ -16,7 +16,7 @@ class bar { } class test implements foo { - + } diff --git a/Zend/tests/ns_073.phpt b/Zend/tests/ns_073.phpt index bb03308d71..8f083195d5 100644 --- a/Zend/tests/ns_073.phpt +++ b/Zend/tests/ns_073.phpt @@ -5,8 +5,8 @@ Testing type-hinted lambda parameter inside namespace namespace foo; -$x = function (\stdclass $x = NULL) { - var_dump($x); +$x = function (\stdclass $x = NULL) { + var_dump($x); }; $x(NULL); diff --git a/Zend/tests/ns_074.phpt b/Zend/tests/ns_074.phpt index 28d8bf96b6..9fd8699aec 100644 --- a/Zend/tests/ns_074.phpt +++ b/Zend/tests/ns_074.phpt @@ -5,8 +5,8 @@ Testing type-hinted lambda parameter inside namespace namespace foo; -$x = function (\stdclass $x = NULL) { - var_dump($x); +$x = function (\stdclass $x = NULL) { + var_dump($x); }; class stdclass extends \stdclass { } diff --git a/Zend/tests/numeric_string_errors_assign.phpt b/Zend/tests/numeric_string_errors_assign.phpt index 8d882aadcc..31cc8a3631 100644 --- a/Zend/tests/numeric_string_errors_assign.phpt +++ b/Zend/tests/numeric_string_errors_assign.phpt @@ -25,7 +25,7 @@ echo "---", PHP_EOL; $a = foxcache("11 sed"); $a *= "13 do"; var_dump($a); -$a = foxcache("eiusmod"); +$a = foxcache("eiusmod"); $a *= "tempor"; var_dump($a); echo "---", PHP_EOL; diff --git a/Zend/tests/objects_001.phpt b/Zend/tests/objects_001.phpt index fa1f171a28..42e0b54d31 100644 --- a/Zend/tests/objects_001.phpt +++ b/Zend/tests/objects_001.phpt @@ -27,7 +27,7 @@ var_dump($b == 1); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(false) bool(true) bool(true) diff --git a/Zend/tests/objects_002.phpt b/Zend/tests/objects_002.phpt index 8907c1b48c..1c45b2230c 100644 --- a/Zend/tests/objects_002.phpt +++ b/Zend/tests/objects_002.phpt @@ -10,15 +10,15 @@ class test { } class test2 extends test { - function foo() {} + function foo() {} } class test3 extends test { - function foo($arg) {} + function foo($arg) {} } echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: Declaration of test3::foo($arg) should be compatible with test::foo() in %s on line %d Done diff --git a/Zend/tests/objects_003.phpt b/Zend/tests/objects_003.phpt index 13ebd33d68..4486888c40 100644 --- a/Zend/tests/objects_003.phpt +++ b/Zend/tests/objects_003.phpt @@ -10,15 +10,15 @@ class test { } class test2 extends test { - function foo($arg) {} + function foo($arg) {} } class test3 extends test { - function foo($arg, $arg2) {} + function foo($arg, $arg2) {} } echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: Declaration of test3::foo($arg, $arg2) should be compatible with test::foo($arg) in %s on line %d Done diff --git a/Zend/tests/objects_004.phpt b/Zend/tests/objects_004.phpt index 5dd31eabf2..1cc90384a7 100644 --- a/Zend/tests/objects_004.phpt +++ b/Zend/tests/objects_004.phpt @@ -10,15 +10,15 @@ class test { } class test2 extends test { - function foo($arg) {} + function foo($arg) {} } class test3 extends test { - function foo(&$arg) {} + function foo(&$arg) {} } echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: Declaration of test3::foo(&$arg) should be compatible with test::foo($arg) in %s on line %d Done diff --git a/Zend/tests/objects_005.phpt b/Zend/tests/objects_005.phpt index 1db8a91cb8..a2369b731a 100644 --- a/Zend/tests/objects_005.phpt +++ b/Zend/tests/objects_005.phpt @@ -10,15 +10,15 @@ class test { } class test2 extends test { - function &foo() {} + function &foo() {} } class test3 extends test { - function foo() {} + function foo() {} } echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: Declaration of test3::foo() should be compatible with & test::foo() in %s on line %d Done diff --git a/Zend/tests/objects_006.phpt b/Zend/tests/objects_006.phpt index 4198b9749d..ed6ea6047a 100644 --- a/Zend/tests/objects_006.phpt +++ b/Zend/tests/objects_006.phpt @@ -10,15 +10,15 @@ class test { } class test2 extends test { - function foo($arg, $arg2 = NULL) {} + function foo($arg, $arg2 = NULL) {} } class test3 extends test { - function foo($arg, $arg2) {} + function foo($arg, $arg2) {} } echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: Declaration of test3::foo($arg, $arg2) should be compatible with test::foo($arg, $arg2 = NULL) in %s on line %d Done diff --git a/Zend/tests/objects_007.phpt b/Zend/tests/objects_007.phpt index f283b888f4..3094d60e8e 100644 --- a/Zend/tests/objects_007.phpt +++ b/Zend/tests/objects_007.phpt @@ -10,15 +10,15 @@ class test { } class test2 extends test { - function foo($arg, &$arg2 = NULL) {} + function foo($arg, &$arg2 = NULL) {} } class test3 extends test { - function foo($arg, &$arg2) {} + function foo($arg, &$arg2) {} } echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: Declaration of test3::foo($arg, &$arg2) should be compatible with test::foo($arg, &$arg2 = NULL) in %s on line %d Done diff --git a/Zend/tests/objects_008.phpt b/Zend/tests/objects_008.phpt index aae162ca9a..6554be99eb 100644 --- a/Zend/tests/objects_008.phpt +++ b/Zend/tests/objects_008.phpt @@ -10,15 +10,15 @@ class test { } class test2 extends test { - function foo(Test $arg) {} + function foo(Test $arg) {} } class test3 extends test { - function foo(Test3 $arg) {} + function foo(Test3 $arg) {} } echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: Declaration of test3::foo(Test3 $arg) should be compatible with test::foo(Test $arg) in %s on line %d Done diff --git a/Zend/tests/objects_009.phpt b/Zend/tests/objects_009.phpt index e2333235ab..3c91b22742 100644 --- a/Zend/tests/objects_009.phpt +++ b/Zend/tests/objects_009.phpt @@ -10,11 +10,11 @@ class test { } class test2 extends test { - function foo(Test $arg) {} + function foo(Test $arg) {} } class test3 extends test { - function foo($arg) {} + function foo($arg) {} } echo "Done\n"; diff --git a/Zend/tests/objects_010.phpt b/Zend/tests/objects_010.phpt index af02d91b72..19fbd1b0f0 100644 --- a/Zend/tests/objects_010.phpt +++ b/Zend/tests/objects_010.phpt @@ -12,5 +12,5 @@ class test { echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- Done diff --git a/Zend/tests/objects_012.phpt b/Zend/tests/objects_012.phpt index 95cce3eca9..dd5f149c42 100644 --- a/Zend/tests/objects_012.phpt +++ b/Zend/tests/objects_012.phpt @@ -11,5 +11,5 @@ interface bar extends foo { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: bar cannot implement foo - it is not an interface in %s on line %d diff --git a/Zend/tests/objects_013.phpt b/Zend/tests/objects_013.phpt index 3f7bea81af..0177a51a43 100644 --- a/Zend/tests/objects_013.phpt +++ b/Zend/tests/objects_013.phpt @@ -7,9 +7,9 @@ interface foo { } class bar implements foo, foo { -} +} echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Class bar cannot implement previously implemented interface foo in %s on line %d diff --git a/Zend/tests/objects_014.phpt b/Zend/tests/objects_014.phpt index c422b392ea..138fd4f294 100644 --- a/Zend/tests/objects_014.phpt +++ b/Zend/tests/objects_014.phpt @@ -7,9 +7,9 @@ interface foo { } interface bar extends foo, foo { -} +} echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Class bar cannot implement previously implemented interface foo in %s on line %d diff --git a/Zend/tests/objects_015.phpt b/Zend/tests/objects_015.phpt index a923ee0c46..714d27ad5b 100644 --- a/Zend/tests/objects_015.phpt +++ b/Zend/tests/objects_015.phpt @@ -15,7 +15,7 @@ var_dump(is_null($o)); ?> ===DONE=== ---EXPECT-- +--EXPECT-- bool(false) bool(true) bool(false) diff --git a/Zend/tests/objects_021.phpt b/Zend/tests/objects_021.phpt index 70dcbfbe72..d1fc63a38b 100644 --- a/Zend/tests/objects_021.phpt +++ b/Zend/tests/objects_021.phpt @@ -5,19 +5,19 @@ Testing magic methods __set, __get and __call in cascade class test { static public $i = 0; - + public function __construct() { self::$i++; } - + public function __set($a, $b) { return x(); } - + public function __get($a) { return x(); } - + public function __call($a, $b) { return x(); } diff --git a/Zend/tests/objects_022.phpt b/Zend/tests/objects_022.phpt index 5f537feaf4..d5a695739f 100644 --- a/Zend/tests/objects_022.phpt +++ b/Zend/tests/objects_022.phpt @@ -1,14 +1,14 @@ --TEST-- Testing 'self', 'parent' as type-hint --FILE-- -<?php +<?php interface iTest { } - + class baz implements iTest {} - + class bar { } - + class foo extends bar { public function testFoo(self $obj) { var_dump($obj); @@ -20,7 +20,7 @@ class foo extends bar { var_dump($obj); } } - + $foo = new foo; $foo->testFoo(new foo); $foo->testBar(new bar); diff --git a/Zend/tests/objects_023.phpt b/Zend/tests/objects_023.phpt index 042a20e9d8..5c8a8491ef 100644 --- a/Zend/tests/objects_023.phpt +++ b/Zend/tests/objects_023.phpt @@ -1,7 +1,7 @@ --TEST-- Creating instances dynamically --FILE-- -<?php +<?php $arr = array(new stdClass, 'stdClass'); diff --git a/Zend/tests/objects_024.phpt b/Zend/tests/objects_024.phpt index af3f879db9..cbdb1cc202 100644 --- a/Zend/tests/objects_024.phpt +++ b/Zend/tests/objects_024.phpt @@ -1,15 +1,15 @@ --TEST-- Testing direct assigning for property of object returned by function --FILE-- -<?php +<?php class foo { static $bar = array(); - + public function __set($a, $b) { self::$bar[] = $b; } - + public function __get($a) { /* last */ return self::$bar[count(self::$bar)-1]; diff --git a/Zend/tests/objects_025.phpt b/Zend/tests/objects_025.phpt index 8f7e961748..53c1ae077a 100644 --- a/Zend/tests/objects_025.phpt +++ b/Zend/tests/objects_025.phpt @@ -1,13 +1,13 @@ --TEST-- Testing invalid method names with __call and __callstatic --FILE-- -<?php +<?php class foo { public function __call($a, $b) { print "non-static - ok\n"; } - + public static function __callstatic($a, $b) { print "static - ok\n"; } diff --git a/Zend/tests/objects_027.phpt b/Zend/tests/objects_027.phpt index 9355169b2f..1a13f2de0a 100644 --- a/Zend/tests/objects_027.phpt +++ b/Zend/tests/objects_027.phpt @@ -1,20 +1,20 @@ --TEST-- Testing 'new static;' calling parent method --FILE-- -<?php +<?php class bar { public function show() { var_dump(new static); } } - + class foo extends bar { public function test() { parent::show(); } } - + $foo = new foo; $foo->test(); $foo::test(); diff --git a/Zend/tests/oct_overflow.phpt b/Zend/tests/oct_overflow.phpt index 77e4d2a8bc..13ac419511 100644 --- a/Zend/tests/oct_overflow.phpt +++ b/Zend/tests/oct_overflow.phpt @@ -20,7 +20,7 @@ foreach ($doubles as $d) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- float(4308640384%d) float(3545655%d) float(262143) diff --git a/Zend/tests/offset_array.phpt b/Zend/tests/offset_array.phpt index 790ed1d13c..a1d0a43c69 100644 --- a/Zend/tests/offset_array.phpt +++ b/Zend/tests/offset_array.phpt @@ -24,7 +24,7 @@ var_dump($arr[$arr1]); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(2) int(1) diff --git a/Zend/tests/offset_assign.phpt b/Zend/tests/offset_assign.phpt index caa717935f..04a4f41e6c 100644 --- a/Zend/tests/offset_assign.phpt +++ b/Zend/tests/offset_assign.phpt @@ -3,11 +3,11 @@ Crash on $x['x']['y'] += 1 when $x is string --FILE-- <?php $x = "a"; -$x['x']['y'] += 1; +$x['x']['y'] += 1; echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: Illegal string offset 'x' in %soffset_assign.php on line %d Fatal error: Uncaught Error: Cannot use string offset as an array in %soffset_assign.php:%d diff --git a/Zend/tests/offset_bool.phpt b/Zend/tests/offset_bool.phpt index f9bfeeac3e..a08dd5450c 100644 --- a/Zend/tests/offset_bool.phpt +++ b/Zend/tests/offset_bool.phpt @@ -24,7 +24,7 @@ var_dump($bool[$arr]); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- NULL NULL NULL diff --git a/Zend/tests/offset_long.phpt b/Zend/tests/offset_long.phpt index 41fedb5505..98b9b0f08b 100644 --- a/Zend/tests/offset_long.phpt +++ b/Zend/tests/offset_long.phpt @@ -24,7 +24,7 @@ var_dump($long[$arr]); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- NULL NULL NULL diff --git a/Zend/tests/offset_null.phpt b/Zend/tests/offset_null.phpt index cd98db40e7..c6ad6561db 100644 --- a/Zend/tests/offset_null.phpt +++ b/Zend/tests/offset_null.phpt @@ -24,7 +24,7 @@ var_dump($null[$arr]); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- NULL NULL NULL diff --git a/Zend/tests/offset_object.phpt b/Zend/tests/offset_object.phpt index 7ab636b6a8..972a901756 100644 --- a/Zend/tests/offset_object.phpt +++ b/Zend/tests/offset_object.phpt @@ -7,7 +7,7 @@ $object = new stdClass; var_dump($object[1]); ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Uncaught Error: Cannot use object of type stdClass as array in %s:%d Stack trace: #0 {main} diff --git a/Zend/tests/offset_string.phpt b/Zend/tests/offset_string.phpt index c546b37183..f7cb81bb20 100644 --- a/Zend/tests/offset_string.phpt +++ b/Zend/tests/offset_string.phpt @@ -27,7 +27,7 @@ var_dump($str[$arr]); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(1) "i" Notice: String offset cast occurred in %s on line %d diff --git a/Zend/tests/or_001.phpt b/Zend/tests/or_001.phpt index 1493ec0bec..43453b409e 100644 --- a/Zend/tests/or_001.phpt +++ b/Zend/tests/or_001.phpt @@ -21,7 +21,7 @@ var_dump($s); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(8) "3337>755" string(8) "3337>755" string(4) "wou" diff --git a/Zend/tests/property_exists.phpt b/Zend/tests/property_exists.phpt index f6d9a4a4e3..144b69c231 100644 --- a/Zend/tests/property_exists.phpt +++ b/Zend/tests/property_exists.phpt @@ -13,7 +13,7 @@ class aParent { var_dump(property_exists("A", "prot")); var_dump(property_exists("A", "prot2")); var_dump(property_exists("A", "prot3")); - print "------------------\n"; + print "------------------\n"; } public function nonstaticTest() { $a = new A; diff --git a/Zend/tests/selfParent_001.phpt b/Zend/tests/selfParent_001.phpt index 9d8cd6e22f..e7f1d2defa 100644 --- a/Zend/tests/selfParent_001.phpt +++ b/Zend/tests/selfParent_001.phpt @@ -5,7 +5,7 @@ Test when constants are initialised. See also selfParent_002.phpt. class A { const myConst = "const in A"; const myDynConst = self::myConst; - + public static function test() { var_dump(self::myDynConst); } diff --git a/Zend/tests/selfParent_002.phpt b/Zend/tests/selfParent_002.phpt index 18a8f09ea9..fda67f1e88 100644 --- a/Zend/tests/selfParent_002.phpt +++ b/Zend/tests/selfParent_002.phpt @@ -5,7 +5,7 @@ Test when constants are initialised. See also selfParent_001.phpt. class A { const myConst = "const in A"; const myDynConst = self::myConst; - + public static function test() { var_dump(self::myDynConst); } diff --git a/Zend/tests/self_and.phpt b/Zend/tests/self_and.phpt index 071eb509cb..26b86e5125 100644 --- a/Zend/tests/self_and.phpt +++ b/Zend/tests/self_and.phpt @@ -26,7 +26,7 @@ var_dump($s4); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(18) Warning: A non-numeric value encountered in %s on line %d diff --git a/Zend/tests/settype_bool.phpt b/Zend/tests/settype_bool.phpt index 72b973d0f2..06b003ac86 100644 --- a/Zend/tests/settype_bool.phpt +++ b/Zend/tests/settype_bool.phpt @@ -36,7 +36,7 @@ foreach ($vars as $var) { echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- bool(true) bool(true) bool(false) diff --git a/Zend/tests/settype_double.phpt b/Zend/tests/settype_double.phpt index 7f1deccc8f..11bdcfee72 100644 --- a/Zend/tests/settype_double.phpt +++ b/Zend/tests/settype_double.phpt @@ -1,5 +1,5 @@ --TEST-- -casting different variables to double using settype() +casting different variables to double using settype() --INI-- precision=14 --FILE-- @@ -38,7 +38,7 @@ foreach ($vars as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- float(0) float(8754456) float(0) diff --git a/Zend/tests/settype_int.phpt b/Zend/tests/settype_int.phpt index 7b96cd594e..f278bf1bcd 100644 --- a/Zend/tests/settype_int.phpt +++ b/Zend/tests/settype_int.phpt @@ -36,7 +36,7 @@ foreach ($vars as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(0) int(8754456) int(0) diff --git a/Zend/tests/settype_null.phpt b/Zend/tests/settype_null.phpt index 83ddb80561..e98b71ae8a 100644 --- a/Zend/tests/settype_null.phpt +++ b/Zend/tests/settype_null.phpt @@ -1,5 +1,5 @@ --TEST-- -casting different variables to null using settype() +casting different variables to null using settype() --FILE-- <?php @@ -36,7 +36,7 @@ foreach ($vars as $var) { echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- NULL NULL NULL diff --git a/Zend/tests/shift_001.phpt b/Zend/tests/shift_001.phpt index 7546f1a6d8..fba24f5fd0 100644 --- a/Zend/tests/shift_001.phpt +++ b/Zend/tests/shift_001.phpt @@ -18,7 +18,7 @@ var_dump($s2); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(492) Warning: A non-numeric value encountered in %s on line %d diff --git a/Zend/tests/shift_002.phpt b/Zend/tests/shift_002.phpt index 6288152585..fa068e1a90 100644 --- a/Zend/tests/shift_002.phpt +++ b/Zend/tests/shift_002.phpt @@ -18,7 +18,7 @@ var_dump($s2); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(30) Warning: A non-numeric value encountered in %s on line %d diff --git a/Zend/tests/strict_001.phpt b/Zend/tests/strict_001.phpt index f287d5e4dc..3fcaa8c2bc 100644 --- a/Zend/tests/strict_001.phpt +++ b/Zend/tests/strict_001.phpt @@ -13,7 +13,7 @@ var_dump($array[$fp]); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d int(%d) Done diff --git a/Zend/tests/strict_002.phpt b/Zend/tests/strict_002.phpt index cdeb73e0d8..8f76c8cf01 100644 --- a/Zend/tests/strict_002.phpt +++ b/Zend/tests/strict_002.phpt @@ -5,11 +5,11 @@ error_reporting=8191 --FILE-- <?php -class test { +class test { static $foo = 1; -} +} -$t = new test; +$t = new test; $t->foo = 5; $fp = fopen(__FILE__, 'r'); @@ -18,7 +18,7 @@ var_dump($t); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Notice: Accessing static property test::$foo as non static in %s on line %d object(test)#%d (1) { ["foo"]=> diff --git a/Zend/tests/sub_001.phpt b/Zend/tests/sub_001.phpt index 27091d1c5f..ef02c38241 100644 --- a/Zend/tests/sub_001.phpt +++ b/Zend/tests/sub_001.phpt @@ -17,7 +17,7 @@ var_dump($c); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Exception: Unsupported operand types Fatal error: Uncaught Error: Unsupported operand types in %s:%d diff --git a/Zend/tests/temporary_cleaning_007.phpt b/Zend/tests/temporary_cleaning_007.phpt index 0e29ed6c33..c84665981b 100644 --- a/Zend/tests/temporary_cleaning_007.phpt +++ b/Zend/tests/temporary_cleaning_007.phpt @@ -7,7 +7,7 @@ class saboteurTestController { } $controllers = array(new saboteurTestController(),new saboteurTestController()); -foreach ($controllers as $controller) { +foreach ($controllers as $controller) { try { if ($controller->isConsistent()) { return $controller; diff --git a/Zend/tests/temporary_cleaning_008.phpt b/Zend/tests/temporary_cleaning_008.phpt index fabd3b4b38..c876f3c2e8 100644 --- a/Zend/tests/temporary_cleaning_008.phpt +++ b/Zend/tests/temporary_cleaning_008.phpt @@ -9,7 +9,7 @@ try { } } catch (Exception $e) { echo "exception\n"; -} +} ?> --EXPECT-- exception diff --git a/Zend/tests/temporary_cleaning_011.phpt b/Zend/tests/temporary_cleaning_011.phpt index e4a6af3ab9..aa1be00e56 100644 --- a/Zend/tests/temporary_cleaning_011.phpt +++ b/Zend/tests/temporary_cleaning_011.phpt @@ -9,7 +9,7 @@ class A { } $b = new A(); $x = 0; -$c = [[$x,$x]]; +$c = [[$x,$x]]; try { list($a, $b) = $c[0]; } catch (Exception $e) { diff --git a/Zend/tests/traits/bug54441.phpt b/Zend/tests/traits/bug54441.phpt index 3fe688b3b1..bb83d12299 100644 --- a/Zend/tests/traits/bug54441.phpt +++ b/Zend/tests/traits/bug54441.phpt @@ -9,7 +9,7 @@ trait Foo { class Boo { use Foo { - bar as dontKnow; + bar as dontKnow; dontKnow as protected; } } diff --git a/Zend/tests/traits/bug55214.phpt b/Zend/tests/traits/bug55214.phpt index 890fc3792c..b27ae02428 100644 --- a/Zend/tests/traits/bug55214.phpt +++ b/Zend/tests/traits/bug55214.phpt @@ -10,7 +10,7 @@ trait ATrait { public static function get_class_name() { return __CLASS__; } - + public function get_class_name_obj() { return __CLASS__; } @@ -18,7 +18,7 @@ trait ATrait { public static function get_class_name2() { return self::$static_var; } - + public function get_class_name_obj2() { return $this->var; } diff --git a/Zend/tests/traits/bug55355.phpt b/Zend/tests/traits/bug55355.phpt index 301ceeeb09..22350a281f 100644 --- a/Zend/tests/traits/bug55355.phpt +++ b/Zend/tests/traits/bug55355.phpt @@ -8,7 +8,7 @@ trait ATrait { function bar() { $this->foo(); } - abstract function foo(); + abstract function foo(); } // A class on the second level in the diff --git a/Zend/tests/traits/bug55424.phpt b/Zend/tests/traits/bug55424.phpt index b6c3b54515..b1fdc8c353 100644 --- a/Zend/tests/traits/bug55424.phpt +++ b/Zend/tests/traits/bug55424.phpt @@ -11,7 +11,7 @@ Bug #55424 (Method got missing from class when a trait defined an abstract metho } abstract function setAttribute(); - } + } class Base { diff --git a/Zend/tests/traits/bug55554b.phpt b/Zend/tests/traits/bug55554b.phpt index 06229bac34..cf2eadf2f8 100644 --- a/Zend/tests/traits/bug55554b.phpt +++ b/Zend/tests/traits/bug55554b.phpt @@ -16,7 +16,7 @@ class OverridingIsSilent1 { use TConstructor { foo as __construct; } - + public function __construct() { echo "OverridingIsSilent1 __construct\n"; } @@ -28,7 +28,7 @@ class OverridingIsSilent2 { use TConstructor { foo as OverridingIsSilent2; } - + public function OverridingIsSilent2() { echo "OverridingIsSilent2 OverridingIsSilent2\n"; } diff --git a/Zend/tests/traits/bug55554c.phpt b/Zend/tests/traits/bug55554c.phpt index e1195ce883..ff6f37d3c2 100644 --- a/Zend/tests/traits/bug55554c.phpt +++ b/Zend/tests/traits/bug55554c.phpt @@ -28,7 +28,7 @@ trait TC2 { class ReportCollision { use TC1, TC2; - + public function __construct() { echo "New constructor executed\n"; } diff --git a/Zend/tests/traits/bug55554f.phpt b/Zend/tests/traits/bug55554f.phpt index 34b327d305..31f5f534c5 100644 --- a/Zend/tests/traits/bug55554f.phpt +++ b/Zend/tests/traits/bug55554f.phpt @@ -14,7 +14,7 @@ trait TNew { class ReportCollision { use TNew; - + public function ReportCollision() { echo "ReportCollision executed\n"; } diff --git a/Zend/tests/traits/bug55554g.phpt b/Zend/tests/traits/bug55554g.phpt index 22d269603e..662140cec0 100644 --- a/Zend/tests/traits/bug55554g.phpt +++ b/Zend/tests/traits/bug55554g.phpt @@ -14,7 +14,7 @@ trait TLegacy { class ReportCollision { use TLegacy; - + public function __construct() { echo "ReportCollision executed\n"; } diff --git a/Zend/tests/traits/bug60717.phpt b/Zend/tests/traits/bug60717.phpt index bf3adb1c88..d4bf7ea6de 100644 --- a/Zend/tests/traits/bug60717.phpt +++ b/Zend/tests/traits/bug60717.phpt @@ -34,12 +34,12 @@ namespace HTML { use TextArea, HTMLAttributes, TextUTF8; } - + class HTMLHelper2 implements Helper { use TextArea, TextUTF8, HTMLAttributes; } - + class HTMLHelper3 implements Helper { use HTMLAttributes, TextArea, TextUTF8; @@ -49,16 +49,16 @@ namespace HTML { use HTMLAttributes, TextUTF8, TextArea; } - + class HTMLHelper5 implements Helper { use TextUTF8, TextArea, HTMLAttributes; } - + class HTMLHelper6 implements Helper { use TextUTF8, HTMLAttributes, TextArea; - } + } $o = new HTMLHelper; $o = new HTMLHelper2; diff --git a/Zend/tests/traits/bug61998.phpt b/Zend/tests/traits/bug61998.phpt index c5a3e60fbb..097073892f 100644 --- a/Zend/tests/traits/bug61998.phpt +++ b/Zend/tests/traits/bug61998.phpt @@ -12,7 +12,7 @@ class Foo { } } -trait T1 { +trait T1 { public function func() { echo "From T1\n"; } @@ -39,7 +39,7 @@ class Bar { } } -trait T2 { +trait T2 { public function func2() { echo "From T2\n"; } diff --git a/Zend/tests/traits/bug74607.phpt b/Zend/tests/traits/bug74607.phpt index 6f158db7e2..12b0b376f0 100644 --- a/Zend/tests/traits/bug74607.phpt +++ b/Zend/tests/traits/bug74607.phpt @@ -3,16 +3,16 @@ Bug #74607 (Traits enforce different inheritance rules - return types) --FILE-- <?php -abstract class L1{ +abstract class L1{ abstract function m3($x); -} +} -trait L2t{ +trait L2t{ function m3($x): int{} -} +} -class L2 extends L1{ -use L2t; +class L2 extends L1{ +use L2t; } echo "DONE"; diff --git a/Zend/tests/traits/bug74607a.phpt b/Zend/tests/traits/bug74607a.phpt index efdced95c5..8ef3076fd6 100644 --- a/Zend/tests/traits/bug74607a.phpt +++ b/Zend/tests/traits/bug74607a.phpt @@ -3,16 +3,16 @@ Bug #74607 (Traits enforce different inheritance rules - number of required para --FILE-- <?php -abstract class L1{ +abstract class L1{ abstract function m3($x); -} +} -trait L2t{ +trait L2t{ function m3($x, $y = 0){} -} +} -class L2 extends L1{ -use L2t; +class L2 extends L1{ +use L2t; } echo "DONE"; diff --git a/Zend/tests/traits/bug75607a.phpt b/Zend/tests/traits/bug75607a.phpt index acf59186b6..12b555f728 100644 --- a/Zend/tests/traits/bug75607a.phpt +++ b/Zend/tests/traits/bug75607a.phpt @@ -20,7 +20,7 @@ class Base class Child extends base { - + } class Grand extends Child diff --git a/Zend/tests/traits/bugs/abstract-methods01.phpt b/Zend/tests/traits/bugs/abstract-methods01.phpt index 6275caa193..5b90ae0f3d 100644 --- a/Zend/tests/traits/bugs/abstract-methods01.phpt +++ b/Zend/tests/traits/bugs/abstract-methods01.phpt @@ -9,11 +9,11 @@ trait THello { } class TraitsTest { - use THello; + use THello; } $test = new TraitsTest(); $test->hello(); ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Class %s contains %d abstract method and must therefore be declared abstract or implement the remaining methods (%s) in %s on line %d
\ No newline at end of file diff --git a/Zend/tests/traits/bugs/abstract-methods02.phpt b/Zend/tests/traits/bugs/abstract-methods02.phpt index 25130c538b..626df3d6eb 100644 --- a/Zend/tests/traits/bugs/abstract-methods02.phpt +++ b/Zend/tests/traits/bugs/abstract-methods02.phpt @@ -22,5 +22,5 @@ class TraitsTest { $test = new TraitsTest(); $test->hello(); ?> ---EXPECT-- +--EXPECT-- Hello
\ No newline at end of file diff --git a/Zend/tests/traits/bugs/abstract-methods03.phpt b/Zend/tests/traits/bugs/abstract-methods03.phpt index 2a699d8df5..44746578e0 100644 --- a/Zend/tests/traits/bugs/abstract-methods03.phpt +++ b/Zend/tests/traits/bugs/abstract-methods03.phpt @@ -18,5 +18,5 @@ class TraitsTest { $test = new TraitsTest(); $test->hello(); ?> ---EXPECT-- +--EXPECT-- Hello
\ No newline at end of file diff --git a/Zend/tests/traits/bugs/abstract-methods04.phpt b/Zend/tests/traits/bugs/abstract-methods04.phpt index b3b5bfaca5..20ce8ab433 100644 --- a/Zend/tests/traits/bugs/abstract-methods04.phpt +++ b/Zend/tests/traits/bugs/abstract-methods04.phpt @@ -17,7 +17,7 @@ trait THelloImpl { class TraitsTest1 { use THello; - use THelloImpl; + use THelloImpl; } $test = new TraitsTest1(); @@ -25,12 +25,12 @@ $test->hello(); class TraitsTest2 { use THelloImpl; - use THello; + use THello; } $test = new TraitsTest2(); $test->hello(); ?> ---EXPECT-- +--EXPECT-- HelloHello
\ No newline at end of file diff --git a/Zend/tests/traits/bugs/abstract-methods05.phpt b/Zend/tests/traits/bugs/abstract-methods05.phpt index 839be75c2b..b40cbe30a6 100644 --- a/Zend/tests/traits/bugs/abstract-methods05.phpt +++ b/Zend/tests/traits/bugs/abstract-methods05.phpt @@ -16,10 +16,10 @@ trait THelloA { class TraitsTest1 { use THelloB; - use THelloA; + use THelloA; } ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Declaration of THelloB::hello() must be compatible with THelloA::hello($a) in %s on line %d diff --git a/Zend/tests/traits/bugs/abstract-methods06.phpt b/Zend/tests/traits/bugs/abstract-methods06.phpt index 8569aefb38..d8d4994f66 100644 --- a/Zend/tests/traits/bugs/abstract-methods06.phpt +++ b/Zend/tests/traits/bugs/abstract-methods06.phpt @@ -7,7 +7,7 @@ error_reporting(E_ALL); trait THelloB { public function hello() { echo 'Hello'; - } + } } trait THelloA { @@ -22,5 +22,5 @@ class TraitsTest1 { ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Declaration of THelloB::hello() must be compatible with THelloA::hello($a) in %s on line %d diff --git a/Zend/tests/traits/bugs/alias-semantics.phpt b/Zend/tests/traits/bugs/alias-semantics.phpt index 5e7965d6dc..a940ab0942 100644 --- a/Zend/tests/traits/bugs/alias-semantics.phpt +++ b/Zend/tests/traits/bugs/alias-semantics.phpt @@ -19,5 +19,5 @@ $test->a(); $test->b(); ?> ---EXPECT-- +--EXPECT-- AA
\ No newline at end of file diff --git a/Zend/tests/traits/bugs/alias-semantics02.phpt b/Zend/tests/traits/bugs/alias-semantics02.phpt index 58faf9f290..5ce117ea76 100644 --- a/Zend/tests/traits/bugs/alias-semantics02.phpt +++ b/Zend/tests/traits/bugs/alias-semantics02.phpt @@ -21,5 +21,5 @@ $test->a(); $test->b(); ?> ---EXPECT-- +--EXPECT-- AA
\ No newline at end of file diff --git a/Zend/tests/traits/bugs/alias01.phpt b/Zend/tests/traits/bugs/alias01.phpt index 4b89a54dda..e6c47858e5 100644 --- a/Zend/tests/traits/bugs/alias01.phpt +++ b/Zend/tests/traits/bugs/alias01.phpt @@ -7,7 +7,7 @@ trait T1 { function m2() { echo "T:m2\n"; } } -class C1 { +class C1 { use T1 { m1 as a1; } } diff --git a/Zend/tests/traits/bugs/interfaces.phpt b/Zend/tests/traits/bugs/interfaces.phpt index b632b73be2..97ec174a7f 100644 --- a/Zend/tests/traits/bugs/interfaces.phpt +++ b/Zend/tests/traits/bugs/interfaces.phpt @@ -15,5 +15,5 @@ trait THello implements MyInterface { } ?> ---EXPECTF-- +--EXPECTF-- Parse error: syntax error, unexpected 'implements' (T_IMPLEMENTS), expecting '{' in %s on line %d diff --git a/Zend/tests/traits/bugs/missing-trait.phpt b/Zend/tests/traits/bugs/missing-trait.phpt index ce4fa5c69a..1cdd4f1cc6 100644 --- a/Zend/tests/traits/bugs/missing-trait.phpt +++ b/Zend/tests/traits/bugs/missing-trait.phpt @@ -11,5 +11,5 @@ class TraitsTest { $test = new TraitsTest(); ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Trait 'THello' not found in %s on line %d
\ No newline at end of file diff --git a/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt b/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt index 464d9783a4..9425b9215b 100644 --- a/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt +++ b/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt @@ -27,5 +27,5 @@ class TraitsTest { $test = new TraitsTest(); $test->hello(); ?> ---EXPECT-- +--EXPECT-- Hello
\ No newline at end of file diff --git a/Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt b/Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt index 1b9d98dac0..b289651a9b 100644 --- a/Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt +++ b/Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt @@ -19,5 +19,5 @@ class baz $obj = new baz(); echo $obj->zoo, "\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: baz and foo define the same property ($zoo) in the composition of baz. However, the definition differs and is considered incompatible. Class was composed in %s on line %d
\ No newline at end of file diff --git a/Zend/tests/traits/conflict001.phpt b/Zend/tests/traits/conflict001.phpt index 32346b3d92..dfc9456853 100644 --- a/Zend/tests/traits/conflict001.phpt +++ b/Zend/tests/traits/conflict001.phpt @@ -21,5 +21,5 @@ class TraitsTest { use THello2; } ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Trait method hello has not been applied, because there are collisions with other trait methods on TraitsTest in %s on line %d
\ No newline at end of file diff --git a/Zend/tests/traits/conflict002.phpt b/Zend/tests/traits/conflict002.phpt index ab913d8b05..a723639ee9 100644 --- a/Zend/tests/traits/conflict002.phpt +++ b/Zend/tests/traits/conflict002.phpt @@ -28,5 +28,5 @@ class TheWorldIsNotEnough { $o = new TheWorldIsNotEnough(); $o->sayHello(); // echos Hello Universe! ?> ---EXPECT-- +--EXPECT-- Hello Universe!
\ No newline at end of file diff --git a/Zend/tests/traits/conflict003.phpt b/Zend/tests/traits/conflict003.phpt index 0e71063f19..577f5c73c3 100644 --- a/Zend/tests/traits/conflict003.phpt +++ b/Zend/tests/traits/conflict003.phpt @@ -27,5 +27,5 @@ class Talker { } ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Trait method smallTalk has not been applied, because there are collisions with other trait methods on Talker in %s on line %d
\ No newline at end of file diff --git a/Zend/tests/traits/error_001.phpt b/Zend/tests/traits/error_001.phpt index 307e5c128a..be4295a6d8 100644 --- a/Zend/tests/traits/error_001.phpt +++ b/Zend/tests/traits/error_001.phpt @@ -3,7 +3,7 @@ Trying to use instanceof for a method twice --FILE-- <?php -trait foo { +trait foo { public function foo() { return 1; } diff --git a/Zend/tests/traits/error_003.phpt b/Zend/tests/traits/error_003.phpt index 5122155bb3..23f62d2977 100644 --- a/Zend/tests/traits/error_003.phpt +++ b/Zend/tests/traits/error_003.phpt @@ -3,7 +3,7 @@ Trying to use an interface as trait --FILE-- <?php -interface abc { +interface abc { } class A { diff --git a/Zend/tests/traits/error_004.phpt b/Zend/tests/traits/error_004.phpt index c7ac916116..5bfcc263cc 100644 --- a/Zend/tests/traits/error_004.phpt +++ b/Zend/tests/traits/error_004.phpt @@ -3,7 +3,7 @@ Trying to use a class as trait --FILE-- <?php -class abc { +class abc { } class A { diff --git a/Zend/tests/traits/error_005.phpt b/Zend/tests/traits/error_005.phpt index 5aa5e10d95..99952f70e6 100644 --- a/Zend/tests/traits/error_005.phpt +++ b/Zend/tests/traits/error_005.phpt @@ -3,7 +3,7 @@ Trying to use a final class as trait --FILE-- <?php -final class abc { +final class abc { } class A { diff --git a/Zend/tests/traits/error_006.phpt b/Zend/tests/traits/error_006.phpt index 0169321936..54083a310f 100644 --- a/Zend/tests/traits/error_006.phpt +++ b/Zend/tests/traits/error_006.phpt @@ -3,7 +3,7 @@ Trying to use an abstract class as trait --FILE-- <?php -abstract class abc { +abstract class abc { } class A { diff --git a/Zend/tests/traits/error_007.phpt b/Zend/tests/traits/error_007.phpt index c015f6ea76..e6091749c9 100644 --- a/Zend/tests/traits/error_007.phpt +++ b/Zend/tests/traits/error_007.phpt @@ -3,7 +3,7 @@ Trying to instantiate a trait --FILE-- <?php -trait abc { +trait abc { } new abc; diff --git a/Zend/tests/traits/flattening001.phpt b/Zend/tests/traits/flattening001.phpt index 890147dc4a..eed429111e 100644 --- a/Zend/tests/traits/flattening001.phpt +++ b/Zend/tests/traits/flattening001.phpt @@ -36,7 +36,7 @@ $o->setText('bar'); var_dump($o->getText()); ?> ---EXPECT-- +--EXPECT-- string(4) "test" string(3) "foo" string(3) "bar"
\ No newline at end of file diff --git a/Zend/tests/traits/flattening002.phpt b/Zend/tests/traits/flattening002.phpt index 65f8e2fee5..72df973983 100644 --- a/Zend/tests/traits/flattening002.phpt +++ b/Zend/tests/traits/flattening002.phpt @@ -9,7 +9,7 @@ class Base { echo 'Hello '; } } - + trait SayWorld { public function sayHello() { parent::sayHello(); @@ -24,5 +24,5 @@ class MyHelloWorld extends Base { $o = new MyHelloWorld(); $o->sayHello(); ?> ---EXPECT-- +--EXPECT-- Hello World!
\ No newline at end of file diff --git a/Zend/tests/traits/flattening003.phpt b/Zend/tests/traits/flattening003.phpt index 3c5d461be1..276d117bb8 100644 --- a/Zend/tests/traits/flattening003.phpt +++ b/Zend/tests/traits/flattening003.phpt @@ -28,5 +28,5 @@ $o = new MyHelloWorld(); $o->sayHello(); $o->sayWorld(); ?> ---EXPECT-- +--EXPECT-- Hello World!
\ No newline at end of file diff --git a/Zend/tests/traits/inheritance001.phpt b/Zend/tests/traits/inheritance001.phpt index 951344ffbb..90cad90c46 100644 --- a/Zend/tests/traits/inheritance001.phpt +++ b/Zend/tests/traits/inheritance001.phpt @@ -20,5 +20,5 @@ class TheWorldIsNotEnough { $o = new TheWorldIsNotEnough(); $o->sayHello(); // echos Hello Universe! ?> ---EXPECT-- +--EXPECT-- Hello Universe!
\ No newline at end of file diff --git a/Zend/tests/traits/inheritance002.phpt b/Zend/tests/traits/inheritance002.phpt index d258e43981..0bcaca9f07 100644 --- a/Zend/tests/traits/inheritance002.phpt +++ b/Zend/tests/traits/inheritance002.phpt @@ -9,7 +9,7 @@ class Base { echo 'Hello '; } } - + trait SayWorld { public function sayHello() { echo 'World!'; @@ -23,5 +23,5 @@ class MyHelloWorld extends Base { $o = new MyHelloWorld(); $o->sayHello(); ?> ---EXPECT-- +--EXPECT-- World!
\ No newline at end of file diff --git a/Zend/tests/traits/inheritance003.phpt b/Zend/tests/traits/inheritance003.phpt index 22ff6e243c..1e630eef61 100644 --- a/Zend/tests/traits/inheritance003.phpt +++ b/Zend/tests/traits/inheritance003.phpt @@ -32,7 +32,7 @@ $o = new MyHelloWorld(); $o->sayHello(array()); ?> ---EXPECTF-- +--EXPECTF-- World! Fatal error: Declaration of SayWorld::sayHello(Base $d) must be compatible with Base::sayHello(array $a) in %s on line %d diff --git a/Zend/tests/traits/language001.phpt b/Zend/tests/traits/language001.phpt index cd8176ca3b..fd9ec2ddc2 100644 --- a/Zend/tests/traits/language001.phpt +++ b/Zend/tests/traits/language001.phpt @@ -17,5 +17,5 @@ class TraitsTest { $test = new TraitsTest(); $test->hello(); ?> ---EXPECT-- +--EXPECT-- Hello diff --git a/Zend/tests/traits/language002.phpt b/Zend/tests/traits/language002.phpt index bd11858ee0..ac29e2a124 100644 --- a/Zend/tests/traits/language002.phpt +++ b/Zend/tests/traits/language002.phpt @@ -15,18 +15,18 @@ trait World { echo 'World'; } } - + class MyHelloWorld { use Hello, World; public function sayExclamationMark() { echo '!'; } } - + $o = new MyHelloWorld(); $o->sayHello(); $o->sayWorld(); $o->sayExclamationMark(); ?> ---EXPECT-- +--EXPECT-- Hello World!
\ No newline at end of file diff --git a/Zend/tests/traits/language003.phpt b/Zend/tests/traits/language003.phpt index d3b7a64420..2b97a0a150 100644 --- a/Zend/tests/traits/language003.phpt +++ b/Zend/tests/traits/language003.phpt @@ -15,15 +15,15 @@ trait World { echo 'World'; } } - + class MyHelloWorld { use Hello, World { Hello::saySomething insteadof World; } } - + $o = new MyHelloWorld(); $o->saySomething(); ?> ---EXPECT-- +--EXPECT-- Hello
\ No newline at end of file diff --git a/Zend/tests/traits/language004.phpt b/Zend/tests/traits/language004.phpt index 31e9da99db..a582c3cd9d 100644 --- a/Zend/tests/traits/language004.phpt +++ b/Zend/tests/traits/language004.phpt @@ -15,17 +15,17 @@ trait World { echo ' World'; } } - + class MyHelloWorld { use Hello, World { Hello::saySomething insteadof World; World::saySomething as sayWorld; } } - + $o = new MyHelloWorld(); $o->saySomething(); $o->sayWorld(); ?> ---EXPECT-- +--EXPECT-- Hello World
\ No newline at end of file diff --git a/Zend/tests/traits/language005.phpt b/Zend/tests/traits/language005.phpt index 13319949f4..84b14c3420 100644 --- a/Zend/tests/traits/language005.phpt +++ b/Zend/tests/traits/language005.phpt @@ -24,7 +24,7 @@ trait B { class Talker { use A, B { - B::smallTalk insteadof A; + B::smallTalk insteadof A; A::bigTalk insteadof B; B::bigTalk as talk; } @@ -36,5 +36,5 @@ $t->bigTalk(); $t->talk(); ?> ---EXPECT-- +--EXPECT-- bAB
\ No newline at end of file diff --git a/Zend/tests/traits/language006.phpt b/Zend/tests/traits/language006.phpt index b51a8329ac..e2f77580a3 100644 --- a/Zend/tests/traits/language006.phpt +++ b/Zend/tests/traits/language006.phpt @@ -27,5 +27,5 @@ $o->setWorld(' World!'); $o->sayHelloWorld(); ?> ---EXPECT-- +--EXPECT-- Hello World!
\ No newline at end of file diff --git a/Zend/tests/traits/language007.phpt b/Zend/tests/traits/language007.phpt index 082022cc79..5ab676853f 100644 --- a/Zend/tests/traits/language007.phpt +++ b/Zend/tests/traits/language007.phpt @@ -26,5 +26,5 @@ $o->sayHello(); $o->sayWorld(); ?> ---EXPECT-- +--EXPECT-- Hello World!
\ No newline at end of file diff --git a/Zend/tests/traits/language008a.phpt b/Zend/tests/traits/language008a.phpt index 0d7a694d57..65a792faac 100644 --- a/Zend/tests/traits/language008a.phpt +++ b/Zend/tests/traits/language008a.phpt @@ -19,7 +19,7 @@ $o = new MyClass; $o->sayHello(); ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Uncaught Error: Call to protected method MyClass::sayHello() from context '' in %s:%d Stack trace: #0 {main} diff --git a/Zend/tests/traits/language008b.phpt b/Zend/tests/traits/language008b.phpt index 8f745126e3..c1a0d2629f 100644 --- a/Zend/tests/traits/language008b.phpt +++ b/Zend/tests/traits/language008b.phpt @@ -25,7 +25,7 @@ $o->sayHelloWorld(); ?> ---EXPECTF-- +--EXPECTF-- Hello World!Hello World! Fatal error: Uncaught Error: Call to private method MyClass::sayHelloWorld() from context '' in %s:%d Stack trace: diff --git a/Zend/tests/traits/language009.phpt b/Zend/tests/traits/language009.phpt index 477d267e29..998fde8e61 100644 --- a/Zend/tests/traits/language009.phpt +++ b/Zend/tests/traits/language009.phpt @@ -24,7 +24,7 @@ trait C { class MyClass { use C, A, B { - B::foo insteadof A, C; + B::foo insteadof A, C; } } @@ -32,5 +32,5 @@ $t = new MyClass; $t->foo(); ?> ---EXPECT-- +--EXPECT-- b
\ No newline at end of file diff --git a/Zend/tests/traits/language010.phpt b/Zend/tests/traits/language010.phpt index e550abb7bc..ac3ab2e29e 100644 --- a/Zend/tests/traits/language010.phpt +++ b/Zend/tests/traits/language010.phpt @@ -26,5 +26,5 @@ $o->hello(); $o->world(); ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Trait method world has not been applied, because there are collisions with other trait methods on MyClass in %s on line %d
\ No newline at end of file diff --git a/Zend/tests/traits/language011.phpt b/Zend/tests/traits/language011.phpt index 585699da55..44de874705 100644 --- a/Zend/tests/traits/language011.phpt +++ b/Zend/tests/traits/language011.phpt @@ -26,5 +26,5 @@ $o->sayHello(); $o->sayWorld(); ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Trait method sayHello has not been applied, because there are collisions with other trait methods on MyClass in %s on line %d diff --git a/Zend/tests/traits/language012.phpt b/Zend/tests/traits/language012.phpt index af854a79e2..3fe7fb8e62 100644 --- a/Zend/tests/traits/language012.phpt +++ b/Zend/tests/traits/language012.phpt @@ -22,6 +22,6 @@ $o->inc(); $o->inc(); ?> ---EXPECT-- +--EXPECT-- 1 2 diff --git a/Zend/tests/traits/language013.phpt b/Zend/tests/traits/language013.phpt index 91eba5705b..d3de644756 100644 --- a/Zend/tests/traits/language013.phpt +++ b/Zend/tests/traits/language013.phpt @@ -30,7 +30,7 @@ $p->inc(); $p->inc(); ?> ---EXPECT-- +--EXPECT-- 1 2 1 diff --git a/Zend/tests/traits/language014.phpt b/Zend/tests/traits/language014.phpt index 102b9aed41..20dcdea7c8 100644 --- a/Zend/tests/traits/language014.phpt +++ b/Zend/tests/traits/language014.phpt @@ -26,5 +26,5 @@ $o->hello(); $o->world(); ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Trait method hello has not been applied, because there are collisions with other trait methods on MyClass in %s on line %d diff --git a/Zend/tests/traits/methods_001.phpt b/Zend/tests/traits/methods_001.phpt index e1ee8152a6..758234f2d5 100644 --- a/Zend/tests/traits/methods_001.phpt +++ b/Zend/tests/traits/methods_001.phpt @@ -3,19 +3,19 @@ Testing magic method on trait --FILE-- <?php -trait foo { +trait foo { public function __toString() { return '123'; } - + public function __get($x) { var_dump($x); } - + public function __set($attr, $val) { var_dump($attr .'==='. $val); } - + public function __clone() { var_dump(__FUNCTION__); } diff --git a/Zend/tests/traits/methods_002.phpt b/Zend/tests/traits/methods_002.phpt index 4ed64c1a55..2a4215fb2c 100644 --- a/Zend/tests/traits/methods_002.phpt +++ b/Zend/tests/traits/methods_002.phpt @@ -3,7 +3,7 @@ Testing collision with magic methods --FILE-- <?php -trait foo { +trait foo { public function __clone() { var_dump(__FUNCTION__); } diff --git a/Zend/tests/traits/methods_003.phpt b/Zend/tests/traits/methods_003.phpt index 1c1218ae3a..d050b1135f 100644 --- a/Zend/tests/traits/methods_003.phpt +++ b/Zend/tests/traits/methods_003.phpt @@ -3,7 +3,7 @@ Testing __construct and __destruct with Trait --FILE-- <?php -trait foo { +trait foo { public function __construct() { var_dump(__FUNCTION__); } diff --git a/Zend/tests/traits/property001.phpt b/Zend/tests/traits/property001.phpt index 90dd8ca92d..291037da07 100644 --- a/Zend/tests/traits/property001.phpt +++ b/Zend/tests/traits/property001.phpt @@ -29,7 +29,7 @@ class TraitsTest2 { var_dump(property_exists('TraitsTest', 'foo')); var_dump(property_exists('TraitsTest2', 'foo')); ?> ---EXPECT-- +--EXPECT-- PRE-CLASS-GUARD-TraitsTest PRE-CLASS-GUARD-TraitsTest2 bool(true) diff --git a/Zend/tests/traits/property002.phpt b/Zend/tests/traits/property002.phpt index c96f314c93..ecd04fb332 100644 --- a/Zend/tests/traits/property002.phpt +++ b/Zend/tests/traits/property002.phpt @@ -25,7 +25,7 @@ var_dump(property_exists('TraitsTest', 'world')); $t = new TraitsTest; $t->test(); ?> ---EXPECT-- +--EXPECT-- bool(true) bool(true) hello World! diff --git a/Zend/tests/traits/property003.phpt b/Zend/tests/traits/property003.phpt index 09686277db..5a2863cfe1 100644 --- a/Zend/tests/traits/property003.phpt +++ b/Zend/tests/traits/property003.phpt @@ -23,7 +23,7 @@ echo "POST-CLASS-GUARD\n"; $t = new TraitsTest; $t->hello = "foo"; ?> ---EXPECTF-- +--EXPECTF-- PRE-CLASS-GUARD Fatal error: THello1 and THello2 define the same property ($hello) in the composition of TraitsTest. However, the definition differs and is considered incompatible. Class was composed in %s on line %d diff --git a/Zend/tests/traits/property004.phpt b/Zend/tests/traits/property004.phpt index a2a8d41301..53dca02e02 100644 --- a/Zend/tests/traits/property004.phpt +++ b/Zend/tests/traits/property004.phpt @@ -23,7 +23,7 @@ class TraitsTest { $t = new TraitsTest; ?> ---EXPECTF-- +--EXPECTF-- PRE-CLASS-GUARD Fatal error: THello1 and THello2 define the same property ($hello) in the composition of TraitsTest. However, the definition differs and is considered incompatible. Class was composed in %s on line %d diff --git a/Zend/tests/traits/property005.phpt b/Zend/tests/traits/property005.phpt index 2fce84e878..5bdbfcdaba 100644 --- a/Zend/tests/traits/property005.phpt +++ b/Zend/tests/traits/property005.phpt @@ -4,7 +4,7 @@ The same rules are applied for properties that are defined in the class hierarch <?php class Base { - private $hello; + private $hello; } trait THello1 { @@ -30,7 +30,7 @@ echo "POST-CLASS-GUARD2\n"; $t = new TraitsTest; $t->hello = "foo"; ?> ---EXPECTF-- +--EXPECTF-- PRE-CLASS-GUARD POST-CLASS-GUARD diff --git a/Zend/tests/traits/property006.phpt b/Zend/tests/traits/property006.phpt index fc21e558b9..bbb364e8fc 100644 --- a/Zend/tests/traits/property006.phpt +++ b/Zend/tests/traits/property006.phpt @@ -4,7 +4,7 @@ Introducing new private variables of the same name in a subclass is ok, and does <?php class Base { - private $hello; + private $hello; } trait THello1 { @@ -28,7 +28,7 @@ class Notice extends Base { } echo "POST-CLASS-GUARD2\n"; ?> ---EXPECT-- +--EXPECT-- PRE-CLASS-GUARD POST-CLASS-GUARD POST-CLASS-GUARD2 diff --git a/Zend/tests/traits/property007.phpt b/Zend/tests/traits/property007.phpt index d2f3f0ff59..ae52ef08e3 100644 --- a/Zend/tests/traits/property007.phpt +++ b/Zend/tests/traits/property007.phpt @@ -4,7 +4,7 @@ Introducing new private variables of the same name in a subclass is ok, and does <?php class Base { - protected $hello; + protected $hello; } trait THello1 { @@ -27,7 +27,7 @@ class Notice extends Base { } echo "POST-CLASS-GUARD2\n"; ?> ---EXPECT-- +--EXPECT-- PRE-CLASS-GUARD POST-CLASS-GUARD POST-CLASS-GUARD2 diff --git a/Zend/tests/traits/property008.phpt b/Zend/tests/traits/property008.phpt index 694ca85b5d..ff265be2a0 100644 --- a/Zend/tests/traits/property008.phpt +++ b/Zend/tests/traits/property008.phpt @@ -40,7 +40,7 @@ $b = new SubclassB; var_dump($b); ?> ---EXPECT-- +--EXPECT-- object(SubclassClassicInheritance)#1 (2) { ["hello":"SubclassClassicInheritance":private]=> int(0) diff --git a/Zend/tests/traits/trait_constant_001.phpt b/Zend/tests/traits/trait_constant_001.phpt index 590949c2f6..7a5268633e 100644 --- a/Zend/tests/traits/trait_constant_001.phpt +++ b/Zend/tests/traits/trait_constant_001.phpt @@ -14,7 +14,7 @@ class Direct { } class IndirectInheritance extends Direct { - + } trait TestTraitIndirect { diff --git a/Zend/tests/traits/trait_constant_002.phpt b/Zend/tests/traits/trait_constant_002.phpt index bbafbf210e..ece3f61f9d 100644 --- a/Zend/tests/traits/trait_constant_002.phpt +++ b/Zend/tests/traits/trait_constant_002.phpt @@ -8,11 +8,11 @@ __TRAIT__: Use outside of traits. return __TRAIT__; } } - + function someFun() { return __TRAIT__; } - + $t = __TRAIT__; var_dump($t); diff --git a/Zend/tests/try/catch_004.phpt b/Zend/tests/try/catch_004.phpt index 54920b8947..7c269cc336 100644 --- a/Zend/tests/try/catch_004.phpt +++ b/Zend/tests/try/catch_004.phpt @@ -20,7 +20,7 @@ class MyObject { echo __METHOD__ . "() Must not be called\n"; } - + static function test() { try diff --git a/Zend/tests/try/catch_finally_001.phpt b/Zend/tests/try/catch_finally_001.phpt index db0605fc05..0fa1404bcb 100644 --- a/Zend/tests/try/catch_finally_001.phpt +++ b/Zend/tests/try/catch_finally_001.phpt @@ -9,7 +9,7 @@ function foo ($throw = FALSE) { throw new Exception("ex"); } } catch (Exception $e) { - echo "catch\n"; + echo "catch\n"; } finally { echo "finally\n"; } diff --git a/Zend/tests/try/catch_finally_004.phpt b/Zend/tests/try/catch_finally_004.phpt index a2c22beab1..49cef2dc3b 100644 --- a/Zend/tests/try/catch_finally_004.phpt +++ b/Zend/tests/try/catch_finally_004.phpt @@ -19,7 +19,7 @@ function foo (&$ex) { } finally { echo "4"; throw_exception("finally"); - } + } } catch (Exception $e) { $ex = $e; echo "3"; diff --git a/Zend/tests/try/try_catch_finally_006.phpt b/Zend/tests/try/try_catch_finally_006.phpt index f09fa1fed2..d6466ab5a7 100644 --- a/Zend/tests/try/try_catch_finally_006.phpt +++ b/Zend/tests/try/try_catch_finally_006.phpt @@ -11,7 +11,7 @@ function foo($ex = NULL) { } finally { var_dump("finally1"); if ($ex) throw $ex; - } + } } catch (Exception $e) { var_dump("catched"); if ($ex) return "return1"; diff --git a/Zend/tests/try/try_catch_finally_007.phpt b/Zend/tests/try/try_catch_finally_007.phpt index fc3520c84c..224d9d9938 100644 --- a/Zend/tests/try/try_catch_finally_007.phpt +++ b/Zend/tests/try/try_catch_finally_007.phpt @@ -16,7 +16,7 @@ function foo($ret = FALSE) { } finally { var_dump("finally1"); throw new Exception("exception"); - } + } } catch (Exception $e) { goto local; local: diff --git a/Zend/tests/try/try_finally_007.phpt b/Zend/tests/try/try_finally_007.phpt index 634937495c..b180a7063f 100644 --- a/Zend/tests/try/try_finally_007.phpt +++ b/Zend/tests/try/try_finally_007.phpt @@ -5,7 +5,7 @@ Try finally (with goto previous label) function foo () { try { label: - echo "label"; + echo "label"; try { } finally { goto label; diff --git a/Zend/tests/unset_cv05.phpt b/Zend/tests/unset_cv05.phpt index 2992e624c3..f7a2736bc6 100644 --- a/Zend/tests/unset_cv05.phpt +++ b/Zend/tests/unset_cv05.phpt @@ -4,9 +4,9 @@ unset() CV 5 (indirect unset() of global variable in session_start()) session.auto_start=0 session.save_handler=files --SKIPIF-- -<?php +<?php -include(dirname(__FILE__).'/../../ext/session/tests/skipif.inc'); +include(dirname(__FILE__).'/../../ext/session/tests/skipif.inc'); ?> --FILE-- diff --git a/Zend/tests/variadic/optional_params.phpt b/Zend/tests/variadic/optional_params.phpt index ba965e538c..6cb516fa0c 100644 --- a/Zend/tests/variadic/optional_params.phpt +++ b/Zend/tests/variadic/optional_params.phpt @@ -6,7 +6,7 @@ Optional parameter before variadic parameter function fn($reqParam, $optParam = null, ...$params) { var_dump($reqParam, $optParam, $params); } - + fn(1); fn(1, 2); fn(1, 2, 3); diff --git a/Zend/tests/xor_001.phpt b/Zend/tests/xor_001.phpt index c61135e9e2..1a6d0fb633 100644 --- a/Zend/tests/xor_001.phpt +++ b/Zend/tests/xor_001.phpt @@ -11,6 +11,6 @@ var_dump($c); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- int(1) Done diff --git a/Zend/tests/xor_002.phpt b/Zend/tests/xor_002.phpt index bccf008931..cbcfa3a959 100644 --- a/Zend/tests/xor_002.phpt +++ b/Zend/tests/xor_002.phpt @@ -29,7 +29,7 @@ var_dump(bin2hex($s)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(6) "030107" string(6) "030107" string(8) "070a1e11" diff --git a/Zend/tests/xor_003.phpt b/Zend/tests/xor_003.phpt index 8fd0e98c05..4ed98f3415 100644 --- a/Zend/tests/xor_003.phpt +++ b/Zend/tests/xor_003.phpt @@ -12,7 +12,7 @@ var_dump($f ^ $f); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- int(1) int(0) int(0) diff --git a/Zend/tests/zend_strtod.phpt b/Zend/tests/zend_strtod.phpt index 56e25b241c..4530ce2e8c 100644 --- a/Zend/tests/zend_strtod.phpt +++ b/Zend/tests/zend_strtod.phpt @@ -11,7 +11,7 @@ var_dump("123123139932690.21688500" - "11399327900000000.21688500"); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- float(-100) float(808792757210) float(-4.5646456464565E+27) diff --git a/ext/bz2/tests/001.phpt b/ext/bz2/tests/001.phpt index 47dbfe8499..5a6b2878b8 100644 --- a/ext/bz2/tests/001.phpt +++ b/ext/bz2/tests/001.phpt @@ -18,7 +18,7 @@ var_dump(bzopen($fp, "r")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: bzopen() expects exactly 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/bz2/tests/002.phpt b/ext/bz2/tests/002.phpt index c55e22d0af..a69514a711 100644 --- a/ext/bz2/tests/002.phpt +++ b/ext/bz2/tests/002.phpt @@ -73,7 +73,7 @@ var_dump(bzopen($fp, "w")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) resource(%d) of type (stream) resource(%d) of type (stream) diff --git a/ext/bz2/tests/003-mb.phpt b/ext/bz2/tests/003-mb.phpt index fbc683cb72..6454d0d182 100644 --- a/ext/bz2/tests/003-mb.phpt +++ b/ext/bz2/tests/003-mb.phpt @@ -16,7 +16,7 @@ var_dump(bzread($fd, 100000)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: bzread() expects at least 1 parameter, 0 given in %s on line %d bool(false) diff --git a/ext/bz2/tests/003.phpt b/ext/bz2/tests/003.phpt index 1432600087..23b005ac11 100644 --- a/ext/bz2/tests/003.phpt +++ b/ext/bz2/tests/003.phpt @@ -16,7 +16,7 @@ var_dump(bzread($fd, 100000)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: bzread() expects at least 1 parameter, 0 given in %s on line %d bool(false) diff --git a/ext/bz2/tests/004.phpt b/ext/bz2/tests/004.phpt index 7467d84a90..1c12f4f9f7 100644 --- a/ext/bz2/tests/004.phpt +++ b/ext/bz2/tests/004.phpt @@ -43,7 +43,7 @@ var_dump(bzerrno($fd2)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(2) { ["errno"]=> int(0) diff --git a/ext/bz2/tests/bz2_filter_compress.phpt b/ext/bz2/tests/bz2_filter_compress.phpt index 3ca0c3901d..e735d8876c 100644 --- a/ext/bz2/tests/bz2_filter_compress.phpt +++ b/ext/bz2/tests/bz2_filter_compress.phpt @@ -12,6 +12,6 @@ stream_filter_append($fp, 'convert.base64-encode', STREAM_FILTER_WRITE); fwrite($fp, $text); fclose($fp); -?> ---EXPECT-- +?> +--EXPECT-- QlpoNDFBWSZTWRN6QG0AAAoVgECFACA395UgIABIintI1N6mpowIQ0E1MTTAQGYTNcRyMZm5kgW3ib7hVboE7Tmqj3ToGZ5G3q1ZauD2G58hibSck8KS95EEAbx1Cn+LuSKcKEgJvSA2gA== diff --git a/ext/bz2/tests/bz2_filter_decompress.phpt b/ext/bz2/tests/bz2_filter_decompress.phpt index c9b8ac0499..ca92f55934 100644 --- a/ext/bz2/tests/bz2_filter_decompress.phpt +++ b/ext/bz2/tests/bz2_filter_decompress.phpt @@ -12,6 +12,6 @@ stream_filter_append($fp, 'bzip2.decompress', STREAM_FILTER_WRITE); fwrite($fp, $text); fclose($fp); -?> ---EXPECT-- +?> +--EXPECT-- I am the very model of a modern major general, I've information vegetable, animal, and mineral. diff --git a/ext/calendar/tests/bug53574_2.phpt b/ext/calendar/tests/bug53574_2.phpt index 45e15cb398..1ac4834cd5 100644 --- a/ext/calendar/tests/bug53574_2.phpt +++ b/ext/calendar/tests/bug53574_2.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #53574 (Integer overflow in SdnToJulian; leads to segfault) --SKIPIF-- -<?php +<?php include 'skipif.inc'; if (PHP_INT_SIZE == 4) { die("skip this test is for 64bit platform only"); diff --git a/ext/calendar/tests/bug55797_2.phpt b/ext/calendar/tests/bug55797_2.phpt index 2a9183dd8d..4e4e9a4da9 100644 --- a/ext/calendar/tests/bug55797_2.phpt +++ b/ext/calendar/tests/bug55797_2.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #55797: Integer overflow in SdnToGregorian leads to segfault (in optimized builds) --SKIPIF-- -<?php +<?php include 'skipif.inc'; if (PHP_INT_SIZE == 4) { die("skip this test is for 64bit platform only"); diff --git a/ext/calendar/tests/cal_days_in_month.phpt b/ext/calendar/tests/cal_days_in_month.phpt index 9aaf3efdd0..fbd6362b0f 100644 --- a/ext/calendar/tests/cal_days_in_month.phpt +++ b/ext/calendar/tests/cal_days_in_month.phpt @@ -4,13 +4,13 @@ cal_days_in_month() <?php include 'skipif.inc'; ?> --FILE-- <?php -$num = cal_days_in_month(CAL_GREGORIAN, 8, 2003); +$num = cal_days_in_month(CAL_GREGORIAN, 8, 2003); echo "There are $num days in August 2003\n"; -$num = cal_days_in_month(CAL_GREGORIAN, 2, 2003); +$num = cal_days_in_month(CAL_GREGORIAN, 2, 2003); echo "There are $num days in February 2003\n"; -$num = cal_days_in_month(CAL_GREGORIAN, 2, 2004); +$num = cal_days_in_month(CAL_GREGORIAN, 2, 2004); echo "There are $num days in February 2004\n"; -$num = cal_days_in_month(CAL_GREGORIAN, 12, 2034); +$num = cal_days_in_month(CAL_GREGORIAN, 12, 2034); echo "There are $num days in December 2034\n"; ?> --EXPECT-- diff --git a/ext/calendar/tests/easter_date.phpt b/ext/calendar/tests/easter_date.phpt index 9222d3c271..065e1478d0 100644 --- a/ext/calendar/tests/easter_date.phpt +++ b/ext/calendar/tests/easter_date.phpt @@ -7,9 +7,9 @@ date.timezone=UTC --FILE-- <?php putenv('TZ=UTC'); -echo date("Y-m-d", easter_date(2000))."\n"; -echo date("Y-m-d", easter_date(2001))."\n"; -echo date("Y-m-d", easter_date(2002))."\n"; +echo date("Y-m-d", easter_date(2000))."\n"; +echo date("Y-m-d", easter_date(2001))."\n"; +echo date("Y-m-d", easter_date(2002))."\n"; echo date("Y-m-d", easter_date(1492))."\n"; ?> --EXPECTF-- diff --git a/ext/calendar/tests/jdtojewish64.phpt b/ext/calendar/tests/jdtojewish64.phpt index 2443563533..7c6c956223 100644 --- a/ext/calendar/tests/jdtojewish64.phpt +++ b/ext/calendar/tests/jdtojewish64.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #64895: Integer overflow in SndToJewish --SKIPIF-- -<?php +<?php include 'skipif.inc'; if (PHP_INT_SIZE == 4) { die("skip this test is for 64bit platform only"); diff --git a/ext/calendar/tests/jdtomonthname.phpt b/ext/calendar/tests/jdtomonthname.phpt index b864af309c..2ad50a450e 100644 --- a/ext/calendar/tests/jdtomonthname.phpt +++ b/ext/calendar/tests/jdtomonthname.phpt @@ -27,7 +27,7 @@ foreach ($jd_days as $jd_day) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- === 2453396 string(3) "Jan" string(7) "January" diff --git a/ext/com_dotnet/tests/bug33386.phpt b/ext/com_dotnet/tests/bug33386.phpt index e7dcd28489..102e69749b 100644 --- a/ext/com_dotnet/tests/bug33386.phpt +++ b/ext/com_dotnet/tests/bug33386.phpt @@ -1,12 +1,12 @@ --TEST-- Bug #33386 (ScriptControl only sees last function of class) --SKIPIF-- -<?php +<?php if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; if (4 != PHP_INT_SIZE) print "skip MSScriptControl isn't available under x64"; ?> --FILE-- -<?php +<?php error_reporting(E_ALL); class twoFuncs { diff --git a/ext/com_dotnet/tests/bug34272.phpt b/ext/com_dotnet/tests/bug34272.phpt index 3a65e2ce28..feb63c93c3 100644 --- a/ext/com_dotnet/tests/bug34272.phpt +++ b/ext/com_dotnet/tests/bug34272.phpt @@ -1,10 +1,10 @@ --TEST-- Bug #34272 (empty array onto COM object blows up) --SKIPIF-- -<?php +<?php if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?> --FILE-- -<?php +<?php error_reporting(E_ALL); try { diff --git a/ext/com_dotnet/tests/bug39596.phpt b/ext/com_dotnet/tests/bug39596.phpt index dc8d1ef066..bd89326560 100644 --- a/ext/com_dotnet/tests/bug39596.phpt +++ b/ext/com_dotnet/tests/bug39596.phpt @@ -1,10 +1,10 @@ --TEST-- Bug #39596 (Creating Variant of type VT_ARRAY) --SKIPIF-- -<?php +<?php if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?> --FILE-- -<?php +<?php error_reporting(E_ALL); try { diff --git a/ext/com_dotnet/tests/bug49192.phpt b/ext/com_dotnet/tests/bug49192.phpt index ccbf237b64..e16c1358b1 100644 --- a/ext/com_dotnet/tests/bug49192.phpt +++ b/ext/com_dotnet/tests/bug49192.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #49192 (PHP crashes when GC invoked on COM object) --SKIPIF-- -<?php +<?php if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?> --XFAIL-- 1 diff --git a/ext/com_dotnet/tests/bug66431_1.phpt b/ext/com_dotnet/tests/bug66431_1.phpt index de696d6587..11b76a1546 100644 --- a/ext/com_dotnet/tests/bug66431_1.phpt +++ b/ext/com_dotnet/tests/bug66431_1.phpt @@ -5,7 +5,7 @@ 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()); } @@ -19,15 +19,15 @@ $fpath = str_replace("/", "\\", dirname(__FILE__) . "/bug66431.docx"); com_load_typelib('Word.Application'); -$Wrd = new COM("word.application", NULL, CP_UTF8); +$Wrd = new COM("word.application", NULL, CP_UTF8); $Wrd->Documents->Add(); -$Wrd->Selection->TypeText($text); +$Wrd->Selection->TypeText($text); $Wrd->ActiveDocument->SaveAs($fpath); $Wrd->ActiveDocument->Close(false); $Wrd->Application->Quit(); unset($Wrd); -$Wrd = new COM("word.application", NULL, CP_UTF8); +$Wrd = new COM("word.application", NULL, CP_UTF8); $Wrd->Documents->Open($fpath, NULL, false); $check_text = $Wrd->ActiveDocument->Range($Wrd->ActiveDocument->Sentences(1)->Start, $Wrd->ActiveDocument->Sentences(1)->End)->Text; $Wrd->ActiveDocument->Close(false); diff --git a/ext/com_dotnet/tests/bug69939.phpt b/ext/com_dotnet/tests/bug69939.phpt index 6a778d510a..49ad20787a 100644 --- a/ext/com_dotnet/tests/bug69939.phpt +++ b/ext/com_dotnet/tests/bug69939.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #69939 (Casting object to bool returns false) --SKIPIF-- -<?php +<?php if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?> --FILE-- <?php diff --git a/ext/ctype/tests/001.phpt b/ext/ctype/tests/001.phpt index 0c80aecba4..edb1f52ab0 100644 --- a/ext/ctype/tests/001.phpt +++ b/ext/ctype/tests/001.phpt @@ -3,11 +3,11 @@ ctype on integers --SKIPIF-- <?php require_once('skipif.inc'); ?> --FILE-- -<?php - setlocale(LC_ALL,"C"); +<?php + setlocale(LC_ALL,"C"); function ctype_test_001($function) { - $n=0; + $n=0; for($a=0;$a<256;$a++) { if($function($a)) $n++; } @@ -15,10 +15,10 @@ ctype on integers } ctype_test_001("ctype_lower"); ctype_test_001("ctype_upper"); -ctype_test_001("ctype_alpha"); -ctype_test_001("ctype_digit"); -ctype_test_001("ctype_alnum"); -ctype_test_001("ctype_cntrl"); +ctype_test_001("ctype_alpha"); +ctype_test_001("ctype_digit"); +ctype_test_001("ctype_alnum"); +ctype_test_001("ctype_cntrl"); ctype_test_001("ctype_graph"); ctype_test_001("ctype_print"); ctype_test_001("ctype_punct"); diff --git a/ext/ctype/tests/002.phpt b/ext/ctype/tests/002.phpt index c20612cf44..e949db3992 100644 --- a/ext/ctype/tests/002.phpt +++ b/ext/ctype/tests/002.phpt @@ -3,7 +3,7 @@ ctype on strings --SKIPIF-- <?php require_once('skipif.inc'); ?> --FILE-- -<?php +<?php setlocale(LC_ALL,"C"); print "LOCALE is '" . setlocale(LC_ALL,0) . "'\n"; @@ -22,10 +22,10 @@ function ctype_test_002($function) { ctype_test_002("ctype_lower"); ctype_test_002("ctype_upper"); -ctype_test_002("ctype_alpha"); -ctype_test_002("ctype_digit"); -ctype_test_002("ctype_alnum"); -ctype_test_002("ctype_cntrl"); +ctype_test_002("ctype_alpha"); +ctype_test_002("ctype_digit"); +ctype_test_002("ctype_alnum"); +ctype_test_002("ctype_cntrl"); ctype_test_002("ctype_graph"); ctype_test_002("ctype_print"); ctype_test_002("ctype_punct"); diff --git a/ext/ctype/tests/ctype_alnum_basic.phpt b/ext/ctype/tests/ctype_alnum_basic.phpt index bf3712d9da..0ff710e31e 100644 --- a/ext/ctype/tests/ctype_alnum_basic.phpt +++ b/ext/ctype/tests/ctype_alnum_basic.phpt @@ -5,13 +5,13 @@ Test ctype_alnum() function : basic functionality --FILE-- <?php /* Prototype : bool ctype_alnum(mixed $c) - * Description: Checks for alphanumeric character(s) + * Description: Checks for alphanumeric character(s) * Source code: ext/ctype/ctype.c */ echo "*** Testing ctype_alnum() : basic functionality ***\n"; -$orig = setlocale(LC_CTYPE, "C"); +$orig = setlocale(LC_CTYPE, "C"); $c1 = 'abcXYZ'; $c2 = ' \t*@'; diff --git a/ext/ctype/tests/ctype_alnum_error.phpt b/ext/ctype/tests/ctype_alnum_error.phpt index 0b4a63632e..ed67406fa8 100644 --- a/ext/ctype/tests/ctype_alnum_error.phpt +++ b/ext/ctype/tests/ctype_alnum_error.phpt @@ -5,7 +5,7 @@ Test ctype_alnum() function : error conditions - Incorrect number of args --FILE-- <?php /* Prototype : bool ctype_alnum(mixed $c) - * Description: Checks for alphanumeric character(s) + * Description: Checks for alphanumeric character(s) * Source code: ext/ctype/ctype.c */ @@ -15,7 +15,7 @@ Test ctype_alnum() function : error conditions - Incorrect number of args echo "*** Testing ctype_alnum() : error conditions ***\n"; -$orig = setlocale(LC_CTYPE, "C"); +$orig = setlocale(LC_CTYPE, "C"); // Zero arguments echo "\n-- Testing ctype_alnum() function with Zero arguments --\n"; diff --git a/ext/ctype/tests/ctype_alnum_variation1.phpt b/ext/ctype/tests/ctype_alnum_variation1.phpt index 188a86ce40..3818ec6b89 100644 --- a/ext/ctype/tests/ctype_alnum_variation1.phpt +++ b/ext/ctype/tests/ctype_alnum_variation1.phpt @@ -5,7 +5,7 @@ Test ctype_alnum() function : usage variations - Different data types as $c arg --FILE-- <?php /* Prototype : bool ctype_alnum(mixed $c) - * Description: Checks for alphanumeric character(s) + * Description: Checks for alphanumeric character(s) * Source code: ext/ctype/ctype.c */ @@ -15,7 +15,7 @@ Test ctype_alnum() function : usage variations - Different data types as $c arg echo "*** Testing ctype_alnum() : usage variations ***\n"; -$orig = setlocale(LC_CTYPE, "C"); +$orig = setlocale(LC_CTYPE, "C"); //get an unset variable $unset_var = 10; @@ -62,7 +62,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -72,7 +72,7 @@ $inputs = array( /*19*/ "pqr", 'LMN', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/ctype/tests/ctype_alnum_variation2.phpt b/ext/ctype/tests/ctype_alnum_variation2.phpt index a73d06816b..3e802dea88 100644 --- a/ext/ctype/tests/ctype_alnum_variation2.phpt +++ b/ext/ctype/tests/ctype_alnum_variation2.phpt @@ -5,7 +5,7 @@ Test ctype_alnum() function : usage variations - different integers --FILE-- <?php /* Prototype : bool ctype_alnum(mixed $c) - * Description: Checks for alphanumeric character(s) + * Description: Checks for alphanumeric character(s) * Source code: ext/ctype/ctype.c */ @@ -16,7 +16,7 @@ Test ctype_alnum() function : usage variations - different integers echo "*** Testing ctype_alnum() : usage variations ***\n"; -$orig = setlocale(LC_CTYPE, "C"); +$orig = setlocale(LC_CTYPE, "C"); for ($i = 0; $i < 256; $i++) { if (ctype_alnum($i)) { diff --git a/ext/ctype/tests/ctype_alnum_variation3.phpt b/ext/ctype/tests/ctype_alnum_variation3.phpt index 3128feec6c..1f21f7d3bc 100644 --- a/ext/ctype/tests/ctype_alnum_variation3.phpt +++ b/ext/ctype/tests/ctype_alnum_variation3.phpt @@ -5,7 +5,7 @@ Test ctype_alnum() function : usage variations - different string values --FILE-- <?php /* Prototype : bool ctype_alnum(mixed $c) - * Description: Checks for alphanumeric character(s) + * Description: Checks for alphanumeric character(s) * Source code: ext/ctype/ctype.c */ @@ -15,7 +15,7 @@ Test ctype_alnum() function : usage variations - different string values echo "*** Testing ctype_alnum() : usage variations ***\n"; -$orig = setlocale(LC_CTYPE, "C"); +$orig = setlocale(LC_CTYPE, "C"); $values = array( /*1*/ "This string contains just letters and spaces", // Simple string @@ -39,7 +39,7 @@ $values = array( 'abc123\n', /*20*/ 'abc 123', '', - ' ', + ' ', /*23*/ base64_decode("w4DDoMOHw6fDiMOo") // non-ascii characters ); diff --git a/ext/ctype/tests/ctype_alnum_variation4.phpt b/ext/ctype/tests/ctype_alnum_variation4.phpt index d4577b51fb..c4f3a3dd75 100644 --- a/ext/ctype/tests/ctype_alnum_variation4.phpt +++ b/ext/ctype/tests/ctype_alnum_variation4.phpt @@ -5,7 +5,7 @@ Test ctype_alnum() function : usage variations - octal and hexadecimal values --FILE-- <?php /* Prototype : bool ctype_alnum(mixed $c) - * Description: Checks for alphanumeric character(s) + * Description: Checks for alphanumeric character(s) * Source code: ext/ctype/ctype.c */ @@ -15,7 +15,7 @@ Test ctype_alnum() function : usage variations - octal and hexadecimal values echo "*** Testing ctype_alnum() : usage variations ***\n"; -$orig = setlocale(LC_CTYPE, "C"); +$orig = setlocale(LC_CTYPE, "C"); $octal_values = array (060, 061, 062, 063); $hex_values = array(0x30, 0x31, 0x32, 0x33); diff --git a/ext/ctype/tests/ctype_alpha_basic.phpt b/ext/ctype/tests/ctype_alpha_basic.phpt index 041343770e..93e7f0f95a 100644 --- a/ext/ctype/tests/ctype_alpha_basic.phpt +++ b/ext/ctype/tests/ctype_alpha_basic.phpt @@ -5,7 +5,7 @@ Test ctype_alpha() function : basic functionality --FILE-- <?php /* Prototype : bool ctype_alpha(mixed $c) - * Description: Checks for alphabetic character(s) + * Description: Checks for alphabetic character(s) * Source code: ext/ctype/ctype.c */ diff --git a/ext/ctype/tests/ctype_alpha_error.phpt b/ext/ctype/tests/ctype_alpha_error.phpt index 4cf8234e0d..9334fef78b 100644 --- a/ext/ctype/tests/ctype_alpha_error.phpt +++ b/ext/ctype/tests/ctype_alpha_error.phpt @@ -5,7 +5,7 @@ Test ctype_alpha() function : error conditions - Incorrect number of arguments --FILE-- <?php /* Prototype : bool ctype_alpha(mixed $c) - * Description: Checks for alphabetic character(s) + * Description: Checks for alphabetic character(s) * Source code: ext/ctype/ctype.c */ diff --git a/ext/ctype/tests/ctype_alpha_variation1.phpt b/ext/ctype/tests/ctype_alpha_variation1.phpt index 52ca389749..3e00766cd6 100644 --- a/ext/ctype/tests/ctype_alpha_variation1.phpt +++ b/ext/ctype/tests/ctype_alpha_variation1.phpt @@ -5,7 +5,7 @@ Test ctype_alpha() function : usage variations - different data types as $c arg --FILE-- <?php /* Prototype : bool ctype_alpha(mixed $c) - * Description: Checks for alphabetic character(s) + * Description: Checks for alphabetic character(s) * Source code: ext/ctype/ctype.c */ @@ -62,7 +62,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -72,7 +72,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/ctype/tests/ctype_alpha_variation2.phpt b/ext/ctype/tests/ctype_alpha_variation2.phpt index f50328079e..170e3f0c74 100644 --- a/ext/ctype/tests/ctype_alpha_variation2.phpt +++ b/ext/ctype/tests/ctype_alpha_variation2.phpt @@ -5,7 +5,7 @@ Test ctype_alpha() function : usage variations - different integers --FILE-- <?php /* Prototype : bool ctype_alpha(mixed $c) - * Description: Checks for alphabetic character(s) + * Description: Checks for alphabetic character(s) * Source code: ext/ctype/ctype.c */ diff --git a/ext/ctype/tests/ctype_alpha_variation3.phpt b/ext/ctype/tests/ctype_alpha_variation3.phpt index 87cfc6fc00..388ffe8d11 100644 --- a/ext/ctype/tests/ctype_alpha_variation3.phpt +++ b/ext/ctype/tests/ctype_alpha_variation3.phpt @@ -5,7 +5,7 @@ Test ctype_alpha() function : usage variations - different strings --FILE-- <?php /* Prototype : bool ctype_alpha(mixed $c) - * Description: Checks for alphabetic character(s) + * Description: Checks for alphabetic character(s) * Source code: ext/ctype/ctype.c */ @@ -40,7 +40,7 @@ $values = array( 'abc123\n', /*20*/ 'abc 123', '', - ' ', + ' ', /*23*/ base64_decode("w4DDoMOHw6fDiMOo") // non-ascii characters ); diff --git a/ext/ctype/tests/ctype_alpha_variation4.phpt b/ext/ctype/tests/ctype_alpha_variation4.phpt index cc2067580a..480bab79f0 100644 --- a/ext/ctype/tests/ctype_alpha_variation4.phpt +++ b/ext/ctype/tests/ctype_alpha_variation4.phpt @@ -5,7 +5,7 @@ Test ctype_alpha() function : usage variations - Octal and hexadecimal values --FILE-- <?php /* Prototype : bool ctype_alpha(mixed $c) - * Description: Checks for alphabetic character(s) + * Description: Checks for alphabetic character(s) * Source code: ext/ctype/ctype.c */ diff --git a/ext/ctype/tests/ctype_cntrl_basic.phpt b/ext/ctype/tests/ctype_cntrl_basic.phpt index 2e44795541..bc0c9fed15 100644 --- a/ext/ctype/tests/ctype_cntrl_basic.phpt +++ b/ext/ctype/tests/ctype_cntrl_basic.phpt @@ -5,7 +5,7 @@ Test ctype_cntrl() function : basic functionality --FILE-- <?php /* Prototype : bool ctype_cntrl(mixed $c) - * Description: Checks for control character(s) + * Description: Checks for control character(s) * Source code: ext/ctype/ctype.c */ diff --git a/ext/ctype/tests/ctype_cntrl_error.phpt b/ext/ctype/tests/ctype_cntrl_error.phpt index 7319ef63e2..9b62f0c0ce 100644 --- a/ext/ctype/tests/ctype_cntrl_error.phpt +++ b/ext/ctype/tests/ctype_cntrl_error.phpt @@ -5,7 +5,7 @@ Test ctype_cntrl() function : error conditions - Incorrect number of args --FILE-- <?php /* Prototype : bool ctype_cntrl(mixed $c) - * Description: Checks for control character(s) + * Description: Checks for control character(s) * Source code: ext/ctype/ctype.c */ diff --git a/ext/ctype/tests/ctype_cntrl_variation1.phpt b/ext/ctype/tests/ctype_cntrl_variation1.phpt index abe74a0567..72a1f5f783 100644 --- a/ext/ctype/tests/ctype_cntrl_variation1.phpt +++ b/ext/ctype/tests/ctype_cntrl_variation1.phpt @@ -5,7 +5,7 @@ Test ctype_cntrl() function : usage variations - Different data types as $c arg --FILE-- <?php /* Prototype : bool ctype_cntrl(mixed $c) - * Description: Checks for control character(s) + * Description: Checks for control character(s) * Source code: ext/ctype/ctype.c */ @@ -62,7 +62,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -73,7 +73,7 @@ $inputs = array( ' ', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/ctype/tests/ctype_cntrl_variation2.phpt b/ext/ctype/tests/ctype_cntrl_variation2.phpt index 7ad64d8369..5a5ada8e36 100644 --- a/ext/ctype/tests/ctype_cntrl_variation2.phpt +++ b/ext/ctype/tests/ctype_cntrl_variation2.phpt @@ -5,7 +5,7 @@ Test ctype_cntrl() function : usage variations - different integers --FILE-- <?php /* Prototype : bool ctype_cntrl(mixed $c) - * Description: Checks for control character(s) + * Description: Checks for control character(s) * Source code: ext/ctype/ctype.c */ diff --git a/ext/ctype/tests/ctype_cntrl_variation3.phpt b/ext/ctype/tests/ctype_cntrl_variation3.phpt index 529c23876f..31e2ee2ea1 100644 --- a/ext/ctype/tests/ctype_cntrl_variation3.phpt +++ b/ext/ctype/tests/ctype_cntrl_variation3.phpt @@ -5,7 +5,7 @@ Test ctype_cntrl() function : usage variations - Different strings --FILE-- <?php /* Prototype : bool ctype_cntrl(mixed $c) - * Description: Checks for control character(s) + * Description: Checks for control character(s) * Source code: ext/ctype/ctype.c */ @@ -40,7 +40,7 @@ $values = array( 'abc123\n', /*20*/ 'abc 123', '', - ' ', + ' ', base64_decode("w4DDoMOHw6fDiMOo"), // non-ascii characters "\n", /*25*/ "\r", diff --git a/ext/ctype/tests/ctype_cntrl_variation4.phpt b/ext/ctype/tests/ctype_cntrl_variation4.phpt index 159ba911b1..dfad6ba2d8 100644 --- a/ext/ctype/tests/ctype_cntrl_variation4.phpt +++ b/ext/ctype/tests/ctype_cntrl_variation4.phpt @@ -5,7 +5,7 @@ Test ctype_cntrl() function : usage variations - Octal and hexadecimal values --FILE-- <?php /* Prototype : bool ctype_cntrl(mixed $c) - * Description: Checks for control character(s) + * Description: Checks for control character(s) * Source code: ext/ctype/ctype.c */ diff --git a/ext/ctype/tests/ctype_digit_basic.phpt b/ext/ctype/tests/ctype_digit_basic.phpt index 73e127356c..faf75251db 100644 --- a/ext/ctype/tests/ctype_digit_basic.phpt +++ b/ext/ctype/tests/ctype_digit_basic.phpt @@ -5,7 +5,7 @@ Test ctype_digit() function : basic functionality --FILE-- <?php /* Prototype : bool ctype_digit(mixed $c) - * Description: Checks for numeric character(s) + * Description: Checks for numeric character(s) * Source code: ext/ctype/ctype.c */ diff --git a/ext/ctype/tests/ctype_digit_error.phpt b/ext/ctype/tests/ctype_digit_error.phpt index 5e8088226a..ceade3d79b 100644 --- a/ext/ctype/tests/ctype_digit_error.phpt +++ b/ext/ctype/tests/ctype_digit_error.phpt @@ -5,7 +5,7 @@ Test ctype_digit() function : error conditions - incorrect number of arguments --FILE-- <?php /* Prototype : bool ctype_digit(mixed $c) - * Description: Checks for numeric character(s) + * Description: Checks for numeric character(s) * Source code: ext/ctype/ctype.c */ diff --git a/ext/ctype/tests/ctype_digit_variation1.phpt b/ext/ctype/tests/ctype_digit_variation1.phpt index 527d22f821..7233595139 100644 --- a/ext/ctype/tests/ctype_digit_variation1.phpt +++ b/ext/ctype/tests/ctype_digit_variation1.phpt @@ -5,7 +5,7 @@ Test ctype_digit() function : usage variations - different data types as $c arg --FILE-- <?php /* Prototype : bool ctype_digit(mixed $c) - * Description: Checks for numeric character(s) + * Description: Checks for numeric character(s) * Source code: ext/ctype/ctype.c */ @@ -62,7 +62,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -72,7 +72,7 @@ $inputs = array( /*19*/ "2", '309', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/ctype/tests/ctype_digit_variation2.phpt b/ext/ctype/tests/ctype_digit_variation2.phpt index 4122737d03..f4e3514aaf 100644 --- a/ext/ctype/tests/ctype_digit_variation2.phpt +++ b/ext/ctype/tests/ctype_digit_variation2.phpt @@ -5,7 +5,7 @@ Test ctype_digit() function : usage variations - different integers --FILE-- <?php /* Prototype : bool ctype_digit(mixed $c) - * Description: Checks for numeric character(s) + * Description: Checks for numeric character(s) * Source code: ext/ctype/ctype.c */ diff --git a/ext/ctype/tests/ctype_digit_variation3.phpt b/ext/ctype/tests/ctype_digit_variation3.phpt index c966132d16..5c428f6b30 100644 --- a/ext/ctype/tests/ctype_digit_variation3.phpt +++ b/ext/ctype/tests/ctype_digit_variation3.phpt @@ -5,7 +5,7 @@ Test ctype_digit() function : usage variations - different strings --FILE-- <?php /* Prototype : bool ctype_digit(mixed $c) - * Description: Checks for numeric character(s) + * Description: Checks for numeric character(s) * Source code: ext/ctype/ctype.c */ @@ -34,7 +34,7 @@ $values = array( '@!$*', "0", /*15*/ "3", - "9", + "9", "1234", "7890", "0677", diff --git a/ext/ctype/tests/ctype_digit_variation4.phpt b/ext/ctype/tests/ctype_digit_variation4.phpt index f937e07020..19e8a0cf4c 100644 --- a/ext/ctype/tests/ctype_digit_variation4.phpt +++ b/ext/ctype/tests/ctype_digit_variation4.phpt @@ -5,7 +5,7 @@ Test ctype_digit() function : usage variations - octal and hexadecimal values --FILE-- <?php /* Prototype : bool ctype_digit(mixed $c) - * Description: Checks for numeric character(s) + * Description: Checks for numeric character(s) * Source code: ext/ctype/ctype.c */ diff --git a/ext/ctype/tests/ctype_graph_variation1.phpt b/ext/ctype/tests/ctype_graph_variation1.phpt index f8dee30808..a1e49c8ebe 100644 --- a/ext/ctype/tests/ctype_graph_variation1.phpt +++ b/ext/ctype/tests/ctype_graph_variation1.phpt @@ -62,7 +62,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -72,7 +72,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/ctype/tests/ctype_lower_basic.phpt b/ext/ctype/tests/ctype_lower_basic.phpt index 08dcf81126..e3d7727399 100644 --- a/ext/ctype/tests/ctype_lower_basic.phpt +++ b/ext/ctype/tests/ctype_lower_basic.phpt @@ -5,7 +5,7 @@ Test ctype_lower() function : basic functionality --FILE-- <?php /* Prototype : bool ctype_lower(mixed $c) - * Description: Checks for lowercase character(s) + * Description: Checks for lowercase character(s) * Source code: ext/ctype/ctype.c */ diff --git a/ext/ctype/tests/ctype_lower_error.phpt b/ext/ctype/tests/ctype_lower_error.phpt index ef49c4cf44..1299cf8424 100644 --- a/ext/ctype/tests/ctype_lower_error.phpt +++ b/ext/ctype/tests/ctype_lower_error.phpt @@ -5,7 +5,7 @@ Test ctype_lower() function : error conditions - incorrect number of args --FILE-- <?php /* Prototype : bool ctype_lower(mixed $c) - * Description: Checks for lowercase character(s) + * Description: Checks for lowercase character(s) * Source code: ext/ctype/ctype.c */ diff --git a/ext/ctype/tests/ctype_lower_variation1.phpt b/ext/ctype/tests/ctype_lower_variation1.phpt index 9c4a306234..e47fb9e1a2 100644 --- a/ext/ctype/tests/ctype_lower_variation1.phpt +++ b/ext/ctype/tests/ctype_lower_variation1.phpt @@ -5,7 +5,7 @@ Test ctype_lower() function : usage variations - different data types as $c arg --FILE-- <?php /* Prototype : bool ctype_lower(mixed $c) - * Description: Checks for lowercase character(s) + * Description: Checks for lowercase character(s) * Source code: ext/ctype/ctype.c */ @@ -62,7 +62,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -72,7 +72,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), @@ -95,7 +95,7 @@ foreach($inputs as $input) { }; fclose($fp); - + setlocale(LC_CTYPE, $orig); ?> ===DONE=== diff --git a/ext/ctype/tests/ctype_lower_variation2.phpt b/ext/ctype/tests/ctype_lower_variation2.phpt index ac14004e1e..12793d180f 100644 --- a/ext/ctype/tests/ctype_lower_variation2.phpt +++ b/ext/ctype/tests/ctype_lower_variation2.phpt @@ -5,7 +5,7 @@ Test ctype_lower() function : usage variations - different integers --FILE-- <?php /* Prototype : bool ctype_lower(mixed $c) - * Description: Checks for lowercase character(s) + * Description: Checks for lowercase character(s) * Source code: ext/ctype/ctype.c */ @@ -23,7 +23,7 @@ for ($i = 0; $i < 256; $i++) { echo "character code $i is a lower case character\n"; } } - + setlocale(LC_CTYPE, $orig); ?> ===DONE=== diff --git a/ext/ctype/tests/ctype_lower_variation3.phpt b/ext/ctype/tests/ctype_lower_variation3.phpt index b2cbe2933c..7ba92e47dd 100644 --- a/ext/ctype/tests/ctype_lower_variation3.phpt +++ b/ext/ctype/tests/ctype_lower_variation3.phpt @@ -5,7 +5,7 @@ Test ctype_lower() function : usage variations - different strings --FILE-- <?php /* Prototype : bool ctype_lower(mixed $c) - * Description: Checks for lowercase character(s) + * Description: Checks for lowercase character(s) * Source code: ext/ctype/ctype.c */ diff --git a/ext/ctype/tests/ctype_lower_variation4.phpt b/ext/ctype/tests/ctype_lower_variation4.phpt index 30dfb4c931..835fc011ff 100644 --- a/ext/ctype/tests/ctype_lower_variation4.phpt +++ b/ext/ctype/tests/ctype_lower_variation4.phpt @@ -5,7 +5,7 @@ Test ctype_lower() function : usage variations - octal and hexadecimal values --FILE-- <?php /* Prototype : bool ctype_lower(mixed $c) - * Description: Checks for lowercase character(s) + * Description: Checks for lowercase character(s) * Source code: ext/ctype/ctype.c */ diff --git a/ext/ctype/tests/ctype_print_basic.phpt b/ext/ctype/tests/ctype_print_basic.phpt index 17df251e23..27446b7760 100644 --- a/ext/ctype/tests/ctype_print_basic.phpt +++ b/ext/ctype/tests/ctype_print_basic.phpt @@ -5,7 +5,7 @@ Test ctype_print() function : basic functionality --FILE-- <?php /* Prototype : bool ctype_print(mixed $c) - * Description: Checks for printable character(s) + * Description: Checks for printable character(s) * Source code: ext/ctype/ctype.c */ diff --git a/ext/ctype/tests/ctype_print_error.phpt b/ext/ctype/tests/ctype_print_error.phpt index 09ed8c94ca..922f959452 100644 --- a/ext/ctype/tests/ctype_print_error.phpt +++ b/ext/ctype/tests/ctype_print_error.phpt @@ -5,7 +5,7 @@ Test ctype_print() function : error conditions - incorrect number of args --FILE-- <?php /* Prototype : bool ctype_print(mixed $c) - * Description: Checks for printable character(s) + * Description: Checks for printable character(s) * Source code: ext/ctype/ctype.c */ diff --git a/ext/ctype/tests/ctype_print_variation1.phpt b/ext/ctype/tests/ctype_print_variation1.phpt index e2223c7223..7599b259da 100644 --- a/ext/ctype/tests/ctype_print_variation1.phpt +++ b/ext/ctype/tests/ctype_print_variation1.phpt @@ -5,7 +5,7 @@ Test ctype_print() function : usage variations - different data types as $c arg --FILE-- <?php /* Prototype : bool ctype_print(mixed $c) - * Description: Checks for printable character(s) + * Description: Checks for printable character(s) * Source code: ext/ctype/ctype.c */ @@ -62,7 +62,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -72,7 +72,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/ctype/tests/ctype_print_variation2.phpt b/ext/ctype/tests/ctype_print_variation2.phpt index 5d620d7112..1573bed988 100644 --- a/ext/ctype/tests/ctype_print_variation2.phpt +++ b/ext/ctype/tests/ctype_print_variation2.phpt @@ -5,7 +5,7 @@ Test ctype_print() function : usage variations - different integers --FILE-- <?php /* Prototype : bool ctype_print(mixed $c) - * Description: Checks for printable character(s) + * Description: Checks for printable character(s) * Source code: ext/ctype/ctype.c */ diff --git a/ext/ctype/tests/ctype_print_variation3.phpt b/ext/ctype/tests/ctype_print_variation3.phpt index fb872357fa..b669150ada 100644 --- a/ext/ctype/tests/ctype_print_variation3.phpt +++ b/ext/ctype/tests/ctype_print_variation3.phpt @@ -5,7 +5,7 @@ Test ctype_print() function : usage variations - different strings --FILE-- <?php /* Prototype : bool ctype_print(mixed $c) - * Description: Checks for printable character(s) + * Description: Checks for printable character(s) * Source code: ext/ctype/ctype.c */ @@ -40,7 +40,7 @@ $values = array( "abc123\n", /*20*/ 'abc 123', '', - ' ', + ' ', /*23*/ base64_decode("w4DDoMOHw6fDiMOo") // non-ascii characters ); diff --git a/ext/ctype/tests/ctype_print_variation4.phpt b/ext/ctype/tests/ctype_print_variation4.phpt index 21e040dcc2..7d1ed99284 100644 --- a/ext/ctype/tests/ctype_print_variation4.phpt +++ b/ext/ctype/tests/ctype_print_variation4.phpt @@ -5,7 +5,7 @@ Test ctype_print() function : usage variations - octal and hexadecimal values --FILE-- <?php /* Prototype : bool ctype_print(mixed $c) - * Description: Checks for printable character(s) + * Description: Checks for printable character(s) * Source code: ext/ctype/ctype.c */ diff --git a/ext/ctype/tests/ctype_punct_basic.phpt b/ext/ctype/tests/ctype_punct_basic.phpt index 2a1296bdb1..567d2c8c2d 100644 --- a/ext/ctype/tests/ctype_punct_basic.phpt +++ b/ext/ctype/tests/ctype_punct_basic.phpt @@ -12,7 +12,7 @@ Test ctype_punct() function : basic functionality echo "*** Testing ctype_punct() : basic functionality ***\n"; -$orig = setlocale(LC_CTYPE, "C"); +$orig = setlocale(LC_CTYPE, "C"); $c1 = '@!$*'; $c2 = 'hello, world!'; @@ -20,7 +20,7 @@ $c2 = 'hello, world!'; var_dump(ctype_punct($c1)); var_dump(ctype_punct($c2)); -setlocale(LC_CTYPE, $orig); +setlocale(LC_CTYPE, $orig); ?> ===DONE=== --EXPECT-- diff --git a/ext/ctype/tests/ctype_punct_error.phpt b/ext/ctype/tests/ctype_punct_error.phpt index afb9ff0de2..9503aea41e 100644 --- a/ext/ctype/tests/ctype_punct_error.phpt +++ b/ext/ctype/tests/ctype_punct_error.phpt @@ -16,7 +16,7 @@ Test ctype_punct() function : error conditions - incorrect number of args echo "*** Testing ctype_punct() : error conditions ***\n"; -$orig = setlocale(LC_CTYPE, "C"); +$orig = setlocale(LC_CTYPE, "C"); // Zero arguments echo "\n-- Testing ctype_punct() function with Zero arguments --\n"; @@ -28,7 +28,7 @@ $c = 1; $extra_arg = 10; var_dump( ctype_punct($c, $extra_arg) ); -setlocale(LC_CTYPE, $orig); +setlocale(LC_CTYPE, $orig); ?> ===DONE=== --EXPECTF-- diff --git a/ext/ctype/tests/ctype_punct_variation1.phpt b/ext/ctype/tests/ctype_punct_variation1.phpt index ccf882a191..97019be7a4 100644 --- a/ext/ctype/tests/ctype_punct_variation1.phpt +++ b/ext/ctype/tests/ctype_punct_variation1.phpt @@ -16,7 +16,7 @@ Test ctype_punct() function : usage variations - different data types as $c argu echo "*** Testing ctype_punct() : usage variations ***\n"; -$orig = setlocale(LC_CTYPE, "C"); +$orig = setlocale(LC_CTYPE, "C"); //get an unset variable $unset_var = 10; @@ -63,7 +63,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -73,7 +73,7 @@ $inputs = array( /*19*/ ";:'@", '#~/?', $heredoc, - + // object data /*22*/ new classA(), @@ -97,7 +97,7 @@ foreach($inputs as $input) { fclose($fp); -setlocale(LC_CTYPE, $orig); +setlocale(LC_CTYPE, $orig); ?> ===DONE=== --EXPECT-- diff --git a/ext/ctype/tests/ctype_punct_variation2.phpt b/ext/ctype/tests/ctype_punct_variation2.phpt index a75e3d5181..abf8cf8927 100644 --- a/ext/ctype/tests/ctype_punct_variation2.phpt +++ b/ext/ctype/tests/ctype_punct_variation2.phpt @@ -17,7 +17,7 @@ Test ctype_punct() function : usage variations - different integers echo "*** Testing ctype_punct() : usage variations ***\n"; -$orig = setlocale(LC_CTYPE, "C"); +$orig = setlocale(LC_CTYPE, "C"); for ($c = 1; $c < 256; $c++) { if (ctype_punct($c)) { @@ -25,7 +25,7 @@ for ($c = 1; $c < 256; $c++) { } } -setlocale(LC_CTYPE, $orig); +setlocale(LC_CTYPE, $orig); ?> ===DONE=== --EXPECT-- diff --git a/ext/ctype/tests/ctype_punct_variation3.phpt b/ext/ctype/tests/ctype_punct_variation3.phpt index cfc6b386bf..a0fa165577 100644 --- a/ext/ctype/tests/ctype_punct_variation3.phpt +++ b/ext/ctype/tests/ctype_punct_variation3.phpt @@ -41,7 +41,7 @@ $values = array( "abc123\n", /*20*/ 'abc 123', '', - ' ', + ' ', base64_decode("w4DDoMOHw6fDiMOo"), // non-ascii characters "!$%@\n", /*25*/ "\"?!\"", diff --git a/ext/ctype/tests/ctype_punct_variation4.phpt b/ext/ctype/tests/ctype_punct_variation4.phpt index f44e8db515..c875029193 100644 --- a/ext/ctype/tests/ctype_punct_variation4.phpt +++ b/ext/ctype/tests/ctype_punct_variation4.phpt @@ -16,7 +16,7 @@ Test ctype_punct() function : usage variations - Octal and Hexadecimal values echo "*** Testing ctype_punct() : usage variations ***\n"; -$orig = setlocale(LC_CTYPE, "C"); +$orig = setlocale(LC_CTYPE, "C"); $octal_values = array(041, 042, 043, 044); $hex_values = array(0x21, 0x22, 0x23, 0x24); @@ -37,7 +37,7 @@ foreach($hex_values as $c) { $iterator++; } -setlocale(LC_CTYPE, $orig); +setlocale(LC_CTYPE, $orig); ?> ===DONE=== --EXPECT-- diff --git a/ext/ctype/tests/ctype_space_basic.phpt b/ext/ctype/tests/ctype_space_basic.phpt index 4287f477ee..b693f2dce9 100644 --- a/ext/ctype/tests/ctype_space_basic.phpt +++ b/ext/ctype/tests/ctype_space_basic.phpt @@ -19,7 +19,7 @@ var_dump(ctype_space($c1)); $c2 = "Hello, world!\n"; var_dump(ctype_space($c2)); -setlocale(LC_CTYPE, $orig); +setlocale(LC_CTYPE, $orig); ?> ===DONE=== --EXPECT-- diff --git a/ext/ctype/tests/ctype_space_variation3.phpt b/ext/ctype/tests/ctype_space_variation3.phpt index ba4222b640..78ad296d27 100644 --- a/ext/ctype/tests/ctype_space_variation3.phpt +++ b/ext/ctype/tests/ctype_space_variation3.phpt @@ -40,7 +40,7 @@ $values = array( "abc123\n", /*20*/ 'abc 123', '', - ' ', + ' ', base64_decode("w4DDoMOHw6fDiMOo"), // non-ascii characters "\"\n", /*25*/ " \t\r\n", diff --git a/ext/ctype/tests/ctype_upper_basic.phpt b/ext/ctype/tests/ctype_upper_basic.phpt index 0d40e4294c..ac33a01b41 100644 --- a/ext/ctype/tests/ctype_upper_basic.phpt +++ b/ext/ctype/tests/ctype_upper_basic.phpt @@ -5,7 +5,7 @@ Test ctype_upper() function : basic functionality --FILE-- <?php /* Prototype : bool ctype_upper(mixed $c) - * Description: Checks for uppercase character(s) + * Description: Checks for uppercase character(s) * Source code: ext/ctype/ctype.c */ diff --git a/ext/ctype/tests/ctype_upper_error.phpt b/ext/ctype/tests/ctype_upper_error.phpt index e9183f4838..a7c18ce4a5 100644 --- a/ext/ctype/tests/ctype_upper_error.phpt +++ b/ext/ctype/tests/ctype_upper_error.phpt @@ -5,7 +5,7 @@ Test ctype_upper() function : error conditions - incorrect number of args --FILE-- <?php /* Prototype : bool ctype_upper(mixed $c) - * Description: Checks for uppercase character(s) + * Description: Checks for uppercase character(s) * Source code: ext/ctype/ctype.c */ diff --git a/ext/ctype/tests/ctype_upper_variation1.phpt b/ext/ctype/tests/ctype_upper_variation1.phpt index d3cf1c98d8..ac0fb29ad8 100644 --- a/ext/ctype/tests/ctype_upper_variation1.phpt +++ b/ext/ctype/tests/ctype_upper_variation1.phpt @@ -5,7 +5,7 @@ Test ctype_upper() function : usage variations - different data types --FILE-- <?php /* Prototype : bool ctype_upper(mixed $c) - * Description: Checks for uppercase character(s) + * Description: Checks for uppercase character(s) * Source code: ext/ctype/ctype.c */ @@ -62,7 +62,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -72,7 +72,7 @@ $inputs = array( /*19*/ "STRING", 'STRING', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/ctype/tests/ctype_upper_variation2.phpt b/ext/ctype/tests/ctype_upper_variation2.phpt index 5a8a2396da..5026f7f1a5 100644 --- a/ext/ctype/tests/ctype_upper_variation2.phpt +++ b/ext/ctype/tests/ctype_upper_variation2.phpt @@ -5,7 +5,7 @@ Test ctype_upper() function : usage variations - different integers --FILE-- <?php /* Prototype : bool ctype_upper(mixed $c) - * Description: Checks for uppercase character(s) + * Description: Checks for uppercase character(s) * Source code: ext/ctype/ctype.c */ diff --git a/ext/ctype/tests/ctype_upper_variation3.phpt b/ext/ctype/tests/ctype_upper_variation3.phpt index 9a25698e49..23dfe34369 100644 --- a/ext/ctype/tests/ctype_upper_variation3.phpt +++ b/ext/ctype/tests/ctype_upper_variation3.phpt @@ -5,7 +5,7 @@ Test ctype_upper() function : usage variations - different strings --FILE-- <?php /* Prototype : bool ctype_upper(mixed $c) - * Description: Checks for uppercase character(s) + * Description: Checks for uppercase character(s) * Source code: ext/ctype/ctype.c */ diff --git a/ext/ctype/tests/ctype_upper_variation4.phpt b/ext/ctype/tests/ctype_upper_variation4.phpt index cdd99d1078..ed001744e1 100644 --- a/ext/ctype/tests/ctype_upper_variation4.phpt +++ b/ext/ctype/tests/ctype_upper_variation4.phpt @@ -5,7 +5,7 @@ Test ctype_upper() function : usage variations - octal and hexadecimal values --FILE-- <?php /* Prototype : bool ctype_upper(mixed $c) - * Description: Checks for uppercase character(s) + * Description: Checks for uppercase character(s) * Source code: ext/ctype/ctype.c */ diff --git a/ext/ctype/tests/ctype_xdigit_basic.phpt b/ext/ctype/tests/ctype_xdigit_basic.phpt index 562846cfd5..b2d23b0548 100644 --- a/ext/ctype/tests/ctype_xdigit_basic.phpt +++ b/ext/ctype/tests/ctype_xdigit_basic.phpt @@ -10,7 +10,7 @@ Test ctype_xdigit() function : basic functionality */ echo "*** Testing ctype_xdigit() : basic functionality ***\n"; -$orig = setlocale(LC_CTYPE, "C"); +$orig = setlocale(LC_CTYPE, "C"); $c1 = 'abcdefABCDEF0123456789'; $c2 = 'face 034'; @@ -18,7 +18,7 @@ $c2 = 'face 034'; var_dump(ctype_xdigit($c1)); var_dump(ctype_xdigit($c2)); -setlocale(LC_CTYPE, $orig); +setlocale(LC_CTYPE, $orig); ?> ===DONE=== --EXPECT-- diff --git a/ext/ctype/tests/ctype_xdigit_variation1.phpt b/ext/ctype/tests/ctype_xdigit_variation1.phpt index d220729fe0..6ed6fe31b3 100644 --- a/ext/ctype/tests/ctype_xdigit_variation1.phpt +++ b/ext/ctype/tests/ctype_xdigit_variation1.phpt @@ -15,7 +15,7 @@ Test ctype_xdigit() function : usage variations - different data typse as $c arg echo "*** Testing ctype_xdigit() : usage variations ***\n"; -$orig = setlocale(LC_CTYPE, "C"); +$orig = setlocale(LC_CTYPE, "C"); //get an unset variable $unset_var = 10; @@ -62,7 +62,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -72,7 +72,7 @@ $inputs = array( /*19*/ "456", 'def', $heredoc, - + // object data /*22*/ new classA(), @@ -96,7 +96,7 @@ foreach($inputs as $input) { fclose($fp); -setlocale(LC_CTYPE, $orig); +setlocale(LC_CTYPE, $orig); ?> ===DONE=== --EXPECT-- diff --git a/ext/ctype/tests/ctype_xdigit_variation2.phpt b/ext/ctype/tests/ctype_xdigit_variation2.phpt index 458c54be11..28dd6063ff 100644 --- a/ext/ctype/tests/ctype_xdigit_variation2.phpt +++ b/ext/ctype/tests/ctype_xdigit_variation2.phpt @@ -16,7 +16,7 @@ Test ctype_xdigit() function : usage variations - different integers echo "*** Testing ctype_xdigit() : usage variations ***\n"; -$orig = setlocale(LC_CTYPE, "C"); +$orig = setlocale(LC_CTYPE, "C"); for($c = 1; $c < 256; $c++) { if (ctype_xdigit($c)) { @@ -24,7 +24,7 @@ for($c = 1; $c < 256; $c++) { } } -setlocale(LC_CTYPE, $orig); +setlocale(LC_CTYPE, $orig); ?> ===DONE=== --EXPECT-- diff --git a/ext/ctype/tests/ctype_xdigit_variation3.phpt b/ext/ctype/tests/ctype_xdigit_variation3.phpt index 282643a95d..1dd477ac00 100644 --- a/ext/ctype/tests/ctype_xdigit_variation3.phpt +++ b/ext/ctype/tests/ctype_xdigit_variation3.phpt @@ -16,7 +16,7 @@ Test ctype_xdigit() function : usage variations - Different strings echo "*** Testing ctype_xdigit() : usage variations ***\n"; -$orig = setlocale(LC_CTYPE, "C"); +$orig = setlocale(LC_CTYPE, "C"); $values = array( /*1*/ "This string contains just letters and spaces", // Simple string @@ -54,7 +54,7 @@ foreach($values as $value) { $iterator++; }; -setlocale(LC_CTYPE, $orig); +setlocale(LC_CTYPE, $orig); ?> ===DONE=== --EXPECT-- diff --git a/ext/ctype/tests/ctype_xdigit_variation4.phpt b/ext/ctype/tests/ctype_xdigit_variation4.phpt index f843edb0dc..8889c99cd5 100644 --- a/ext/ctype/tests/ctype_xdigit_variation4.phpt +++ b/ext/ctype/tests/ctype_xdigit_variation4.phpt @@ -18,7 +18,7 @@ Test ctype_xdigit() function : usage variations - heaxadecimal and octal values echo "*** Testing ctype_xdigit() : usage variations ***\n"; -$orig = setlocale(LC_CTYPE, "C"); +$orig = setlocale(LC_CTYPE, "C"); // contain hexadecimal digits but do not correspond to 'correct' ints $octal_values1 = array(012, 013, 014, 015); @@ -51,7 +51,7 @@ echo "'Correct' Integers: \n"; foreach($hex_values2 as $c) { var_dump(ctype_xdigit($c)); } -setlocale(LC_CTYPE, $orig); +setlocale(LC_CTYPE, $orig); ?> ===DONE=== --EXPECT-- diff --git a/ext/curl/tests/bug45161.phpt b/ext/curl/tests/bug45161.phpt index bfcd244004..bf6f669771 100644 --- a/ext/curl/tests/bug45161.phpt +++ b/ext/curl/tests/bug45161.phpt @@ -1,16 +1,16 @@ --TEST-- Bug #45161 (Reusing a curl handle leaks memory) --SKIPIF-- -<?php +<?php if (substr(PHP_OS, 0, 3) == 'WIN') { exit("skip not for Windows"); } if (!extension_loaded("curl")) { exit("skip curl extension not loaded"); } -$curl_version = curl_version(); +$curl_version = curl_version(); if ($curl_version['version_number'] < 0x071100) { - exit("skip: test works only with curl >= 7.17.0"); + exit("skip: test works only with curl >= 7.17.0"); } ?> --FILE-- diff --git a/ext/curl/tests/bug46711.phpt b/ext/curl/tests/bug46711.phpt index 3149c45d7e..8656513294 100644 --- a/ext/curl/tests/bug46711.phpt +++ b/ext/curl/tests/bug46711.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #46711 (lost memory when foreach is used for values passed to curl_setopt()) --SKIPIF-- -<?php +<?php if (!extension_loaded("curl")) { exit("skip curl extension not loaded"); } diff --git a/ext/curl/tests/bug46739.phpt b/ext/curl/tests/bug46739.phpt index 895bba7556..b7adc5662f 100644 --- a/ext/curl/tests/bug46739.phpt +++ b/ext/curl/tests/bug46739.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #46739 (array returned by curl_getinfo should contain content_type key) --SKIPIF-- -<?php +<?php if (!extension_loaded("curl")) { exit("skip curl extension not loaded"); } diff --git a/ext/curl/tests/bug54798-unix.phpt b/ext/curl/tests/bug54798-unix.phpt index d2542815d4..c6040a68e2 100644 --- a/ext/curl/tests/bug54798-unix.phpt +++ b/ext/curl/tests/bug54798-unix.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #54798 (Segfault when CURLOPT_STDERR file pointer is closed before calling curl_exec) --SKIPIF-- -<?php +<?php include 'skipif.inc'; if(substr(PHP_OS, 0, 3) == 'WIN' ) { die('skip not for Windows'); @@ -25,7 +25,7 @@ function checkForClosedFilePointer($host, $curl_option, $description) { } curl_setopt($ch, $curl_option, $fp); - + curl_setopt($ch, CURLOPT_URL, $host); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); diff --git a/ext/curl/tests/bug54798.phpt b/ext/curl/tests/bug54798.phpt index eab75e6fd4..35af8d0750 100644 --- a/ext/curl/tests/bug54798.phpt +++ b/ext/curl/tests/bug54798.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #54798 (Segfault when CURLOPT_STDERR file pointer is closed before calling curl_exec) --SKIPIF-- -<?php +<?php include 'skipif.inc'; ?> --FILE-- @@ -22,7 +22,7 @@ function checkForClosedFilePointer($host, $curl_option, $description) { } curl_setopt($ch, $curl_option, $fp); - + curl_setopt($ch, CURLOPT_URL, $host); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); diff --git a/ext/curl/tests/bug54995.phpt b/ext/curl/tests/bug54995.phpt index e113d130a1..0a12055056 100644 --- a/ext/curl/tests/bug54995.phpt +++ b/ext/curl/tests/bug54995.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #54995 (Missing CURLINFO_RESPONSE_CODE support) --SKIPIF-- -<?php +<?php include 'skipif.inc'; if ($curl_version['version_number'] > 0x070a08) { diff --git a/ext/curl/tests/bug55767.phpt b/ext/curl/tests/bug55767.phpt index 8690597ae8..2b35e1bcea 100644 --- a/ext/curl/tests/bug55767.phpt +++ b/ext/curl/tests/bug55767.phpt @@ -1,7 +1,7 @@ --TEST-- Test curl_opt() function with POST params from array with a numeric key --SKIPIF-- -<?php +<?php include 'skipif.inc'; ?> --FILE-- @@ -26,7 +26,7 @@ include 'skipif.inc'; curl_setopt($ch, CURLOPT_POST, 1); curl_setopt($ch, CURLOPT_POSTFIELDS, array('Hello'=>'World','Foo'=>'Bar',100=>'John Doe')); curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use - + $curl_content = curl_exec($ch); curl_close($ch); diff --git a/ext/curl/tests/bug61948-unix.phpt b/ext/curl/tests/bug61948-unix.phpt index cb84a466e7..78bb18ca1c 100644 --- a/ext/curl/tests/bug61948-unix.phpt +++ b/ext/curl/tests/bug61948-unix.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction) --SKIPIF-- -<?php if (!extension_loaded("curl")) print "skip"; +<?php if (!extension_loaded("curl")) print "skip"; if(substr(PHP_OS, 0, 3) == 'WIN' ) die("skip Not Valid for Windows"); ?> diff --git a/ext/curl/tests/bug62839.phpt b/ext/curl/tests/bug62839.phpt index be8646ea99..79df8d5153 100644 --- a/ext/curl/tests/bug62839.phpt +++ b/ext/curl/tests/bug62839.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #62839 (curl_copy_handle segfault with CURLOPT_FILE) --SKIPIF-- -<?php if (!extension_loaded("curl")) print "skip"; +<?php if (!extension_loaded("curl")) print "skip"; ?> --FILE-- <?php diff --git a/ext/curl/tests/bug68089.phpt b/ext/curl/tests/bug68089.phpt index d65441b2cc..4af1dc9e7f 100644 --- a/ext/curl/tests/bug68089.phpt +++ b/ext/curl/tests/bug68089.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #68089 (NULL byte injection - cURL lib) --SKIPIF-- -<?php +<?php include 'skipif.inc'; ?> diff --git a/ext/curl/tests/bug68937.phpt b/ext/curl/tests/bug68937.phpt index 013dd340d5..f9869143bf 100644 --- a/ext/curl/tests/bug68937.phpt +++ b/ext/curl/tests/bug68937.phpt @@ -1,7 +1,7 @@ --TEST-- Bug # #68937 (Segfault in curl_multi_exec) --SKIPIF-- -<?php +<?php include 'skipif.inc'; ?> --FILE-- diff --git a/ext/curl/tests/bug68937_2.phpt b/ext/curl/tests/bug68937_2.phpt index 33af654ec3..50afbb890e 100644 --- a/ext/curl/tests/bug68937_2.phpt +++ b/ext/curl/tests/bug68937_2.phpt @@ -1,7 +1,7 @@ --TEST-- Bug # #68937 (Segfault in curl_multi_exec) --SKIPIF-- -<?php +<?php include 'skipif.inc'; ?> --FILE-- diff --git a/ext/curl/tests/check_win_config.phpt b/ext/curl/tests/check_win_config.phpt index 33145a359d..8c9fcddbc2 100644 --- a/ext/curl/tests/check_win_config.phpt +++ b/ext/curl/tests/check_win_config.phpt @@ -1,9 +1,9 @@ --TEST-- Check libcurl config on windows --SKIPIF-- -<?php +<?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_001.phpt b/ext/curl/tests/curl_basic_001.phpt index 3feea49905..97e1bb2159 100644 --- a/ext/curl/tests/curl_basic_001.phpt +++ b/ext/curl/tests/curl_basic_001.phpt @@ -10,7 +10,7 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net> /* Prototype : bool curl_exec(resource ch) * Description: Perform a cURL session * Source code: ext/curl/interface.c - * Alias to functions: + * Alias to functions: */ include 'server.inc'; $host = curl_cli_server_start(); diff --git a/ext/curl/tests/curl_basic_002.phpt b/ext/curl/tests/curl_basic_002.phpt index 186fa66dfa..1b388267b0 100644 --- a/ext/curl/tests/curl_basic_002.phpt +++ b/ext/curl/tests/curl_basic_002.phpt @@ -25,7 +25,7 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net> ob_start(); // start output buffering curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use - + $curl_content = curl_exec($ch); curl_close($ch); diff --git a/ext/curl/tests/curl_basic_003.phpt b/ext/curl/tests/curl_basic_003.phpt index 07cbad4b7a..ce9216d535 100644 --- a/ext/curl/tests/curl_basic_003.phpt +++ b/ext/curl/tests/curl_basic_003.phpt @@ -27,7 +27,7 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net> curl_setopt($ch, CURLOPT_POST, 1); curl_setopt($ch, CURLOPT_POSTFIELDS, "Hello=World&Foo=Bar&Person=John%20Doe"); curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use - + $curl_content = curl_exec($ch); curl_close($ch); diff --git a/ext/curl/tests/curl_basic_004.phpt b/ext/curl/tests/curl_basic_004.phpt index b520db6c70..c25ec850f4 100644 --- a/ext/curl/tests/curl_basic_004.phpt +++ b/ext/curl/tests/curl_basic_004.phpt @@ -26,7 +26,7 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net> curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_REFERER, 'http://www.refer.er'); curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use - + $curl_content = curl_exec($ch); curl_close($ch); diff --git a/ext/curl/tests/curl_basic_005.phpt b/ext/curl/tests/curl_basic_005.phpt index 4d90ebfd37..3ec8906be8 100644 --- a/ext/curl/tests/curl_basic_005.phpt +++ b/ext/curl/tests/curl_basic_005.phpt @@ -26,7 +26,7 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net> curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_USERAGENT, 'cURL phpt'); curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use - + $curl_content = curl_exec($ch); curl_close($ch); diff --git a/ext/curl/tests/curl_basic_006.phpt b/ext/curl/tests/curl_basic_006.phpt index 5d37297bb2..03db778794 100644 --- a/ext/curl/tests/curl_basic_006.phpt +++ b/ext/curl/tests/curl_basic_006.phpt @@ -28,7 +28,7 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net> $GLOBALS['alldata'] .= $data; return strlen ($data); }); - + curl_exec($ch); curl_close($ch); ob_end_flush(); diff --git a/ext/curl/tests/curl_basic_008.phpt b/ext/curl/tests/curl_basic_008.phpt index 4f0a29d7ff..70f82532b7 100644 --- a/ext/curl/tests/curl_basic_008.phpt +++ b/ext/curl/tests/curl_basic_008.phpt @@ -4,7 +4,7 @@ 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"; + if (!extension_loaded("curl")) print "skip"; $addr = "www.".uniqid().".".uniqid(); if (gethostbyname($addr) != $addr) { print "skip catch all dns"; diff --git a/ext/curl/tests/curl_basic_011.phpt b/ext/curl/tests/curl_basic_011.phpt index 22be2b8b16..a21c1d66ba 100644 --- a/ext/curl/tests/curl_basic_011.phpt +++ b/ext/curl/tests/curl_basic_011.phpt @@ -23,9 +23,9 @@ TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com> ob_start(); // start output buffering curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($ch, CURLOPT_COOKIE, 'foo=bar'); + curl_setopt($ch, CURLOPT_COOKIE, 'foo=bar'); curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use - + $curl_content = curl_exec($ch); curl_close($ch); diff --git a/ext/curl/tests/curl_basic_015.phpt b/ext/curl/tests/curl_basic_015.phpt index 00ad7c9b1d..94af18e930 100644 --- a/ext/curl/tests/curl_basic_015.phpt +++ b/ext/curl/tests/curl_basic_015.phpt @@ -6,7 +6,7 @@ Jean-Marc Fontaine <jmf@durcommefaire.net> <?php if (!extension_loaded("curl")) exit("skip curl extension not loaded"); ?> --FILE-- <?php - $url = 'http://www.example.com/'; + $url = 'http://www.example.com/'; $ch = curl_init($url); var_dump($url == curl_getinfo($ch, CURLINFO_EFFECTIVE_URL)); ?> diff --git a/ext/curl/tests/curl_basic_016.phpt b/ext/curl/tests/curl_basic_016.phpt index 2bd1f05037..d1f162b3f2 100644 --- a/ext/curl/tests/curl_basic_016.phpt +++ b/ext/curl/tests/curl_basic_016.phpt @@ -3,7 +3,7 @@ Test curl_getinfo() function with basic functionality --CREDITS-- Jean-Marc Fontaine <jmf@durcommefaire.net> --SKIPIF-- -<?php +<?php if (!extension_loaded("curl")) exit("skip curl extension not loaded"); $curl_version = curl_version(); if ($curl_version['version_number'] > 0x071201) { diff --git a/ext/curl/tests/curl_basic_017.phpt b/ext/curl/tests/curl_basic_017.phpt index 2dd06c778a..49ee91ac03 100644 --- a/ext/curl/tests/curl_basic_017.phpt +++ b/ext/curl/tests/curl_basic_017.phpt @@ -9,9 +9,9 @@ TestFest 2009 - AFUP - Thomas Rabaix <thomas.rabaix@gmail.com> /* Prototype : bool curl_multi_exec(resource ch) * Description: Perform a cURL session * Source code: ext/curl/multi.c - * Alias to functions: + * Alias to functions: */ - + include 'server.inc'; $host = curl_cli_server_start(); @@ -24,33 +24,33 @@ TestFest 2009 - AFUP - Thomas Rabaix <thomas.rabaix@gmail.com> 1 => curl_init(), 2 => curl_init(), ); - + ob_start(); // start output buffering - + curl_setopt($chs[0], CURLOPT_URL, $url); //set the url we want to use curl_setopt($chs[1], CURLOPT_URL, $url); //set the url we want to use curl_setopt($chs[2], CURLOPT_URL, $url); //set the url we want to use - + $mh = curl_multi_init(); - + // add handlers curl_multi_add_handle($mh, $chs[0]); curl_multi_add_handle($mh, $chs[1]); curl_multi_add_handle($mh, $chs[2]); - + $running=null; //execute the handles $state = null; do { $state = curl_multi_exec($mh, $running); } while ($running > 0); - + //close the handles curl_multi_remove_handle($mh, $chs[0]); curl_multi_remove_handle($mh, $chs[1]); curl_multi_remove_handle($mh, $chs[2]); curl_multi_close($mh); - + $curl_content = ob_get_contents(); ob_end_clean(); diff --git a/ext/curl/tests/curl_basic_018.phpt b/ext/curl/tests/curl_basic_018.phpt index 46b80ed982..64a3426267 100644 --- a/ext/curl/tests/curl_basic_018.phpt +++ b/ext/curl/tests/curl_basic_018.phpt @@ -11,7 +11,7 @@ TestFest 2009 - AFUP - Thomas Rabaix <thomas.rabaix@gmail.com> * Source code: ext/curl/interface.c * Alias to functions: */ - + include 'server.inc'; $host = curl_cli_server_start(); @@ -24,25 +24,25 @@ TestFest 2009 - AFUP - Thomas Rabaix <thomas.rabaix@gmail.com> 1 => curl_init(), 2 => curl_init(), ); - + ob_start(); // start output buffering - + $options = array( CURLOPT_RETURNTRANSFER => 1, CURLOPT_URL => $url, ); - + curl_setopt_array($chs[0], $options); //set the options curl_setopt_array($chs[1], $options); //set the options curl_setopt_array($chs[2], $options); //set the options - + $mh = curl_multi_init(); - + // add handlers curl_multi_add_handle($mh, $chs[0]); curl_multi_add_handle($mh, $chs[1]); curl_multi_add_handle($mh, $chs[2]); - + $running=null; //execute the handles do { @@ -53,15 +53,15 @@ TestFest 2009 - AFUP - Thomas Rabaix <thomas.rabaix@gmail.com> $curl_content .= curl_multi_getcontent($chs[0]); $curl_content .= curl_multi_getcontent($chs[1]); $curl_content .= curl_multi_getcontent($chs[2]); - + //close the handles curl_multi_remove_handle($mh, $chs[0]); curl_multi_remove_handle($mh, $chs[1]); curl_multi_remove_handle($mh, $chs[2]); curl_multi_close($mh); - + var_dump( $curl_content ); - + ?> ===DONE=== --EXPECT-- diff --git a/ext/curl/tests/curl_basic_022.phpt b/ext/curl/tests/curl_basic_022.phpt index d4277a3f89..a01ca4f5c5 100644 --- a/ext/curl/tests/curl_basic_022.phpt +++ b/ext/curl/tests/curl_basic_022.phpt @@ -1,7 +1,7 @@ --TEST-- Test curl_getinfo() function with CURLINFO_COOKIELIST parameter --SKIPIF-- -<?php if (!extension_loaded("curl")) print "skip"; +<?php if (!extension_loaded("curl")) print "skip"; $curl_version = curl_version(); if ($curl_version['version_number'] < 0x070e01) { exit("skip: test works only with curl >= 7.14.1"); diff --git a/ext/curl/tests/curl_copy_handle_basic.phpt b/ext/curl/tests/curl_copy_handle_basic.phpt index 6aeb669abf..2903a751c6 100644 --- a/ext/curl/tests/curl_copy_handle_basic.phpt +++ b/ext/curl/tests/curl_copy_handle_basic.phpt @@ -4,7 +4,7 @@ Test curl_copy_handle() function with basic functionality Francesco Fullone ff@ideato.it #PHPTestFest Cesena Italia on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("curl")) exit("skip curl extension not loaded"); ?> --FILE-- diff --git a/ext/curl/tests/curl_copy_handle_basic_001.phpt b/ext/curl/tests/curl_copy_handle_basic_001.phpt index 0f1cf9dfd7..ba66d55286 100644 --- a/ext/curl/tests/curl_copy_handle_basic_001.phpt +++ b/ext/curl/tests/curl_copy_handle_basic_001.phpt @@ -19,10 +19,10 @@ Rick Buitenman <rick@meritos.nl> ob_start(); // start output buffering curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use - + $copy = curl_copy_handle($ch); curl_close($ch); - + $curl_content = curl_exec($copy); curl_close($copy); diff --git a/ext/curl/tests/curl_copy_handle_basic_002.phpt b/ext/curl/tests/curl_copy_handle_basic_002.phpt index 6b2136bda2..9542b804eb 100644 --- a/ext/curl/tests/curl_copy_handle_basic_002.phpt +++ b/ext/curl/tests/curl_copy_handle_basic_002.phpt @@ -20,10 +20,10 @@ Rick Buitenman <rick@meritos.nl> curl_setopt($ch, CURLOPT_POST, 1); curl_setopt($ch, CURLOPT_POSTFIELDS, "Hello=World&Foo=Bar&Person=John%20Doe"); curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use - + $copy = curl_copy_handle($ch); curl_close($ch); - + $curl_content = curl_exec($copy); curl_close($copy); diff --git a/ext/curl/tests/curl_copy_handle_basic_004.phpt b/ext/curl/tests/curl_copy_handle_basic_004.phpt index cad1be9865..ecef566f0b 100644 --- a/ext/curl/tests/curl_copy_handle_basic_004.phpt +++ b/ext/curl/tests/curl_copy_handle_basic_004.phpt @@ -19,13 +19,13 @@ Rick Buitenman <rick@meritos.nl> ob_start(); // start output buffering curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use - - + + $curl_content = curl_exec($ch); $copy = curl_copy_handle($ch); curl_close($ch); - - $curl_content_copy = curl_exec($copy); + + $curl_content_copy = curl_exec($copy); curl_close($copy); var_dump( $curl_content_copy ); diff --git a/ext/curl/tests/curl_copy_handle_basic_005.phpt b/ext/curl/tests/curl_copy_handle_basic_005.phpt index 939ee7381b..e37c52f550 100644 --- a/ext/curl/tests/curl_copy_handle_basic_005.phpt +++ b/ext/curl/tests/curl_copy_handle_basic_005.phpt @@ -21,12 +21,12 @@ Rick Buitenman <rick@meritos.nl> curl_setopt($ch, CURLOPT_POST, 1); curl_setopt($ch, CURLOPT_POSTFIELDS, "Hello=World&Foo=Bar&Person=John%20Doe"); curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use - - + + $curl_content = curl_exec($ch); $copy = curl_copy_handle($ch); curl_close($ch); - + $curl_content_copy = curl_exec($copy); curl_close($copy); diff --git a/ext/curl/tests/curl_copy_handle_basic_006.phpt b/ext/curl/tests/curl_copy_handle_basic_006.phpt index e33857d57e..989ad56762 100644 --- a/ext/curl/tests/curl_copy_handle_basic_006.phpt +++ b/ext/curl/tests/curl_copy_handle_basic_006.phpt @@ -20,7 +20,7 @@ Rick Buitenman <rick@meritos.nl> curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_USERAGENT, 'cURL phpt'); curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use - + $copy = curl_copy_handle($ch); var_dump( curl_exec($ch) ); diff --git a/ext/curl/tests/curl_copy_handle_basic_007.phpt b/ext/curl/tests/curl_copy_handle_basic_007.phpt index 23813d32c2..9d6dc2dc39 100644 --- a/ext/curl/tests/curl_copy_handle_basic_007.phpt +++ b/ext/curl/tests/curl_copy_handle_basic_007.phpt @@ -18,10 +18,10 @@ Test curl_copy_handle() with simple POST curl_setopt($ch, CURLOPT_POSTFIELDS, array("Hello" => "World", "Foo" => "Bar", "Person" => "John Doe")); curl_setopt($ch, CURLOPT_HTTPHEADER, array('Expect:')); // Disable Expect: header (lighttpd does not support it :) curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use - + $copy = curl_copy_handle($ch); curl_close($ch); - + $curl_content = curl_exec($copy); curl_close($copy); diff --git a/ext/curl/tests/curl_copy_handle_variation1.phpt b/ext/curl/tests/curl_copy_handle_variation1.phpt index 8978e2650e..2468ab93a3 100644 --- a/ext/curl/tests/curl_copy_handle_variation1.phpt +++ b/ext/curl/tests/curl_copy_handle_variation1.phpt @@ -4,7 +4,7 @@ Test curl_copy_handle() change options in one handle Francesco Fullone ff@ideato.it #PHPTestFest Cesena Italia on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("curl")) exit("skip curl extension not loaded"); ?> --FILE-- diff --git a/ext/curl/tests/curl_copy_handle_variation2.phpt b/ext/curl/tests/curl_copy_handle_variation2.phpt index 36b5febf50..6358975057 100644 --- a/ext/curl/tests/curl_copy_handle_variation2.phpt +++ b/ext/curl/tests/curl_copy_handle_variation2.phpt @@ -4,7 +4,7 @@ Test curl_copy_handle() add options to the handles Francesco Fullone ff@ideato.it #PHPTestFest Cesena Italia on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("curl")) exit("skip curl extension not loaded"); ?> --DESCRIPTION-- diff --git a/ext/curl/tests/curl_error_basic.phpt b/ext/curl/tests/curl_error_basic.phpt index 3d3502306a..9b6f7ea586 100644 --- a/ext/curl/tests/curl_error_basic.phpt +++ b/ext/curl/tests/curl_error_basic.phpt @@ -21,7 +21,7 @@ if ($ip != $url) die("skip 'fakeURL' resolves to $ip\n"); * Source: ext/curl/interface.c * Documentation: http://wiki.php.net/qa/temp/ext/curl */ - + // Fake URL to trigger an error $url = "fakeURL"; diff --git a/ext/curl/tests/curl_multi_getcontent_basic3.phpt b/ext/curl/tests/curl_multi_getcontent_basic3.phpt index 9c0f7ddeba..6e5e43b97a 100644 --- a/ext/curl/tests/curl_multi_getcontent_basic3.phpt +++ b/ext/curl/tests/curl_multi_getcontent_basic3.phpt @@ -20,7 +20,7 @@ Rein Velt (rein@velt.org) curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__). DIRECTORY_SEPARATOR . "curl_testdata2.txt"); curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch2, CURLOPT_RETURNTRANSFER, true); - + //CREATE MULTIPLE CURL HANDLE $mh=curl_multi_init(); @@ -40,7 +40,7 @@ Rein Velt (rein@velt.org) //CLOSE curl_multi_remove_handle($mh,$ch1); curl_multi_remove_handle($mh,$ch2); - curl_multi_close($mh); + curl_multi_close($mh); echo $results1; echo $results2; diff --git a/ext/curl/tests/curl_multi_getcontent_error1.phpt b/ext/curl/tests/curl_multi_getcontent_error1.phpt index 2fb11b3d97..c57957b835 100644 --- a/ext/curl/tests/curl_multi_getcontent_error1.phpt +++ b/ext/curl/tests/curl_multi_getcontent_error1.phpt @@ -20,7 +20,7 @@ if (!extension_loaded('curl')) print 'skip'; curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__). DIRECTORY_SEPARATOR . "curl_testdata2.txt"); curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch2, CURLOPT_RETURNTRANSFER, true); - + //CREATE MULTIPLE CURL HANDLE $mh=curl_multi_init(); @@ -40,9 +40,9 @@ if (!extension_loaded('curl')) print 'skip'; //CLOSE curl_multi_remove_handle($mh,$ch1); curl_multi_remove_handle($mh,$ch2); - curl_multi_close($mh); + curl_multi_close($mh); - echo $results1; + echo $results1; echo $results2; ?> diff --git a/ext/curl/tests/curl_multi_getcontent_error2.phpt b/ext/curl/tests/curl_multi_getcontent_error2.phpt index 0145d6a8fa..4ec6092401 100644 --- a/ext/curl/tests/curl_multi_getcontent_error2.phpt +++ b/ext/curl/tests/curl_multi_getcontent_error2.phpt @@ -20,7 +20,7 @@ if (!extension_loaded('curl')) print 'skip'; curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__). DIRECTORY_SEPARATOR . "curl_testdata2.txt"); curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch2, CURLOPT_RETURNTRANSFER, true); - + //CREATE MULTIPLE CURL HANDLE $mh=curl_multi_init(); @@ -40,9 +40,9 @@ if (!extension_loaded('curl')) print 'skip'; //CLOSE curl_multi_remove_handle($mh,$ch1); curl_multi_remove_handle($mh,$ch2); - curl_multi_close($mh); + curl_multi_close($mh); - echo $results1; + echo $results1; echo $results2; ?> diff --git a/ext/curl/tests/curl_multi_getcontent_error3.phpt b/ext/curl/tests/curl_multi_getcontent_error3.phpt index 2e1c7b2765..e75959f49b 100644 --- a/ext/curl/tests/curl_multi_getcontent_error3.phpt +++ b/ext/curl/tests/curl_multi_getcontent_error3.phpt @@ -20,7 +20,7 @@ if (!extension_loaded('curl')) print 'skip'; curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__). DIRECTORY_SEPARATOR . "curl_testdata2.txt"); curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch2, CURLOPT_RETURNTRANSFER, true); - + //CREATE MULTIPLE CURL HANDLE $mh=curl_multi_init(); @@ -34,7 +34,7 @@ if (!extension_loaded('curl')) print 'skip'; curl_multi_exec($mh,$running); } while ($running>0); - $ch1="string"; + $ch1="string"; $results1=curl_multi_getcontent($ch1); //incorrect parameter type $results2=curl_multi_getcontent($ch2); @@ -42,9 +42,9 @@ if (!extension_loaded('curl')) print 'skip'; //CLOSE //curl_multi_remove_handle($mh,$ch1); curl_multi_remove_handle($mh,$ch2); - curl_multi_close($mh); + curl_multi_close($mh); - echo $results1; + echo $results1; echo $results2; ?> diff --git a/ext/curl/tests/curl_multi_getcontent_error4.phpt b/ext/curl/tests/curl_multi_getcontent_error4.phpt index 68bda37fe4..292766700e 100644 --- a/ext/curl/tests/curl_multi_getcontent_error4.phpt +++ b/ext/curl/tests/curl_multi_getcontent_error4.phpt @@ -20,7 +20,7 @@ if (!extension_loaded('curl')) print 'skip'; curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__). DIRECTORY_SEPARATOR . "curl_testdata2.txt"); curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch2, CURLOPT_RETURNTRANSFER, true); - + //CREATE MULTIPLE CURL HANDLE $mh=curl_multi_init(); @@ -41,9 +41,9 @@ if (!extension_loaded('curl')) print 'skip'; //CLOSE //curl_multi_remove_handle($mh,$ch1); curl_multi_remove_handle($mh,$ch2); - curl_multi_close($mh); + curl_multi_close($mh); - echo $results1; + echo $results1; echo $results2; ?> diff --git a/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.phpt b/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.phpt index 9de2c0faba..92c80d1732 100644 --- a/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.phpt +++ b/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.phpt @@ -4,16 +4,16 @@ cURL option CURLOPT_READFUNCTION WHITE new media architects - Jeroen Vermeulen #testfest Utrecht 2009 --SKIPIF-- -<?php -if (!extension_loaded("curl")) print "skip cURL extension not loaded"; +<?php +if (!extension_loaded("curl")) print "skip cURL extension not loaded"; ?> --FILE-- -<?php -function custom_readfunction($oCurl, $hReadHandle, $iMaxOut) +<?php +function custom_readfunction($oCurl, $hReadHandle, $iMaxOut) { $sData = fread($hReadHandle,$iMaxOut-10); # -10 to have space to add "custom:" if (!empty($sData)) - { + { $sData = "custom:".$sData; } return $sData; @@ -35,9 +35,9 @@ curl_setopt($oCurl, CURLOPT_INFILE, $hReadHandle ); curl_exec($oCurl); curl_close($oCurl); -fclose ($hReadHandle); +fclose ($hReadHandle); -$sOutput = file_get_contents($sWriteFile); +$sOutput = file_get_contents($sWriteFile); var_dump($sOutput); ?> ===DONE=== diff --git a/ext/curl/tests/curl_version_variation1.phpt b/ext/curl/tests/curl_version_variation1.phpt index cbf2d4cbac..3ffb248313 100644 --- a/ext/curl/tests/curl_version_variation1.phpt +++ b/ext/curl/tests/curl_version_variation1.phpt @@ -21,7 +21,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -47,7 +47,7 @@ $inputs = array ( array(), array(0), array(1, 2), - + //string values "ABC", 'abc', diff --git a/ext/date/tests/003.phpt b/ext/date/tests/003.phpt index 8b1750ee22..501899cc5f 100644 --- a/ext/date/tests/003.phpt +++ b/ext/date/tests/003.phpt @@ -10,7 +10,7 @@ for ($i = 0; $i < 32; $i++) { echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(4) "31st" string(3) "1st" string(3) "2nd" diff --git a/ext/date/tests/004.phpt b/ext/date/tests/004.phpt index fb64575cc9..986c9c9179 100644 --- a/ext/date/tests/004.phpt +++ b/ext/date/tests/004.phpt @@ -25,7 +25,7 @@ foreach ($tz as $zone) { echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(1) "2" string(3) "177" string(1) "6" diff --git a/ext/date/tests/005.phpt b/ext/date/tests/005.phpt index 911aea7791..e1075ef248 100644 --- a/ext/date/tests/005.phpt +++ b/ext/date/tests/005.phpt @@ -19,7 +19,7 @@ var_dump(idate("'")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: idate() expects at least 1 parameter, 0 given in %s on line %d bool(false) diff --git a/ext/date/tests/006.phpt b/ext/date/tests/006.phpt index 19a044a91e..425430a470 100644 --- a/ext/date/tests/006.phpt +++ b/ext/date/tests/006.phpt @@ -18,7 +18,7 @@ var_dump(checkdate(1,1,-1)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: checkdate() expects exactly 3 parameters, 0 given in %s on line %d bool(false) bool(true) diff --git a/ext/date/tests/007.phpt b/ext/date/tests/007.phpt index 567777e106..141e251753 100644 --- a/ext/date/tests/007.phpt +++ b/ext/date/tests/007.phpt @@ -14,7 +14,7 @@ var_dump(localtime($t, false)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: localtime() expects at most 2 parameters, 3 given in %s on line %d bool(false) array(9) { diff --git a/ext/date/tests/008.phpt b/ext/date/tests/008.phpt index ce6be18556..e67b4bd0a4 100644 --- a/ext/date/tests/008.phpt +++ b/ext/date/tests/008.phpt @@ -12,7 +12,7 @@ var_dump(getdate()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: getdate() expects at most 1 parameter, 2 given in %s on line %d bool(false) array(11) { diff --git a/ext/date/tests/009.phpt b/ext/date/tests/009.phpt index 23c7668a9f..ae8011eebd 100644 --- a/ext/date/tests/009.phpt +++ b/ext/date/tests/009.phpt @@ -29,7 +29,7 @@ var_dump(gmstrftime("blah", $t)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: strftime() expects at least 1 parameter, 0 given in %s on line %d bool(false) bool(false) diff --git a/ext/date/tests/009_win32.phpt b/ext/date/tests/009_win32.phpt index 3ad04f5849..3da5b35c81 100644 --- a/ext/date/tests/009_win32.phpt +++ b/ext/date/tests/009_win32.phpt @@ -39,7 +39,7 @@ echo "Done\n"; setlocale(LC_TIME, $loc); ?> ---EXPECTF-- +--EXPECTF-- Warning: strftime() expects at least 1 parameter, 0 given in %s on line %d bool(false) bool(false) diff --git a/ext/date/tests/014.phpt b/ext/date/tests/014.phpt index 5cc31aa93a..2e72bdabe0 100644 --- a/ext/date/tests/014.phpt +++ b/ext/date/tests/014.phpt @@ -17,7 +17,7 @@ var_dump(timezone_offset_get($dto, $dtz)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- object(DateTime)#%d (3) { ["date"]=> string(26) "2006-12-12 00:00:00.000000" diff --git a/ext/date/tests/DateInterval_format_a.phpt b/ext/date/tests/DateInterval_format_a.phpt index 48c6cc1675..ce0e8cc086 100644 --- a/ext/date/tests/DateInterval_format_a.phpt +++ b/ext/date/tests/DateInterval_format_a.phpt @@ -6,8 +6,8 @@ Daniel Convissor <danielc@php.net> --INI-- date.timezone=UTC --SKIPIF-- -<?php -if (!method_exists('DateInterval', 'format')) die("skip: method doesn't exist"); +<?php +if (!method_exists('DateInterval', 'format')) die("skip: method doesn't exist"); ?> --FILE-- <?php diff --git a/ext/date/tests/DateTimeZone_clone_basic1.phpt b/ext/date/tests/DateTimeZone_clone_basic1.phpt index 49c190cf9f..22aee7d08a 100644 --- a/ext/date/tests/DateTimeZone_clone_basic1.phpt +++ b/ext/date/tests/DateTimeZone_clone_basic1.phpt @@ -15,15 +15,15 @@ $orig = new DateTimeZone("GMT"); $clone = clone $orig; var_dump($orig); -var_dump($clone); +var_dump($clone); -if ($clone != $orig) { - echo "TEST FAILED : objects not equal\n"; -}else if ($clone === $orig) { - echo "TEST FAILED : objects identical\n"; +if ($clone != $orig) { + echo "TEST FAILED : objects not equal\n"; +}else if ($clone === $orig) { + echo "TEST FAILED : objects identical\n"; } else { - echo "TEST PASSED : Objects equal but not indetical\n"; -} + echo "TEST PASSED : Objects equal but not indetical\n"; +} ?> ===DONE=== diff --git a/ext/date/tests/DateTimeZone_clone_basic4.phpt b/ext/date/tests/DateTimeZone_clone_basic4.phpt index 5d1219a87a..11b15a3783 100644 --- a/ext/date/tests/DateTimeZone_clone_basic4.phpt +++ b/ext/date/tests/DateTimeZone_clone_basic4.phpt @@ -7,7 +7,7 @@ date_default_timezone_set("Europe/London"); class DateTimeZoneExt1 extends DateTimeZone { public function __clone() { - echo "-- DateTimeExt1 __clone magic method called --\n"; + echo "-- DateTimeExt1 __clone magic method called --\n"; } } @@ -17,7 +17,7 @@ $d1 = new DateTimeZoneExt1("America/New_York"); $d1_clone = clone $d1; //verify clone by calling method on new object -var_dump( $d1_clone->getName() ); +var_dump( $d1_clone->getName() ); ?> ===DONE=== diff --git a/ext/date/tests/DateTimeZone_compare_basic1.phpt b/ext/date/tests/DateTimeZone_compare_basic1.phpt index f3648cb243..f32620cd76 100644 --- a/ext/date/tests/DateTimeZone_compare_basic1.phpt +++ b/ext/date/tests/DateTimeZone_compare_basic1.phpt @@ -1,7 +1,7 @@ --TEST-- Test of compare object handler for DateTime objects --FILE-- -<?php +<?php // NB: DateTimeZone class does not define a customized compare class handler so standard object handler will be used diff --git a/ext/date/tests/DateTimeZone_construct_basic.phpt b/ext/date/tests/DateTimeZone_construct_basic.phpt index 12b1090661..870acefc20 100644 --- a/ext/date/tests/DateTimeZone_construct_basic.phpt +++ b/ext/date/tests/DateTimeZone_construct_basic.phpt @@ -5,7 +5,7 @@ Test new DateTimeZone() : basic functionality /* Prototype : DateTimeZone::__construct ( string $timezone ) * Description: Returns new DateTimeZone object * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ //Set the default time zone diff --git a/ext/date/tests/DateTimeZone_construct_error.phpt b/ext/date/tests/DateTimeZone_construct_error.phpt index fb8db122dc..6a49bd15ee 100644 --- a/ext/date/tests/DateTimeZone_construct_error.phpt +++ b/ext/date/tests/DateTimeZone_construct_error.phpt @@ -5,7 +5,7 @@ Test new DateTimeZone() : error conditions /* Prototype : DateTimeZone::__construct ( string $timezone ) * Description: Returns new DateTimeZone object * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ //Set the default time zone date_default_timezone_set("GMT"); diff --git a/ext/date/tests/DateTimeZone_construct_variation1.phpt b/ext/date/tests/DateTimeZone_construct_variation1.phpt index c2b208f0df..f0b2541afe 100644 --- a/ext/date/tests/DateTimeZone_construct_variation1.phpt +++ b/ext/date/tests/DateTimeZone_construct_variation1.phpt @@ -5,7 +5,7 @@ Test DateTime::__construct() function : usage variation - Passing unexpected val /* Prototype : DateTimeZone::__construct ( string $timezone ) * Description: Returns new DateTimeZone object * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing DateTime::__construct() : usage variation - unexpected values to first argument \$timezone***\n"; @@ -88,7 +88,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); @@ -100,8 +100,8 @@ foreach($inputs as $variation =>$timezone) { } catch (Throwable $e) { $msg = $e->getMessage(); echo "FAILED: " . $msg . "\n"; - } - + } + }; // closing the resource diff --git a/ext/date/tests/DateTimeZone_getName_error.phpt b/ext/date/tests/DateTimeZone_getName_error.phpt index 0a87b10069..56c3e7e49a 100644 --- a/ext/date/tests/DateTimeZone_getName_error.phpt +++ b/ext/date/tests/DateTimeZone_getName_error.phpt @@ -7,12 +7,12 @@ Test DateTimeZone::getName() function : error conditions * Source code: ext/date/php_date.c * Alias to functions: timezone_name_get() */ - + //Set the default time zone date_default_timezone_set("GMT"); $tz = new DateTimeZone("Europe/London"); - + echo "*** Testing DateTimeZone::getName() : error conditions ***\n"; echo "\n-- Testing DateTimeZone::getName() function with more than expected no. of arguments --\n"; diff --git a/ext/date/tests/DateTimeZone_getOffset_error.phpt b/ext/date/tests/DateTimeZone_getOffset_error.phpt index 56e45b76d4..360f03dc75 100644 --- a/ext/date/tests/DateTimeZone_getOffset_error.phpt +++ b/ext/date/tests/DateTimeZone_getOffset_error.phpt @@ -7,13 +7,13 @@ Test DateTimeZone::getOffset() function : error conditions * Source code: ext/date/php_date.c * Alias to functions: timezone_offset_get() */ - + //Set the default time zone date_default_timezone_set("GMT"); $tz = new DateTimeZone("Europe/London"); $date = date_create("GMT"); - + echo "*** Testing DateTimeZone::getOffset() : error conditions ***\n"; echo "\n-- Testing DateTimeZone::getOffset() function with zero arguments --\n"; diff --git a/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt b/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt index d17808035b..b0d4af7841 100644 --- a/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt +++ b/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt @@ -22,7 +22,7 @@ if (!is_array($tran)) { echo "TEST FAILED: Expected an array\n"; } -echo "\n-- Total number of transitions: " . count($tran). " --\n"; +echo "\n-- Total number of transitions: " . count($tran). " --\n"; echo "\n-- Format a sample entry for Spring 1963 --\n"; var_dump( $tran[6] ); diff --git a/ext/date/tests/DateTimeZone_getTransitions_error.phpt b/ext/date/tests/DateTimeZone_getTransitions_error.phpt index bfcd224ca7..8ed8ff1853 100644 --- a/ext/date/tests/DateTimeZone_getTransitions_error.phpt +++ b/ext/date/tests/DateTimeZone_getTransitions_error.phpt @@ -7,12 +7,12 @@ Test DateTimeZone::getTransitions() function : error conditions * Source code: ext/date/php_date.c * Alias to functions: timezone_transitions_get() */ - + //Set the default time zone date_default_timezone_set("GMT"); $tz = new DateTimeZone("Europe/London"); - + echo "*** Testing DateTimeZone::getTransitions() : error conditions ***\n"; echo "\n-- Testing DateTimeZone::getTransitions() function with more than expected no. of arguments --\n"; diff --git a/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt b/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt index 5d68abe05f..1131623ec5 100644 --- a/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt +++ b/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt @@ -19,7 +19,7 @@ var_dump( gettype($abbr) ); var_dump( count($abbr) ); echo "\n-- Format a sample entry --\n"; -var_dump( $abbr["acst"] ); +var_dump( $abbr["acst"] ); ?> ===DONE=== diff --git a/ext/date/tests/DateTimeZone_serialize_type_1.phpt b/ext/date/tests/DateTimeZone_serialize_type_1.phpt index 51a5c53b23..60d72598ea 100644 --- a/ext/date/tests/DateTimeZone_serialize_type_1.phpt +++ b/ext/date/tests/DateTimeZone_serialize_type_1.phpt @@ -8,12 +8,12 @@ date_default_timezone_set("Europe/London"); $tz1 = date_create("2012-01-01 10:00 +1:00")->getTimezone(); var_dump( $tz1 ); $serialized = serialize($tz1); -var_dump($serialized); +var_dump($serialized); $tz2 = unserialize($serialized); var_dump($tz2); // Try to use unserialzied object -var_dump( $tz2->getName() ); +var_dump( $tz2->getName() ); ?> ===DONE=== diff --git a/ext/date/tests/DateTimeZone_serialize_type_2.phpt b/ext/date/tests/DateTimeZone_serialize_type_2.phpt index 4147efe927..6d9e3495ef 100644 --- a/ext/date/tests/DateTimeZone_serialize_type_2.phpt +++ b/ext/date/tests/DateTimeZone_serialize_type_2.phpt @@ -8,12 +8,12 @@ date_default_timezone_set("Europe/London"); $tz1 = new DateTimeZone("EST"); var_dump( $tz1 ); $serialized = serialize($tz1); -var_dump($serialized); +var_dump($serialized); $tz2 = unserialize($serialized); var_dump($tz2); // Try to use unserialzied object -var_dump( $tz2->getName() ); +var_dump( $tz2->getName() ); ?> ===DONE=== diff --git a/ext/date/tests/DateTimeZone_serialize_type_3.phpt b/ext/date/tests/DateTimeZone_serialize_type_3.phpt index 885a17debd..926f796731 100644 --- a/ext/date/tests/DateTimeZone_serialize_type_3.phpt +++ b/ext/date/tests/DateTimeZone_serialize_type_3.phpt @@ -8,12 +8,12 @@ date_default_timezone_set("Europe/London"); $tz1 = new DateTimeZone("America/New_York"); var_dump( $tz1 ); $serialized = serialize($tz1); -var_dump($serialized); +var_dump($serialized); $tz2 = unserialize($serialized); var_dump($tz2); // Try to use unserialzied object -var_dump( $tz2->getName() ); +var_dump( $tz2->getName() ); ?> ===DONE=== diff --git a/ext/date/tests/DateTimeZone_verify.phpt b/ext/date/tests/DateTimeZone_verify.phpt index f28742d26a..2cba7c859e 100644 --- a/ext/date/tests/DateTimeZone_verify.phpt +++ b/ext/date/tests/DateTimeZone_verify.phpt @@ -10,10 +10,10 @@ $class = new ReflectionClass('DateTimeZone'); var_dump($class); echo "..and get names of all its methods\n"; -$methods = $class->getMethods(); +$methods = $class->getMethods(); var_dump($methods); -echo "..and get names of all its class constants\n"; +echo "..and get names of all its class constants\n"; $constants = $class->getConstants(); var_dump($constants); ?> diff --git a/ext/date/tests/DateTime_clone_basic4.phpt b/ext/date/tests/DateTime_clone_basic4.phpt index ecb0890bb1..f88d7145cc 100644 --- a/ext/date/tests/DateTime_clone_basic4.phpt +++ b/ext/date/tests/DateTime_clone_basic4.phpt @@ -10,7 +10,7 @@ date_default_timezone_set("Europe/London"); class DateTimeExt1 extends DateTime { public function __clone() { - echo "-- DateTimeExt1 __clone magic method called --\n"; + echo "-- DateTimeExt1 __clone magic method called --\n"; } } @@ -20,7 +20,7 @@ $d1 = new DateTimeExt1("2009-02-03 12:34:41 GMT"); $d1_clone = clone $d1; //verify clone by calling method on new object -var_dump( $d1_clone->format( "m.d.y") ); +var_dump( $d1_clone->format( "m.d.y") ); ?> ===DONE=== diff --git a/ext/date/tests/DateTime_compare_basic1.phpt b/ext/date/tests/DateTime_compare_basic1.phpt index 313dab1c25..6ff6095ddd 100644 --- a/ext/date/tests/DateTime_compare_basic1.phpt +++ b/ext/date/tests/DateTime_compare_basic1.phpt @@ -1,7 +1,7 @@ --TEST-- Test of compare object handler for DateTime objects --FILE-- -<?php +<?php echo "Simple test for DateTime compare object handler\n"; @@ -33,7 +33,7 @@ var_dump($obj2 == $obj3); var_dump($obj2 == $obj4); var_dump($obj3 == $obj4); -date_modify($obj1, "+1 day"); +date_modify($obj1, "+1 day"); echo "\n-- The following test should still compare equal --\n"; var_dump($obj1 == $obj1); echo "\n-- All the following tests should now compare NOT equal --\n"; @@ -44,7 +44,7 @@ var_dump($obj1 == $obj4); echo "\n-- All the following tests should again compare equal --\n"; date_modify($obj2, "+1 day"); date_modify($obj3, "+1 day"); -date_modify($obj4, "+1 day"); +date_modify($obj4, "+1 day"); var_dump($obj1 == $obj2); var_dump($obj1 == $obj3); var_dump($obj1 == $obj4); diff --git a/ext/date/tests/DateTime_construct_basic1.phpt b/ext/date/tests/DateTime_construct_basic1.phpt index d6a8956bf3..e5b3311c3b 100644 --- a/ext/date/tests/DateTime_construct_basic1.phpt +++ b/ext/date/tests/DateTime_construct_basic1.phpt @@ -5,7 +5,7 @@ Test new DateTime() : basic functionality /* Prototype : DateTime::__construct ([ string $time="now" [, DateTimeZone $timezone=NULL ]] ) * Description: Returns new DateTime object * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ //Set the default time zone diff --git a/ext/date/tests/DateTime_construct_error.phpt b/ext/date/tests/DateTime_construct_error.phpt index 71ce3d3018..2777a0617b 100644 --- a/ext/date/tests/DateTime_construct_error.phpt +++ b/ext/date/tests/DateTime_construct_error.phpt @@ -5,7 +5,7 @@ Test new DateTime() : error conditions /* Prototype : DateTime::__construct ([ string $time="now" [, DateTimeZone $timezone=NULL ]] ) * Description: Returns new DateTime object * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ //Set the default time zone date_default_timezone_set("GMT"); diff --git a/ext/date/tests/DateTime_construct_variation1.phpt b/ext/date/tests/DateTime_construct_variation1.phpt index 8ff7f7e89c..6c688ab571 100644 --- a/ext/date/tests/DateTime_construct_variation1.phpt +++ b/ext/date/tests/DateTime_construct_variation1.phpt @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); @@ -99,20 +99,20 @@ $timezone = new DateTimeZone("Europe/London"); foreach($inputs as $variation =>$time) { echo "\n-- $variation --\n"; - + try { var_dump( new DateTime($time) ); } catch (Throwable $e) { $msg = $e->getMessage(); echo "FAILED: " . $msg . "\n"; - } - + } + try { var_dump( new DateTime($time, $timezone) ); } catch (Throwable $e) { $msg = $e->getMessage(); echo "FAILED: " . $msg . "\n"; - } + } }; // closing the resource diff --git a/ext/date/tests/DateTime_construct_variation2.phpt b/ext/date/tests/DateTime_construct_variation2.phpt index c84c3b4f23..12e5c43579 100644 --- a/ext/date/tests/DateTime_construct_variation2.phpt +++ b/ext/date/tests/DateTime_construct_variation2.phpt @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); @@ -99,14 +99,14 @@ $time = "2005-07-14 22:30:41"; foreach($inputs as $variation =>$timezone) { echo "\n-- $variation --\n"; - + try { var_dump( new DateTime($time, $timezone) ); } catch (Throwable $e) { $msg = $e->getMessage(); echo "FAILED: " . $msg . "\n"; - } - + } + }; // closing the resource diff --git a/ext/date/tests/DateTime_extends_basic1.phpt b/ext/date/tests/DateTime_extends_basic1.phpt index c5f1b90ef2..aadc8967dc 100644 --- a/ext/date/tests/DateTime_extends_basic1.phpt +++ b/ext/date/tests/DateTime_extends_basic1.phpt @@ -12,7 +12,7 @@ echo "*** Testing basic DateTime inheritance() ***\n"; class DateTimeExt extends DateTime { public static $format = "F j, Y, g:i:s a"; - + public function __toString() { return parent::format(self::$format); @@ -26,8 +26,8 @@ echo "\n-- Invoke __toString --\n"; echo $d . "\n"; echo "\n -- modify date and time --\n"; -$d->setDate(1963, 7, 2); -$d->setTime(10, 45, 30); +$d->setDate(1963, 7, 2); +$d->setTime(10, 45, 30); echo "\n-- Invoke __toString again --\n"; echo $d . "\n"; diff --git a/ext/date/tests/DateTime_extends_basic2.phpt b/ext/date/tests/DateTime_extends_basic2.phpt index 72d27fbd2c..d91bc859c6 100644 --- a/ext/date/tests/DateTime_extends_basic2.phpt +++ b/ext/date/tests/DateTime_extends_basic2.phpt @@ -21,7 +21,7 @@ class DateTimeExt extends DateTime } $d = new DateTimeExt("1967-05-01 22:30:41"); -echo $d->format("F j, Y, g:i:s a") . "\n"; +echo $d->format("F j, Y, g:i:s a") . "\n"; ?> ===DONE=== diff --git a/ext/date/tests/DateTime_format_basic1.phpt b/ext/date/tests/DateTime_format_basic1.phpt index b5bbecfc03..e291dcc62c 100644 --- a/ext/date/tests/DateTime_format_basic1.phpt +++ b/ext/date/tests/DateTime_format_basic1.phpt @@ -7,22 +7,22 @@ Test DateTime::format() function : basic functionality * Source code: ext/date/php_date.c * Alias to functions: date_format */ - + //Set the default time zone date_default_timezone_set("Europe/London"); echo "*** Testing DateTime::format() : basic functionality ***\n"; $date = new DateTime("2005-07-14 22:30:41"); -var_dump( $date->format( "F j, Y, g:i a") ); -var_dump( $date->format( "m.d.y") ); -var_dump( $date->format( "j, n, Y") ); -var_dump( $date->format( "Ymd") ); -var_dump( $date->format( 'h-i-s, j-m-y, it is w Day') ); -var_dump( $date->format( '\i\t \i\s \t\h\e jS \d\a\y.') ); -var_dump( $date->format( "D M j G:i:s T Y") ); -var_dump( $date->format( 'H:m:s \m \i\s\ \m\o\n\t\h') ); -var_dump( $date->format( "H:i:s") ); +var_dump( $date->format( "F j, Y, g:i a") ); +var_dump( $date->format( "m.d.y") ); +var_dump( $date->format( "j, n, Y") ); +var_dump( $date->format( "Ymd") ); +var_dump( $date->format( 'h-i-s, j-m-y, it is w Day') ); +var_dump( $date->format( '\i\t \i\s \t\h\e jS \d\a\y.') ); +var_dump( $date->format( "D M j G:i:s T Y") ); +var_dump( $date->format( 'H:m:s \m \i\s\ \m\o\n\t\h') ); +var_dump( $date->format( "H:i:s") ); ?> ===DONE=== diff --git a/ext/date/tests/DateTime_format_basic2.phpt b/ext/date/tests/DateTime_format_basic2.phpt index 016fa7b6b2..249a4b12fd 100644 --- a/ext/date/tests/DateTime_format_basic2.phpt +++ b/ext/date/tests/DateTime_format_basic2.phpt @@ -7,7 +7,7 @@ Test date_format() function : basic functionality * Source code: ext/date/php_date.c * Alias to functions: date_format */ - + //Set the default time zone date_default_timezone_set("Europe/London"); diff --git a/ext/date/tests/DateTime_format_error.phpt b/ext/date/tests/DateTime_format_error.phpt index db1be92290..f0fbba4b76 100644 --- a/ext/date/tests/DateTime_format_error.phpt +++ b/ext/date/tests/DateTime_format_error.phpt @@ -7,7 +7,7 @@ Test DateTime::format() function : error conditions * Source code: ext/date/php_date.c * Alias to functions: date_format */ - + //Set the default time zone date_default_timezone_set("Europe/London"); @@ -22,7 +22,7 @@ var_dump( $date->format() ); echo "\n-- Testing date_date_formatcreate() function with more than expected no. of arguments --\n"; $format = "F j, Y, g:i a"; $extra_arg = 10; -var_dump( $date->format($format, $extra_arg) ); +var_dump( $date->format($format, $extra_arg) ); ?> ===DONE=== diff --git a/ext/date/tests/DateTime_format_variation1.phpt b/ext/date/tests/DateTime_format_variation1.phpt index 87a99220a6..e57d628d0d 100644 --- a/ext/date/tests/DateTime_format_variation1.phpt +++ b/ext/date/tests/DateTime_format_variation1.phpt @@ -7,7 +7,7 @@ Test DateTime::format() function : usage variation - Passing unexpected values t * Source code: ext/date/php_date.c * Alias to functions: date_format */ - + echo "*** Testing DateTime::format() : usage variation - unexpected values to first argument \$format***\n"; //Set the default time zone @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/DateTime_getOffset_basic1.phpt b/ext/date/tests/DateTime_getOffset_basic1.phpt index 30ff125955..6ade190f82 100644 --- a/ext/date/tests/DateTime_getOffset_basic1.phpt +++ b/ext/date/tests/DateTime_getOffset_basic1.phpt @@ -7,7 +7,7 @@ Test DateTime::getOffset() function : basic functionality * Source code: ext/date/php_date.c * Alias to functions: date_offset_get */ - + //Set the default time zone date_default_timezone_set('Europe/London'); @@ -16,8 +16,8 @@ echo "*** Testing DateTime::getOffset() : basic functionality ***\n"; $winter = new DateTime('2008-12-25 14:25:41'); $summer = new DateTime('2008-07-02 14:25:41'); -echo "Winter offset: " . $winter->getOffset() / 3600 . " hours\n"; -echo "Summer offset: " . $summer->getOffset() / 3600 . " hours\n"; +echo "Winter offset: " . $winter->getOffset() / 3600 . " hours\n"; +echo "Summer offset: " . $summer->getOffset() / 3600 . " hours\n"; ?> ===DONE=== diff --git a/ext/date/tests/DateTime_getOffset_error.phpt b/ext/date/tests/DateTime_getOffset_error.phpt index 6e9c3f411d..3d89e78b0d 100644 --- a/ext/date/tests/DateTime_getOffset_error.phpt +++ b/ext/date/tests/DateTime_getOffset_error.phpt @@ -8,7 +8,7 @@ Test DateTime::getOffset() function : error conditions * Source code: ext/date/php_date.c * Alias to functions: date_offset_get */ - + //Set the default time zone date_default_timezone_set("Europe/London"); diff --git a/ext/date/tests/DateTime_getTimeZone_basic1.phpt b/ext/date/tests/DateTime_getTimeZone_basic1.phpt index 0f3edb33e2..3d454f6f4c 100644 --- a/ext/date/tests/DateTime_getTimeZone_basic1.phpt +++ b/ext/date/tests/DateTime_getTimeZone_basic1.phpt @@ -12,16 +12,16 @@ echo "*** Testing DateTime::getTimezone() : basic functionality ***\n"; date_default_timezone_set("Europe/London"); $object = new DateTime("2009-01-30 17:57:32"); -var_dump( $object->getTimeZone()->getName() ); +var_dump( $object->getTimeZone()->getName() ); date_default_timezone_set("America/New_York"); $object = new DateTime("2009-01-30 17:57:32"); -var_dump( $object->getTimeZone()->getName() ); +var_dump( $object->getTimeZone()->getName() ); $la_time = new DateTimeZone("America/Los_Angeles"); $object->setTimeZone($la_time); -var_dump( $object->getTimeZone()->getName() ); +var_dump( $object->getTimeZone()->getName() ); ?> ===DONE=== diff --git a/ext/date/tests/DateTime_modify_basic1.phpt b/ext/date/tests/DateTime_modify_basic1.phpt index 277a6b2965..b11e5e0aa2 100644 --- a/ext/date/tests/DateTime_modify_basic1.phpt +++ b/ext/date/tests/DateTime_modify_basic1.phpt @@ -16,16 +16,16 @@ echo "*** Testing DateTime::modify() : basic functionality ***\n"; // Create a date object to modify $datetime = new DateTime("2009-01-31 14:28:41"); -$datetime->modify("+1 day"); -echo "After modification 1: " . $datetime->format("D, d M Y") . "\n"; +$datetime->modify("+1 day"); +echo "After modification 1: " . $datetime->format("D, d M Y") . "\n"; -$datetime->modify("+1 week 2 days 4 hours 2 seconds"); +$datetime->modify("+1 week 2 days 4 hours 2 seconds"); echo "After modification 2: " . $datetime->format("D, d M Y H:i:s") . "\n"; -$datetime->modify("next Thursday"); -echo "After modification 3: " . $datetime->format("D, d M Y") . "\n"; +$datetime->modify("next Thursday"); +echo "After modification 3: " . $datetime->format("D, d M Y") . "\n"; -$datetime->modify("last Sunday"); +$datetime->modify("last Sunday"); echo "After modification 4: " . $datetime->format("D, d M Y") . "\n"; ?> diff --git a/ext/date/tests/DateTime_modify_variation1.phpt b/ext/date/tests/DateTime_modify_variation1.phpt index ddb36751ce..44e879601d 100644 --- a/ext/date/tests/DateTime_modify_variation1.phpt +++ b/ext/date/tests/DateTime_modify_variation1.phpt @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/DateTime_serialize.phpt b/ext/date/tests/DateTime_serialize.phpt index b8af87eee1..501f826cea 100644 --- a/ext/date/tests/DateTime_serialize.phpt +++ b/ext/date/tests/DateTime_serialize.phpt @@ -8,12 +8,12 @@ date_default_timezone_set("Europe/London"); $date1 = new DateTime("2005-07-14 22:30:41"); var_dump($date1); $serialized = serialize($date1); -var_dump($serialized); +var_dump($serialized); $date2 = unserialize($serialized); var_dump($date2); // Try to use unserialzied object -var_dump( $date2->format( "F j, Y, g:i a") ); +var_dump( $date2->format( "F j, Y, g:i a") ); ?> ===DONE=== diff --git a/ext/date/tests/DateTime_setDate_basic1.phpt b/ext/date/tests/DateTime_setDate_basic1.phpt index 8ead020c01..9bcfde9f38 100644 --- a/ext/date/tests/DateTime_setDate_basic1.phpt +++ b/ext/date/tests/DateTime_setDate_basic1.phpt @@ -7,7 +7,7 @@ Test DateTime::setDate() function : basic functionality * Source code: ext/date/php_date.c * Alias to functions: date_date_set() */ - + //Set the default time zone date_default_timezone_set("Europe/London"); diff --git a/ext/date/tests/DateTime_setDate_error.phpt b/ext/date/tests/DateTime_setDate_error.phpt index 29c019a262..569551dc9c 100644 --- a/ext/date/tests/DateTime_setDate_error.phpt +++ b/ext/date/tests/DateTime_setDate_error.phpt @@ -7,7 +7,7 @@ Test DateTime::setDate() function : error conditions * Source code: ext/date/php_date.c * Alias to functions: date_date_set() */ - + date_default_timezone_set("Europe/London"); echo "*** Testing DateTime::setDate() : error conditions ***\n"; diff --git a/ext/date/tests/DateTime_setISODate_error.phpt b/ext/date/tests/DateTime_setISODate_error.phpt index af22581829..88818a8da1 100644 --- a/ext/date/tests/DateTime_setISODate_error.phpt +++ b/ext/date/tests/DateTime_setISODate_error.phpt @@ -8,7 +8,7 @@ Test DateTime::setISODate () function : error conditions * Source code: ext/date/php_date.c * Alias to functions: date_isodate_set */ - + //Set the default time zone date_default_timezone_set("Europe/London"); @@ -24,7 +24,7 @@ echo "\n-- Testing DateTime::setISODate() function with less than expected no. o var_dump( $datetime->setISODate($year) ); echo "\n-- Testing date_isodate_set() function with more than expected no. of arguments --\n"; -$week = 30; +$week = 30; $day = 7; $extra_arg = 30; var_dump( $datetime->setISODate($year, $week, $day, $extra_arg) ); diff --git a/ext/date/tests/DateTime_setISODate_variation1.phpt b/ext/date/tests/DateTime_setISODate_variation1.phpt index 74f262b536..98a1aa5703 100644 --- a/ext/date/tests/DateTime_setISODate_variation1.phpt +++ b/ext/date/tests/DateTime_setISODate_variation1.phpt @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/DateTime_setISODate_variation2.phpt b/ext/date/tests/DateTime_setISODate_variation2.phpt index 1677d042c6..f74a99e7e8 100644 --- a/ext/date/tests/DateTime_setISODate_variation2.phpt +++ b/ext/date/tests/DateTime_setISODate_variation2.phpt @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/DateTime_setISODate_variation3.phpt b/ext/date/tests/DateTime_setISODate_variation3.phpt index 63ac22c28b..2a7d34fa95 100644 --- a/ext/date/tests/DateTime_setISODate_variation3.phpt +++ b/ext/date/tests/DateTime_setISODate_variation3.phpt @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/DateTime_setTime_basic1.phpt b/ext/date/tests/DateTime_setTime_basic1.phpt index 0dde746c27..25a2ab095f 100644 --- a/ext/date/tests/DateTime_setTime_basic1.phpt +++ b/ext/date/tests/DateTime_setTime_basic1.phpt @@ -7,7 +7,7 @@ Test DateTime::setTime() function : basic functionality * Source code: ext/date/php_date.c * Alias to functions: date_time_set */ - + //Set the default time zone date_default_timezone_set("Europe/London"); diff --git a/ext/date/tests/DateTime_setTime_error.phpt b/ext/date/tests/DateTime_setTime_error.phpt index a6b5c5edea..cbdab90d33 100644 --- a/ext/date/tests/DateTime_setTime_error.phpt +++ b/ext/date/tests/DateTime_setTime_error.phpt @@ -7,7 +7,7 @@ Test DateTime::setTime() function : error conditions * Source code: ext/date/php_date.c * Alias to functions: date_time_set */ - + date_default_timezone_set("Europe/London"); echo "*** Testing DateTime::setTime() : error conditions ***\n"; diff --git a/ext/date/tests/DateTime_setTime_variation1.phpt b/ext/date/tests/DateTime_setTime_variation1.phpt index ea2942bff3..b817c6233c 100644 --- a/ext/date/tests/DateTime_setTime_variation1.phpt +++ b/ext/date/tests/DateTime_setTime_variation1.phpt @@ -2,7 +2,7 @@ Test DateTime::setTime() function : usage variation - Passing unexpected values to first argument $hour. --FILE-- <?php -/* Prototype : public DateTime DateTime::setTime ( int $hour , int $minute [, int $second ] ) +/* Prototype : public DateTime DateTime::setTime ( int $hour , int $minute [, int $second ] ) * Description: Resets the current time of the DateTime object to a different time. * Source code: ext/date/php_date.c * Alias to functions: date_time_set @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/DateTime_setTime_variation2.phpt b/ext/date/tests/DateTime_setTime_variation2.phpt index f3b91ced5b..0fdbfd34f8 100644 --- a/ext/date/tests/DateTime_setTime_variation2.phpt +++ b/ext/date/tests/DateTime_setTime_variation2.phpt @@ -2,7 +2,7 @@ Test DateTime::setTime() function : usage variation - Passing unexpected values to second argument $minute. --FILE-- <?php -/* Prototype : public DateTime DateTime::setTime ( int $hour , int $minute [, int $second ] ) +/* Prototype : public DateTime DateTime::setTime ( int $hour , int $minute [, int $second ] ) * Description: Resets the current time of the DateTime object to a different time. * Source code: ext/date/php_date.c * Alias to functions: date_time_set @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/DateTime_setTime_variation3.phpt b/ext/date/tests/DateTime_setTime_variation3.phpt index 4a33fa11be..d41fe3a99c 100644 --- a/ext/date/tests/DateTime_setTime_variation3.phpt +++ b/ext/date/tests/DateTime_setTime_variation3.phpt @@ -2,7 +2,7 @@ Test DateTime::setTime() function : usage variation - Passing unexpected values to third argument $second. --FILE-- <?php -/* Prototype : public DateTime DateTime::setTime ( int $hour , int $minute [, int $second ] ) +/* Prototype : public DateTime DateTime::setTime ( int $hour , int $minute [, int $second ] ) * Description: Resets the current time of the DateTime object to a different time. * Source code: ext/date/php_date.c * Alias to functions: date_time_set @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/DateTime_setTimezone_error.phpt b/ext/date/tests/DateTime_setTimezone_error.phpt index 32d03fbec9..95fc6e518c 100644 --- a/ext/date/tests/DateTime_setTimezone_error.phpt +++ b/ext/date/tests/DateTime_setTimezone_error.phpt @@ -7,7 +7,7 @@ Test DateTime::setTimezone () function : error conditions * Source code: ext/date/php_date.c * Alias to functions: date_timezone_set */ - + date_default_timezone_set("UTC"); echo "*** Testing DateTime::setTimezone () : error conditions ***\n"; @@ -15,13 +15,13 @@ echo "*** Testing DateTime::setTimezone () : error conditions ***\n"; $datetime = new DateTime("2009-01-30 17:57:32"); echo "\n-- Testing DateTime::setTimezone () function with zero arguments --\n"; -var_dump( $datetime->setTimezone() ); +var_dump( $datetime->setTimezone() ); echo "\n-- Testing DateTime::setTimezone () function with more than expected no. of arguments --\n"; $timezone = new DateTimezone("GMT"); $extra_arg = 99; var_dump( $datetime->setTimezone($timezone, $extra_arg) ); - + ?> ===DONE=== --EXPECTF-- diff --git a/ext/date/tests/DateTime_setTimezone_variation1.phpt b/ext/date/tests/DateTime_setTimezone_variation1.phpt index 04ab4a4c55..269d657cde 100644 --- a/ext/date/tests/DateTime_setTimezone_variation1.phpt +++ b/ext/date/tests/DateTime_setTimezone_variation1.phpt @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/big_year.phpt b/ext/date/tests/big_year.phpt index 1cfc5af3dd..6f86e524b5 100644 --- a/ext/date/tests/big_year.phpt +++ b/ext/date/tests/big_year.phpt @@ -6,9 +6,9 @@ Handling of large year values <?php date_default_timezone_set("America/Toronto"); -$t = mktime(0,0,0,1,1,292277026596); +$t = mktime(0,0,0,1,1,292277026596); -var_dump(date("r", $t)); +var_dump(date("r", $t)); echo "OK\n"; ?> diff --git a/ext/date/tests/bug13142.phpt b/ext/date/tests/bug13142.phpt index 5849a94427..5550d5ce9c 100644 --- a/ext/date/tests/bug13142.phpt +++ b/ext/date/tests/bug13142.phpt @@ -18,7 +18,7 @@ if (date('T') == 'GMT') { putenv("TZ=EST5EDT4,M4.1.0,M10.5.0"); } echo date("r\n", strtotime("Sep 04 16:39:45 2001")); -echo date("r\n", strtotime("Sep 04 2001 16:39:45")); +echo date("r\n", strtotime("Sep 04 2001 16:39:45")); ?> --EXPECT-- Tue, 04 Sep 2001 16:39:45 -0400 diff --git a/ext/date/tests/bug20382-1.phpt b/ext/date/tests/bug20382-1.phpt index e81ac20fd3..162852115b 100644 --- a/ext/date/tests/bug20382-1.phpt +++ b/ext/date/tests/bug20382-1.phpt @@ -6,7 +6,7 @@ date.timezone=Europe/Amsterdam <?php $tStamp = mktime (17, 17, 17, 10, 27, 2004); echo "tStamp=". date("l Y-m-d H:i:s T", $tStamp). "\n"; - + $strtotime_timestamp = strtotime ("Monday", $tStamp); echo "result=". date("l Y-m-d H:i:s T", $strtotime_timestamp). "\n"; echo "wanted=Monday 2004-11-01 00:00:00 CET\n"; diff --git a/ext/date/tests/bug30096.phpt b/ext/date/tests/bug30096.phpt index fa4f716ee6..9ca45c4ffe 100644 --- a/ext/date/tests/bug30096.phpt +++ b/ext/date/tests/bug30096.phpt @@ -22,7 +22,7 @@ function gm_date_check($hour, $minute, $second, $month, $day, $year) { global $ts, $tsold; echo "gmmktime($hour,$minute,$second,$month,$day,$year): "; - + $tsold = $ts; $ts = gmmktime($hour, $minute, $second, $month, $day, $year); diff --git a/ext/date/tests/bug32555.phpt b/ext/date/tests/bug32555.phpt index fca34ffa19..03ed09fab4 100644 --- a/ext/date/tests/bug32555.phpt +++ b/ext/date/tests/bug32555.phpt @@ -1,8 +1,8 @@ --TEST-- Bug #32555 (strtotime("tomorrow") can return false) --SKIPIF-- -<?php -if (substr(PHP_OS, 0, 3) == 'WIN') die('skip strftime uses system TZ'); +<?php +if (substr(PHP_OS, 0, 3) == 'WIN') die('skip strftime uses system TZ'); ?> --INI-- date.timezone=US/Eastern diff --git a/ext/date/tests/bug33414-1.phpt b/ext/date/tests/bug33414-1.phpt index a7596f93f2..0187aef831 100644 --- a/ext/date/tests/bug33414-1.phpt +++ b/ext/date/tests/bug33414-1.phpt @@ -3,7 +3,7 @@ Bug #33414 [1] (Comprehensive list of incorrect days returned after strotime() / --INI-- date.timezone=America/Mendoza --FILE-- -<?php +<?php print "TZ=America/Mendoza - wrong day.\n"; $tStamp = mktime (17, 17, 17, 1, 8327, 1970); @@ -63,27 +63,27 @@ print "wanted=Friday 00:00:00\n\n"; print "TZ=America/Havana - wrong day.\n"; date_default_timezone_set("America/Havana"); -$tStamp = mktime (17, 17, 17, 1, 12720, 1970); +$tStamp = mktime (17, 17, 17, 1, 12720, 1970); print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n"; $strtotime_tstamp = strtotime("next Thursday", $tStamp); print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n"; print "wanted=Thursday 00:00:00\n\n"; print "TZ=Europe/Tallinn - wrong day.\n"; -date_default_timezone_set("Europe/Tallinn"); +date_default_timezone_set("Europe/Tallinn"); $tStamp = mktime (17, 17, 17, 1, 11777, 1970); print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n"; $strtotime_tstamp = strtotime("next Saturday", $tStamp); print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n"; -print "wanted=Saturday 00:00:00\n\n"; +print "wanted=Saturday 00:00:00\n\n"; -print "TZ=Asia/Jerusalem - wrong day.\n"; +print "TZ=Asia/Jerusalem - wrong day.\n"; date_default_timezone_set("Asia/Jerusalem"); $tStamp = mktime (17, 17, 17, 1, 13056, 1970); print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n"; $strtotime_tstamp = strtotime("next Thursday", $tStamp); print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n"; -print "wanted=Thursday 00:00:00\n\n"; +print "wanted=Thursday 00:00:00\n\n"; print "TZ=Europe/Vilnius - wrong day.\n"; date_default_timezone_set("Europe/Vilnius"); @@ -141,29 +141,29 @@ $strtotime_tstamp = strtotime("next Thursday", $tStamp); print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n"; print "wanted=Thursday 00:00:00\n\n"; -print "TZ=Asia/Kuala_Lumpur - wrong day.\n"; +print "TZ=Asia/Kuala_Lumpur - wrong day.\n"; date_default_timezone_set("Asia/Kuala_Lumpur"); $tStamp = mktime (17, 17, 17, 1, 4380, 1970); print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n"; $strtotime_tstamp = strtotime("next Monday", $tStamp); print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n"; -print "wanted=Monday 00:00:00\n\n"; +print "wanted=Monday 00:00:00\n\n"; -print "TZ=Pacific/Chatham - wrong day.\n"; -date_default_timezone_set("Pacific/Chatham"); +print "TZ=Pacific/Chatham - wrong day.\n"; +date_default_timezone_set("Pacific/Chatham"); $tStamp = mktime (17, 17, 17, 1, 1762, 1970); print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n"; $strtotime_tstamp = strtotime("next Monday", $tStamp); print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n"; -print "wanted=Monday 00:00:00\n\n"; +print "wanted=Monday 00:00:00\n\n"; -print "TZ=America/Lima - wrong day.\n"; -date_default_timezone_set("America/Lima"); -$tStamp = mktime (17, 17, 17, 1, 5839, 1970); +print "TZ=America/Lima - wrong day.\n"; +date_default_timezone_set("America/Lima"); +$tStamp = mktime (17, 17, 17, 1, 5839, 1970); print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n"; $strtotime_tstamp = strtotime("next Thursday", $tStamp); print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n"; -print "wanted=Thursday 00:00:00\n\n"; +print "wanted=Thursday 00:00:00\n\n"; print "TZ=Asia/Karachi - wrong day.\n"; date_default_timezone_set("Asia/Karachi"); diff --git a/ext/date/tests/bug33414-2.phpt b/ext/date/tests/bug33414-2.phpt index 8e8ad4b0cf..1c71e886fe 100644 --- a/ext/date/tests/bug33414-2.phpt +++ b/ext/date/tests/bug33414-2.phpt @@ -4,11 +4,11 @@ Bug #33414 [2] (Comprehensive list of incorrect days returned after strotime() / <?php print "TZ=Pacific/Rarotonga - wrong day.\n"; date_default_timezone_set("Pacific/Rarotonga"); -$tStamp = mktime (17, 17, 17, 1, 1, 1970); +$tStamp = mktime (17, 17, 17, 1, 1, 1970); print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n"; $strtotime_tstamp = strtotime("next Tuesday", $tStamp); print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n"; -print "wanted=Tuesday 00:00:00\n\n"; +print "wanted=Tuesday 00:00:00\n\n"; print "TZ=Atlantic/South_Georgia - wrong day.\n"; date_default_timezone_set("Atlantic/South_Georgia"); @@ -38,17 +38,17 @@ print "TZ=Pacific/Kiritimati - wrong day, off by 2 days.\n"; date_default_timezone_set("Pacific/Kiritimati"); $tStamp = mktime (17, 17, 17, 1, 1, 1970); print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n"; -$strtotime_tstamp = strtotime("next Monday", $tStamp); +$strtotime_tstamp = strtotime("next Monday", $tStamp); print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n"; print "wanted=Monday 00:00:00\n\n"; -print "TZ=America/Managua - wrong day.\n"; +print "TZ=America/Managua - wrong day.\n"; date_default_timezone_set("America/Managua"); $tStamp = mktime (17, 17, 17, 1, 12879, 1970); print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n"; $strtotime_tstamp = strtotime("next Tuesday", $tStamp); print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n"; -print "wanted=Tuesday 00:00:00\n\n"; +print "wanted=Tuesday 00:00:00\n\n"; print "TZ=Pacific/Pitcairn - wrong day.\n"; date_default_timezone_set("Pacific/Pitcairn"); diff --git a/ext/date/tests/bug33415-2.phpt b/ext/date/tests/bug33415-2.phpt index aa15ef93df..7e4d3cd125 100644 --- a/ext/date/tests/bug33415-2.phpt +++ b/ext/date/tests/bug33415-2.phpt @@ -106,7 +106,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n"; print "wanted=Tuesday 00:30:00\n\n"; print "TZ=Pacific/Tarawa - Is it OK for this to be Midday? Note: does -not appear to have a DST or timezone transition.\n"; +not appear to have a DST or timezone transition.\n"; date_default_timezone_set('Pacific/Tarawa'); $tStamp = mktime (17, 17, 17, 1, 1, 1970); print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n"; @@ -128,7 +128,7 @@ $tStamp = mktime (17, 17, 17, 1, 5838, 1970); print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n"; $strtotime_tstamp = strtotime("next Wednesday", $tStamp); print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n"; -print "wanted=Wednesday 00:15:00\n\n"; +print "wanted=Wednesday 00:15:00\n\n"; print "TZ=Pacific/Nauru - Is it OK for this to be 0:30? yes\n"; date_default_timezone_set('Pacific/Nauru'); @@ -144,16 +144,16 @@ $tStamp = mktime (17, 17, 17, 1, 3189, 1970); print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n"; $strtotime_tstamp = strtotime("next Sunday", $tStamp); print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n"; -print "wanted=Sunday 00:30:00\n\n"; +print "wanted=Sunday 00:30:00\n\n"; print "TZ=Pacific/Port_Moresby - Is it OK for this to be 10 AM? No DST or timezone transition.\n"; date_default_timezone_set('Pacific/Port_Moresby'); -$tStamp = mktime (17, 17, 17, 1, 1, 1970); +$tStamp = mktime (17, 17, 17, 1, 1, 1970); print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n"; -$strtotime_tstamp = strtotime("next Thursday", $tStamp); +$strtotime_tstamp = strtotime("next Thursday", $tStamp); print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n"; -print "wanted=Thursday 00:00:00\n\n"; +print "wanted=Thursday 00:00:00\n\n"; print "TZ=America/Miquelon - Is it OK for this to be 1 AM ? yes\n"; date_default_timezone_set('America/Miquelon'); @@ -166,7 +166,7 @@ print "wanted=Thursday 01:00:00\n\n"; print "TZ=Pacific/Palau - Is it OK for this to be 9 AM? No DST or timezone transition.\n"; date_default_timezone_set('Pacific/Palau'); -$tStamp = mktime (17, 17, 17, 1, 1, 1970); +$tStamp = mktime (17, 17, 17, 1, 1, 1970); print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n"; $strtotime_tstamp = strtotime("next Saturday", $tStamp); print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n"; diff --git a/ext/date/tests/bug42910.phpt b/ext/date/tests/bug42910.phpt index 1bd0790812..e741db2ebc 100644 --- a/ext/date/tests/bug42910.phpt +++ b/ext/date/tests/bug42910.phpt @@ -18,7 +18,7 @@ Bug #42910 (Constructing DateTime with TimeZone Indicator invalidates DateTimeZo // -------------- date_default_timezone_set('Australia/Sydney'); - + $date= date_create('2007-11-04 12:00:00+0200'); var_dump(date_format($date, 'O e')); ?> diff --git a/ext/date/tests/bug44562.phpt b/ext/date/tests/bug44562.phpt index 89ca7402c4..5610474108 100644 --- a/ext/date/tests/bug44562.phpt +++ b/ext/date/tests/bug44562.phpt @@ -19,7 +19,7 @@ $interval = DateInterval::createFromDateString( "1 day" ); $dp = new DatePeriod( $begin, $interval, 10 ); foreach ( $dp as $d ) { - var_dump ($d->format( DATE_ISO8601 ) ); + var_dump ($d->format( DATE_ISO8601 ) ); } ?> diff --git a/ext/date/tests/bug45529.phpt b/ext/date/tests/bug45529.phpt index b5d1d6a8ef..25c6f131b5 100644 --- a/ext/date/tests/bug45529.phpt +++ b/ext/date/tests/bug45529.phpt @@ -12,7 +12,7 @@ $d->setTimeZone($tz1); echo $d->format(DATE_ISO8601), PHP_EOL; $d = new DateTime('2008-01-01 12:00:00+0200'); $d->setTimeZone($tz2); -echo $d->format(DATE_ISO8601), PHP_EOL; +echo $d->format(DATE_ISO8601), PHP_EOL; ?> --EXPECT-- UTC diff --git a/ext/date/tests/bug46111.phpt b/ext/date/tests/bug46111.phpt index 806424ebc6..4fcdfb6fdf 100644 --- a/ext/date/tests/bug46111.phpt +++ b/ext/date/tests/bug46111.phpt @@ -9,7 +9,7 @@ $timezones = timezone_identifiers_list(); print "[strtotime(timezone) == false - Begin List]\n"; foreach ($timezones as $zone) { $date_string = "2008-01-01 13:00:00 " . $zone; - + if (!strtotime($date_string)) { echo $zone . "\n"; } diff --git a/ext/date/tests/bug51096.phpt b/ext/date/tests/bug51096.phpt index df31313a76..2b479a94a6 100644 --- a/ext/date/tests/bug51096.phpt +++ b/ext/date/tests/bug51096.phpt @@ -17,7 +17,7 @@ foreach ( $tests as $test ) $result = date_parse( $test ); $rel = $result['relative']; echo $test, "\n- month: ", $rel['month'], '; day: ', $rel['day'], - '; first-day-of: ', isset( $rel['first_day_of_month'] ) ? 'true' : 'false', + '; first-day-of: ', isset( $rel['first_day_of_month'] ) ? 'true' : 'false', '; last-day-of: ', isset( $rel['last_day_of_month'] ) ? 'true' : 'false', "\n"; $date = new DateTime( '2010-03-06 15:21 UTC' ); echo '- ', $date->format( DateTime::ISO8601 ); diff --git a/ext/date/tests/bug52342.phpt b/ext/date/tests/bug52342.phpt index 45534a23da..fa1936e379 100644 --- a/ext/date/tests/bug52342.phpt +++ b/ext/date/tests/bug52342.phpt @@ -6,7 +6,7 @@ date_default_timezone_set('Europe/Berlin'); $from = new DateTime(); $from->setTime(0, 0, 0); $from->setISODate(2010, 28, 1); //Montag der 28ten Woche 2010 - + echo $from->format('d.m.Y H:i'), "\n"; //A echo $from->getTimestamp(), "\n"; //B echo date('d.m.Y H:i', $from->getTimestamp()), "\n"; //C diff --git a/ext/date/tests/bug60236.phpt b/ext/date/tests/bug60236.phpt index a71bb5a17d..a5c7810629 100644 --- a/ext/date/tests/bug60236.phpt +++ b/ext/date/tests/bug60236.phpt @@ -4,7 +4,7 @@ Bug #60236 (TLA timezone dates are not converted properly from timestamp) date.timezone=America/New_York --FILE-- <?php -$t = new DateTime('2010-07-06 18:38:28 EDT'); +$t = new DateTime('2010-07-06 18:38:28 EDT'); $ts = $t->format('U'); var_dump($ts); $t->setTimestamp($ts); diff --git a/ext/date/tests/bug73091.phpt b/ext/date/tests/bug73091.phpt index c051573297..14f161afe7 100644 --- a/ext/date/tests/bug73091.phpt +++ b/ext/date/tests/bug73091.phpt @@ -8,7 +8,7 @@ class foo { return 'may be a bug'; } } - + var_dump(unserialize('O:12:"DateInterval":1:{s:4:"days";O:3:"foo":0:{}}')); ?> --EXPECTF-- diff --git a/ext/date/tests/bug75002.phpt b/ext/date/tests/bug75002.phpt index 6a6cd21d03..b10e0ebe00 100644 --- a/ext/date/tests/bug75002.phpt +++ b/ext/date/tests/bug75002.phpt @@ -15,7 +15,7 @@ foreach (new aaa($start) as $y) { ?> ==DONE== ---EXPECTF-- +--EXPECTF-- Fatal error: Uncaught Error: DatePeriod has not been initialized correctly in %sbug75002.php:%d Stack trace: #0 {main} diff --git a/ext/date/tests/checkdate_error.phpt b/ext/date/tests/checkdate_error.phpt index 4546408304..02772b9b5b 100644 --- a/ext/date/tests/checkdate_error.phpt +++ b/ext/date/tests/checkdate_error.phpt @@ -5,7 +5,7 @@ Test checkdate() function : error conditions /* Prototype : bool checkdate ( int $month , int $day , int $year ) * Description: Validate a Gregorian date * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing checkdate() : error conditions ***\n"; diff --git a/ext/date/tests/checkdate_variation1.phpt b/ext/date/tests/checkdate_variation1.phpt index 5892e1d37d..166a8a3508 100644 --- a/ext/date/tests/checkdate_variation1.phpt +++ b/ext/date/tests/checkdate_variation1.phpt @@ -80,7 +80,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/checkdate_variation2.phpt b/ext/date/tests/checkdate_variation2.phpt index d084931e5b..c9d9782e0f 100644 --- a/ext/date/tests/checkdate_variation2.phpt +++ b/ext/date/tests/checkdate_variation2.phpt @@ -80,7 +80,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/checkdate_variation3.phpt b/ext/date/tests/checkdate_variation3.phpt index 1fda22b35b..66fd143dd0 100644 --- a/ext/date/tests/checkdate_variation3.phpt +++ b/ext/date/tests/checkdate_variation3.phpt @@ -80,7 +80,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date-parse-by-format001.phpt b/ext/date/tests/date-parse-by-format001.phpt index 66975e9da7..4431d2d30f 100644 --- a/ext/date/tests/date-parse-by-format001.phpt +++ b/ext/date/tests/date-parse-by-format001.phpt @@ -5,7 +5,7 @@ Test for date_parse_by_format() $date = "06/08/04"; print_r( date_parse_from_format( '!m/d/y', $date ) ); print_r( date_parse_from_format( '!m*d*y', $date ) ); -?> +?> --EXPECT-- Array ( diff --git a/ext/date/tests/date_add_basic.phpt b/ext/date/tests/date_add_basic.phpt index adddc1340f..a37dd67412 100644 --- a/ext/date/tests/date_add_basic.phpt +++ b/ext/date/tests/date_add_basic.phpt @@ -8,7 +8,7 @@ date_default_timezone_set('UTC'); /* Prototype : void date_add(DateTime object, DateInterval interval) * Description: Adds an interval to the current date in object. * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing date_add() : basic functionality ***\n"; diff --git a/ext/date/tests/date_basic1.phpt b/ext/date/tests/date_basic1.phpt index f4d922b78f..ce79f62e62 100644 --- a/ext/date/tests/date_basic1.phpt +++ b/ext/date/tests/date_basic1.phpt @@ -14,14 +14,14 @@ echo "*** Testing date() : basic functionality ***\n"; $timestamp = mktime(10, 44, 30, 2, 27, 2009); -var_dump( date("F j, Y, g:i a", $timestamp) ); -var_dump( date("m.d.y", $timestamp) ); -var_dump( date("j, n, Y", $timestamp) ); -var_dump( date("Ymd", $timestamp) ); -var_dump( date('h-i-s, j-m-y, it is w Day', $timestamp) ); +var_dump( date("F j, Y, g:i a", $timestamp) ); +var_dump( date("m.d.y", $timestamp) ); +var_dump( date("j, n, Y", $timestamp) ); +var_dump( date("Ymd", $timestamp) ); +var_dump( date('h-i-s, j-m-y, it is w Day', $timestamp) ); var_dump( date('\i\t \i\s \t\h\e jS \d\a\y.', $timestamp) ); var_dump( date("D M j G:i:s T Y", $timestamp) ); -var_dump( date('H:m:s \m \i\s\ \m\o\n\t\h', $timestamp) ); +var_dump( date('H:m:s \m \i\s\ \m\o\n\t\h', $timestamp) ); var_dump( date("H:i:s", $timestamp) ); ?> diff --git a/ext/date/tests/date_constants.phpt b/ext/date/tests/date_constants.phpt index b9fce8c78b..043b6b45cd 100644 --- a/ext/date/tests/date_constants.phpt +++ b/ext/date/tests/date_constants.phpt @@ -16,7 +16,7 @@ Date constants DATE_RSS, DATE_W3C ); - + foreach($constants as $const) { var_dump(date($const, strtotime("1 Jul 06 14:27:30 +0200"))); var_dump(date($const, strtotime("2006-05-30T14:32:13+02:00"))); diff --git a/ext/date/tests/date_create-relative.phpt b/ext/date/tests/date_create-relative.phpt index 8a90931586..5d2a4196e9 100644 --- a/ext/date/tests/date_create-relative.phpt +++ b/ext/date/tests/date_create-relative.phpt @@ -9,7 +9,7 @@ if (!defined('PHP_INT_MIN')) { define('PHP_INT_MIN', intval(-PHP_INT_MAX - 1)); } -$base_time = '28 Feb 2008 12:00:00'; +$base_time = '28 Feb 2008 12:00:00'; // Most offsets tested in strtotime-relative.phpt. These are tests for dates outside the 32-bit range. $offsets = array( @@ -19,20 +19,20 @@ $offsets = array( '1460970 days', '1460971 days', '1462970 days', - + // around 1 leap year period in years '398 years', '399 years', '400 years', '401 years', - + // around 40000 years '39755 years', '39999 years', '40000 years', '40001 years', '41010 years', - + // bigger than int (32-bit) '10000000000 seconds', '10000000000 minutes', diff --git a/ext/date/tests/date_create_variation1.phpt b/ext/date/tests/date_create_variation1.phpt index a476473a10..3bfa5a4870 100644 --- a/ext/date/tests/date_create_variation1.phpt +++ b/ext/date/tests/date_create_variation1.phpt @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_create_variation2.phpt b/ext/date/tests/date_create_variation2.phpt index 12b5f53568..08e4ca7356 100644 --- a/ext/date/tests/date_create_variation2.phpt +++ b/ext/date/tests/date_create_variation2.phpt @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_date_set_basic1.phpt b/ext/date/tests/date_date_set_basic1.phpt index 831a862d0c..9783d4d880 100644 --- a/ext/date/tests/date_date_set_basic1.phpt +++ b/ext/date/tests/date_date_set_basic1.phpt @@ -7,7 +7,7 @@ Test date_date_set() function : basic functionality * Source code: ext/date/php_date.c * Alias to functions: DateTime::setDate */ - + //Set the default time zone date_default_timezone_set("Europe/London"); diff --git a/ext/date/tests/date_date_set_error.phpt b/ext/date/tests/date_date_set_error.phpt index a44d36e34c..e637b364d0 100644 --- a/ext/date/tests/date_date_set_error.phpt +++ b/ext/date/tests/date_date_set_error.phpt @@ -7,7 +7,7 @@ Test date_date_set() function : error conditions * Source code: ext/date/php_date.c * Alias to functions: DateTime::setDate */ - + date_default_timezone_set("Europe/London"); echo "*** Testing date_date_set() : error conditions ***\n"; diff --git a/ext/date/tests/date_date_set_variation1.phpt b/ext/date/tests/date_date_set_variation1.phpt index c6068779d6..8bb8093bc2 100644 --- a/ext/date/tests/date_date_set_variation1.phpt +++ b/ext/date/tests/date_date_set_variation1.phpt @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_date_set_variation2.phpt b/ext/date/tests/date_date_set_variation2.phpt index a41ffe94b7..d11582de62 100644 --- a/ext/date/tests/date_date_set_variation2.phpt +++ b/ext/date/tests/date_date_set_variation2.phpt @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_date_set_variation3.phpt b/ext/date/tests/date_date_set_variation3.phpt index a5510fb50f..9af0a10934 100644 --- a/ext/date/tests/date_date_set_variation3.phpt +++ b/ext/date/tests/date_date_set_variation3.phpt @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_default_timezone_get_error.phpt b/ext/date/tests/date_default_timezone_get_error.phpt index e45722a06c..bb9c2c4d95 100644 --- a/ext/date/tests/date_default_timezone_get_error.phpt +++ b/ext/date/tests/date_default_timezone_get_error.phpt @@ -6,7 +6,7 @@ Test date_default_timezone_get() function : error conditions * Description: Gets the default timezone used by all date/time functions in a script. * Source code: ext/standard/data/php_date.c */ - + date_default_timezone_set("UTC"); echo "*** Testing date_default_timezone_get() : error conditions ***\n"; diff --git a/ext/date/tests/date_default_timezone_set_variation1.phpt b/ext/date/tests/date_default_timezone_set_variation1.phpt index 22f4c22de7..ea6057b6ce 100644 --- a/ext/date/tests/date_default_timezone_set_variation1.phpt +++ b/ext/date/tests/date_default_timezone_set_variation1.phpt @@ -44,7 +44,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -54,7 +54,7 @@ $inputs = array( /*19*/ "abcxyz", 'abcxyz', $heredoc, - + // undefined data /*22*/ @$undefined_var, diff --git a/ext/date/tests/date_format_basic1.phpt b/ext/date/tests/date_format_basic1.phpt index dc2a84a9b1..cb92362ed5 100644 --- a/ext/date/tests/date_format_basic1.phpt +++ b/ext/date/tests/date_format_basic1.phpt @@ -7,22 +7,22 @@ Test date_format() function : basic functionality * Source code: ext/date/php_date.c * Alias to functions: DateTime::format */ - + //Set the default time zone date_default_timezone_set("Europe/London"); echo "*** Testing date_format() : basic functionality ***\n"; $date = date_create("2005-07-14 22:30:41"); -var_dump( date_format($date, "F j, Y, g:i a") ); -var_dump( date_format($date, "m.d.y") ); -var_dump( date_format($date, "j, n, Y") ); -var_dump( date_format($date, "Ymd") ); -var_dump( date_format($date, 'h-i-s, j-m-y, it is w Day') ); -var_dump( date_format($date, '\i\t \i\s \t\h\e jS \d\a\y.') ); -var_dump( date_format($date, "D M j G:i:s T Y") ); -var_dump( date_format($date, 'H:m:s \m \i\s\ \m\o\n\t\h') ); -var_dump( date_format($date, "H:i:s") ); +var_dump( date_format($date, "F j, Y, g:i a") ); +var_dump( date_format($date, "m.d.y") ); +var_dump( date_format($date, "j, n, Y") ); +var_dump( date_format($date, "Ymd") ); +var_dump( date_format($date, 'h-i-s, j-m-y, it is w Day') ); +var_dump( date_format($date, '\i\t \i\s \t\h\e jS \d\a\y.') ); +var_dump( date_format($date, "D M j G:i:s T Y") ); +var_dump( date_format($date, 'H:m:s \m \i\s\ \m\o\n\t\h') ); +var_dump( date_format($date, "H:i:s") ); ?> ===DONE=== diff --git a/ext/date/tests/date_format_error.phpt b/ext/date/tests/date_format_error.phpt index 8a170b098f..75e8898b82 100644 --- a/ext/date/tests/date_format_error.phpt +++ b/ext/date/tests/date_format_error.phpt @@ -7,7 +7,7 @@ Test date_format() function : error conditions * Source code: ext/date/php_date.c * Alias to functions: DateTime::format */ - + //Set the default time zone date_default_timezone_set("Europe/London"); @@ -28,11 +28,11 @@ var_dump( date_format($date, $format, $extra_arg) ); echo "\n-- Testing date_create() function with an invalid values for \$object argument --\n"; $invalid_obj = new stdClass(); -var_dump( date_format($invalid_obj, $format) ); +var_dump( date_format($invalid_obj, $format) ); $invalid_obj = 10; var_dump( date_format($invalid_obj, $format) ); $invalid_obj = null; -var_dump( date_format($invalid_obj, $format) ); +var_dump( date_format($invalid_obj, $format) ); ?> ===DONE=== diff --git a/ext/date/tests/date_format_variation1.phpt b/ext/date/tests/date_format_variation1.phpt index e82932e7ed..8c93c889a2 100644 --- a/ext/date/tests/date_format_variation1.phpt +++ b/ext/date/tests/date_format_variation1.phpt @@ -7,7 +7,7 @@ Test date_format() function : usage variation - Passing unexpected values to fir * Source code: ext/date/php_date.c * Alias to functions: DateTimeInterface::format */ - + echo "*** Testing date_format() : usage variation - unexpected values to first argument \$object***\n"; //Set the default time zone @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_format_variation2.phpt b/ext/date/tests/date_format_variation2.phpt index 1a90951bd8..ce14f3499b 100644 --- a/ext/date/tests/date_format_variation2.phpt +++ b/ext/date/tests/date_format_variation2.phpt @@ -7,7 +7,7 @@ Test date_format() function : usage variation - Passing unexpected values to sec * Source code: ext/date/php_date.c * Alias to functions: DateTime::format */ - + echo "*** Testing date_format() : usage variation - unexpected values to second argument \$format***\n"; //Set the default time zone @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_isodate_set_error.phpt b/ext/date/tests/date_isodate_set_error.phpt index 43651ef6a0..89de5fea3b 100644 --- a/ext/date/tests/date_isodate_set_error.phpt +++ b/ext/date/tests/date_isodate_set_error.phpt @@ -8,7 +8,7 @@ Test date_isodate_set() function : error conditions * Source code: ext/date/php_date.c * Alias to functions: DateTime::setISODate */ - + //Set the default time zone date_default_timezone_set("Europe/London"); @@ -23,18 +23,18 @@ var_dump( date_isodate_set($datetime) ); echo "\n-- Testing date_isodate_set() function with more than expected no. of arguments --\n"; $year = 2009; -$week = 30; +$week = 30; $day = 7; $extra_arg = 30; var_dump( date_isodate_set($datetime, $year, $week, $day, $extra_arg) ); echo "\n-- Testing date_isodate_set() function with an invalid values for \$object argument --\n"; $invalid_obj = new stdClass(); -var_dump( date_isodate_set($invalid_obj, $year, $week, $day) ); +var_dump( date_isodate_set($invalid_obj, $year, $week, $day) ); $invalid_obj = 10; var_dump( date_isodate_set($invalid_obj, $year, $week, $day) ); $invalid_obj = null; -var_dump( date_isodate_set($invalid_obj, $year, $week, $day) ); +var_dump( date_isodate_set($invalid_obj, $year, $week, $day) ); ?> ===DONE=== --EXPECTF-- diff --git a/ext/date/tests/date_isodate_set_variation1.phpt b/ext/date/tests/date_isodate_set_variation1.phpt index c5fb46342d..fbea1e2eaa 100644 --- a/ext/date/tests/date_isodate_set_variation1.phpt +++ b/ext/date/tests/date_isodate_set_variation1.phpt @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_isodate_set_variation2.phpt b/ext/date/tests/date_isodate_set_variation2.phpt index 078abf0191..8512fbe1ca 100644 --- a/ext/date/tests/date_isodate_set_variation2.phpt +++ b/ext/date/tests/date_isodate_set_variation2.phpt @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_isodate_set_variation3.phpt b/ext/date/tests/date_isodate_set_variation3.phpt index a9906dc97d..829741ad66 100644 --- a/ext/date/tests/date_isodate_set_variation3.phpt +++ b/ext/date/tests/date_isodate_set_variation3.phpt @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_isodate_set_variation4.phpt b/ext/date/tests/date_isodate_set_variation4.phpt index 0c94d515b0..ff11405126 100644 --- a/ext/date/tests/date_isodate_set_variation4.phpt +++ b/ext/date/tests/date_isodate_set_variation4.phpt @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_modify_basic1.phpt b/ext/date/tests/date_modify_basic1.phpt index 42e0ebf60d..b841f28519 100644 --- a/ext/date/tests/date_modify_basic1.phpt +++ b/ext/date/tests/date_modify_basic1.phpt @@ -16,16 +16,16 @@ echo "*** Testing date_modify() : basic functionality ***\n"; // Create a date object to modify $datetime = date_create("2009-01-31 14:28:41"); -date_modify($datetime, "+1 day"); -echo "After modification 1: " . date_format($datetime, "D, d M Y") . "\n"; +date_modify($datetime, "+1 day"); +echo "After modification 1: " . date_format($datetime, "D, d M Y") . "\n"; -date_modify($datetime, "+1 week 2 days 4 hours 2 seconds"); +date_modify($datetime, "+1 week 2 days 4 hours 2 seconds"); echo "After modification 2: " . date_format($datetime, "D, d M Y H:i:s") . "\n"; -date_modify($datetime, "next Thursday"); -echo "After modification 3: " . date_format($datetime, "D, d M Y") . "\n"; +date_modify($datetime, "next Thursday"); +echo "After modification 3: " . date_format($datetime, "D, d M Y") . "\n"; -date_modify($datetime, "last Sunday"); +date_modify($datetime, "last Sunday"); echo "After modification 4: " . date_format($datetime, "D, d M Y") . "\n"; ?> diff --git a/ext/date/tests/date_modify_error.phpt b/ext/date/tests/date_modify_error.phpt index 2bfd38bbe6..6102874c5c 100644 --- a/ext/date/tests/date_modify_error.phpt +++ b/ext/date/tests/date_modify_error.phpt @@ -29,11 +29,11 @@ var_dump( date_modify($datetime, $modify, $extra_arg) ); echo "\n-- Testing date_modify() function with an invalid values for \$object argument --\n"; $invalid_obj = new stdClass(); -var_dump( date_modify($invalid_obj, $modify) ); +var_dump( date_modify($invalid_obj, $modify) ); $invalid_obj = 10; var_dump( date_modify($invalid_obj, $modify) ); $invalid_obj = null; -var_dump( date_modify($invalid_obj, $modify) ); +var_dump( date_modify($invalid_obj, $modify) ); ?> ===DONE=== diff --git a/ext/date/tests/date_modify_variation1.phpt b/ext/date/tests/date_modify_variation1.phpt index 8a63cb960a..210cc60b01 100644 --- a/ext/date/tests/date_modify_variation1.phpt +++ b/ext/date/tests/date_modify_variation1.phpt @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_modify_variation2.phpt b/ext/date/tests/date_modify_variation2.phpt index a28261be44..21ea733c69 100644 --- a/ext/date/tests/date_modify_variation2.phpt +++ b/ext/date/tests/date_modify_variation2.phpt @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_offset_get_basic1.phpt b/ext/date/tests/date_offset_get_basic1.phpt index ec6fb16350..e11728423b 100644 --- a/ext/date/tests/date_offset_get_basic1.phpt +++ b/ext/date/tests/date_offset_get_basic1.phpt @@ -7,7 +7,7 @@ Test date_offset_get() function : basic functionality * Source code: ext/date/php_date.c * Alias to functions: DateTime::getOffset */ - + //Set the default time zone date_default_timezone_set('Europe/London'); @@ -16,8 +16,8 @@ echo "*** Testing date_offset_get() : basic functionality ***\n"; $winter = date_create('2008-12-25 14:25:41'); $summer = date_create('2008-07-02 14:25:41'); -echo "Winter offset: " . date_offset_get($winter) / 3600 . " hours\n"; -echo "Summer offset: " . date_offset_get($summer) / 3600 . " hours\n"; +echo "Winter offset: " . date_offset_get($winter) / 3600 . " hours\n"; +echo "Summer offset: " . date_offset_get($summer) / 3600 . " hours\n"; ?> ===DONE=== diff --git a/ext/date/tests/date_offset_get_error.phpt b/ext/date/tests/date_offset_get_error.phpt index 7c1fa2a691..9553dce990 100644 --- a/ext/date/tests/date_offset_get_error.phpt +++ b/ext/date/tests/date_offset_get_error.phpt @@ -8,7 +8,7 @@ Test date_offset_get() function : error conditions * Source code: ext/date/php_date.c * Alias to functions: DateTimeInterface::getOffset */ - + //Set the default time zone date_default_timezone_set("Europe/London"); @@ -24,11 +24,11 @@ var_dump( date_offset_get($datetime, $extra_arg) ); echo "\n-- Testing date_offset_get() function with an invalid values for \$object argument --\n"; $invalid_obj = new stdClass(); -var_dump( date_offset_get($invalid_obj) ); +var_dump( date_offset_get($invalid_obj) ); $invalid_obj = 10; var_dump( date_offset_get($invalid_obj) ); $invalid_obj = null; -var_dump( date_offset_get($invalid_obj) ); +var_dump( date_offset_get($invalid_obj) ); ?> ===DONE=== --EXPECTF-- diff --git a/ext/date/tests/date_offset_get_variation1.phpt b/ext/date/tests/date_offset_get_variation1.phpt index 1c9381d3fe..1ec6d347cf 100644 --- a/ext/date/tests/date_offset_get_variation1.phpt +++ b/ext/date/tests/date_offset_get_variation1.phpt @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_parse_001.phpt b/ext/date/tests/date_parse_001.phpt index 73fe825723..b5c5ac0f48 100644 --- a/ext/date/tests/date_parse_001.phpt +++ b/ext/date/tests/date_parse_001.phpt @@ -15,7 +15,7 @@ Test basic date_parse() var_dump(date_parse(array())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(12) { ["year"]=> int(2006) diff --git a/ext/date/tests/date_parse_basic1.phpt b/ext/date/tests/date_parse_basic1.phpt index 04710d1adb..b1d1701537 100644 --- a/ext/date/tests/date_parse_basic1.phpt +++ b/ext/date/tests/date_parse_basic1.phpt @@ -2,11 +2,11 @@ Test date_parse() function : basic functionality --FILE-- <?php -/* Prototype : array date_parse ( string $date ) +/* Prototype : array date_parse ( string $date ) * Description: Returns associative array with detailed info about given date. * Source code: ext/date/php_date.c */ - + //Set the default time zone date_default_timezone_set("Europe/London"); diff --git a/ext/date/tests/date_parse_error.phpt b/ext/date/tests/date_parse_error.phpt index 389f519ef9..a1de04776b 100644 --- a/ext/date/tests/date_parse_error.phpt +++ b/ext/date/tests/date_parse_error.phpt @@ -2,11 +2,11 @@ Test date_parse() function : error conditions --FILE-- <?php -/* Prototype : array date_parse ( string $date ) +/* Prototype : array date_parse ( string $date ) * Description: Returns associative array with detailed info about given date. * Source code: ext/date/php_date.c */ - + //Set the default time zone date_default_timezone_set("Europe/London"); @@ -22,7 +22,7 @@ var_dump( date_parse($date, $extra_arg) ); echo "\n-- Testing date_parse() function with unexpected characters in \$date argument --\n"; $invalid_date = "2OO9-02--27 10:00?00.5"; -var_dump( date_parse($invalid_date) ); +var_dump( date_parse($invalid_date) ); ?> ===DONE=== diff --git a/ext/date/tests/date_parse_variation1.phpt b/ext/date/tests/date_parse_variation1.phpt index 300bd5eac7..20157c74a0 100644 --- a/ext/date/tests/date_parse_variation1.phpt +++ b/ext/date/tests/date_parse_variation1.phpt @@ -2,7 +2,7 @@ Test date_parse() function : usage variation - Passing unexpected values to first argument $date. --FILE-- <?php -/* Prototype : array date_parse ( string $date ) +/* Prototype : array date_parse ( string $date ) * Description: Returns associative array with detailed info about given date. * Source code: ext/date/php_date.c */ @@ -89,7 +89,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); @@ -100,8 +100,8 @@ foreach($inputs as $variation =>$date) { if (is_array($result)) { var_dump($result["errors"]); } else { - var_dump($result); - } + var_dump($result); + } }; // closing the resource diff --git a/ext/date/tests/date_sub_basic.phpt b/ext/date/tests/date_sub_basic.phpt index b6aed7881b..19b4a20eac 100644 --- a/ext/date/tests/date_sub_basic.phpt +++ b/ext/date/tests/date_sub_basic.phpt @@ -8,7 +8,7 @@ date_default_timezone_set('UTC'); /* Prototype : void date_sub(DateTime object, DateInterval interval) * Description: Subtracts an interval from the current date in object. * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing date_sub() : basic functionality ***\n"; diff --git a/ext/date/tests/date_sun_info_001.phpt b/ext/date/tests/date_sun_info_001.phpt index 35ca37ae98..c9096af46d 100644 --- a/ext/date/tests/date_sun_info_001.phpt +++ b/ext/date/tests/date_sun_info_001.phpt @@ -7,7 +7,7 @@ $sun_info = date_sun_info(strtotime("2006-12-12"), 31.7667, 35.2333); var_dump($sun_info); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(9) { ["sunrise"]=> int(1165897761) diff --git a/ext/date/tests/date_sun_info_variation1.phpt b/ext/date/tests/date_sun_info_variation1.phpt index caf939efc0..76ae077f73 100644 --- a/ext/date/tests/date_sun_info_variation1.phpt +++ b/ext/date/tests/date_sun_info_variation1.phpt @@ -6,7 +6,7 @@ Test date_sun_info() function : error variations - Pass unexpected values for ti * Description: Returns an array with information about sunset/sunrise and twilight begin/end. * Source code: ext/standard/data/php_date.c */ - + date_default_timezone_set("UTC"); echo "*** Testing date_sun_info() : usage variations ***\n"; @@ -47,7 +47,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -57,7 +57,7 @@ $inputs = array( /*19*/ "abcxyz", 'abcxyz', $heredoc, - + // undefined data /*22*/ @$undefined_var, diff --git a/ext/date/tests/date_sun_info_variation2.phpt b/ext/date/tests/date_sun_info_variation2.phpt index 8c8267a234..42254d5586 100644 --- a/ext/date/tests/date_sun_info_variation2.phpt +++ b/ext/date/tests/date_sun_info_variation2.phpt @@ -6,7 +6,7 @@ Test date_sun_info() function : error variations - Pass unexpected values for la * Description: Returns an array with information about sunset/sunrise and twilight begin/end. * Source code: ext/standard/data/php_date.c */ - + date_default_timezone_set("UTC"); echo "*** Testing date_sun_info() : usage variations ***\n"; @@ -47,7 +47,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -57,7 +57,7 @@ $inputs = array( /*19*/ "abcxyz", 'abcxyz', $heredoc, - + // undefined data /*22*/ @$undefined_var, diff --git a/ext/date/tests/date_sun_info_variation3.phpt b/ext/date/tests/date_sun_info_variation3.phpt index 28af426623..69396e4ee2 100644 --- a/ext/date/tests/date_sun_info_variation3.phpt +++ b/ext/date/tests/date_sun_info_variation3.phpt @@ -6,7 +6,7 @@ Test date_sun_info() function : usage variations - Pass unexpected values for lo * Description: Returns an array with information about sunset/sunrise and twilight begin/end. * Source code: ext/standard/data/php_date.c */ - + date_default_timezone_set("UTC"); echo "*** Testing date_sun_info() : usage variations ***\n"; @@ -47,7 +47,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -57,7 +57,7 @@ $inputs = array( /*19*/ "abcxyz", 'abcxyz', $heredoc, - + // undefined data /*22*/ @$undefined_var, diff --git a/ext/date/tests/date_sunrise_variation2.phpt b/ext/date/tests/date_sunrise_variation2.phpt index 0a63d42793..d648a65c98 100644 --- a/ext/date/tests/date_sunrise_variation2.phpt +++ b/ext/date/tests/date_sunrise_variation2.phpt @@ -7,7 +7,7 @@ Test date_sunrise() function : usage variation - Passing unexpected values to se /* Prototype : mixed date_sunrise(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]]) * Description: Returns time of sunrise for a given day and location * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing date_sunrise() : usage variation ***\n"; diff --git a/ext/date/tests/date_sunrise_variation4.phpt b/ext/date/tests/date_sunrise_variation4.phpt index 7909ca1100..8e42a8a0e2 100644 --- a/ext/date/tests/date_sunrise_variation4.phpt +++ b/ext/date/tests/date_sunrise_variation4.phpt @@ -5,7 +5,7 @@ Test date_sunrise() function : usage variation - Passing unexpected values to fo /* Prototype : mixed date_sunrise(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]]) * Description: Returns time of sunrise for a given day and location * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing date_sunrise() : usage variation ***\n"; diff --git a/ext/date/tests/date_sunrise_variation5.phpt b/ext/date/tests/date_sunrise_variation5.phpt index 9858c890ba..a83cddd761 100644 --- a/ext/date/tests/date_sunrise_variation5.phpt +++ b/ext/date/tests/date_sunrise_variation5.phpt @@ -5,7 +5,7 @@ Test date_sunrise() function : usage variation - Passing unexpected values to fi /* Prototype : mixed date_sunrise(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]]) * Description: Returns time of sunrise for a given day and location * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing date_sunrise() : usage variation ***\n"; diff --git a/ext/date/tests/date_sunrise_variation6.phpt b/ext/date/tests/date_sunrise_variation6.phpt index 4c7a8e762c..d7e30da867 100644 --- a/ext/date/tests/date_sunrise_variation6.phpt +++ b/ext/date/tests/date_sunrise_variation6.phpt @@ -5,7 +5,7 @@ Test date_sunrise() function : usage variation - Passing unexpected values to si /* Prototype : mixed date_sunrise(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]]) * Description: Returns time of sunrise for a given day and location * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing date_sunrise() : usage variation ***\n"; diff --git a/ext/date/tests/date_sunrise_variation7.phpt b/ext/date/tests/date_sunrise_variation7.phpt index 3993ca6a8b..7320c00ce9 100644 --- a/ext/date/tests/date_sunrise_variation7.phpt +++ b/ext/date/tests/date_sunrise_variation7.phpt @@ -5,7 +5,7 @@ Test date_sunrise() function : usage variation - Checking sunrise for consecuti /* Prototype : mixed date_sunrise(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]]) * Description: Returns time of sunrise for a given day and location * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing date_sunrise() : usage variation ***\n"; @@ -28,7 +28,7 @@ foreach($inputs as $timezone => $value) { date_default_timezone_set($timezone); $time = mktime(8, 8, 8, 8, 11, 2008); var_dump( date_sunrise($time, SUNFUNCS_RET_STRING, $value["Latitude"], $value["Longitude"], 90, $value["GMT"] )); - $time = mktime(8, 8, 8, 8, 12, 2008); + $time = mktime(8, 8, 8, 8, 12, 2008); var_dump( date_sunrise($time, SUNFUNCS_RET_STRING, $value["Latitude"], $value["Longitude"], 90, $value["GMT"]) ); } diff --git a/ext/date/tests/date_sunrise_variation8.phpt b/ext/date/tests/date_sunrise_variation8.phpt index fe8aefeb9f..f267ade340 100644 --- a/ext/date/tests/date_sunrise_variation8.phpt +++ b/ext/date/tests/date_sunrise_variation8.phpt @@ -5,7 +5,7 @@ Test date_sunrise() function : usage variation - Checking with North and South /* Prototype : mixed date_sunrise(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]]) * Description: Returns time of sunrise for a given day and location * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing date_sunrise() : usage variation ***\n"; @@ -28,10 +28,10 @@ foreach( $time_date as $date => $time ){ echo "\n--$date--\n"; var_dump( date_sunrise($time, SUNFUNCS_RET_STRING, 90, 0 ) ); var_dump( date_sunrise($time, SUNFUNCS_RET_DOUBLE, 90, 0 ) ); - var_dump( date_sunrise($time, SUNFUNCS_RET_TIMESTAMP, 90, 0 ) ); + var_dump( date_sunrise($time, SUNFUNCS_RET_TIMESTAMP, 90, 0 ) ); var_dump( date_sunrise($time, SUNFUNCS_RET_STRING, -90, 0 ) ); var_dump( date_sunrise($time, SUNFUNCS_RET_DOUBLE, -90, 0 ) ); - var_dump( date_sunrise($time, SUNFUNCS_RET_TIMESTAMP, -90, 0 ) ); + var_dump( date_sunrise($time, SUNFUNCS_RET_TIMESTAMP, -90, 0 ) ); } ?> diff --git a/ext/date/tests/date_sunrise_variation9.phpt b/ext/date/tests/date_sunrise_variation9.phpt index 17558a7e42..f5d479a71d 100644 --- a/ext/date/tests/date_sunrise_variation9.phpt +++ b/ext/date/tests/date_sunrise_variation9.phpt @@ -7,7 +7,7 @@ Test date_sunrise() function : usage variation - Passing high positive and nega /* Prototype : mixed date_sunrise(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]]) * Description: Returns time of sunrise for a given day and location * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing date_sunrise() : usage variation ***\n"; diff --git a/ext/date/tests/date_sunset_error.phpt b/ext/date/tests/date_sunset_error.phpt index a5e75b649e..dacc0383c7 100644 --- a/ext/date/tests/date_sunset_error.phpt +++ b/ext/date/tests/date_sunset_error.phpt @@ -5,7 +5,7 @@ Test date_sunset() function : error conditions /* Prototype : mixed date_sunset(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]]) * Description: Returns time of sunset for a given day and location * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing date_sunset() : error conditions ***\n"; diff --git a/ext/date/tests/date_sunset_variation1.phpt b/ext/date/tests/date_sunset_variation1.phpt index 58e885b314..9544db24da 100644 --- a/ext/date/tests/date_sunset_variation1.phpt +++ b/ext/date/tests/date_sunset_variation1.phpt @@ -5,7 +5,7 @@ Test date_sunset() function : usage variation - Passing unexpected values to fir /* Prototype : mixed date_sunset(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]]) * Description: Returns time of sunset for a given day and location * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing date_sunset() : usage variation ***\n"; diff --git a/ext/date/tests/date_sunset_variation2.phpt b/ext/date/tests/date_sunset_variation2.phpt index 6c9eca364f..305cee8b2a 100644 --- a/ext/date/tests/date_sunset_variation2.phpt +++ b/ext/date/tests/date_sunset_variation2.phpt @@ -7,7 +7,7 @@ Test date_sunset() function : usage variation - Passing unexpected values to sec /* Prototype : mixed date_sunset(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]]) * Description: Returns time of sunset for a given day and location * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing date_sunset() : usage variation ***\n"; diff --git a/ext/date/tests/date_sunset_variation3.phpt b/ext/date/tests/date_sunset_variation3.phpt index 0a51ac6b17..8579052f46 100644 --- a/ext/date/tests/date_sunset_variation3.phpt +++ b/ext/date/tests/date_sunset_variation3.phpt @@ -5,7 +5,7 @@ Test date_sunset() function : usage variation - Passing unexpected values to thi /* Prototype : mixed date_sunset(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]]) * Description: Returns time of sunset for a given day and location * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing date_sunset() : usage variation ***\n"; @@ -95,7 +95,7 @@ foreach($inputs as $key =>$value) { var_dump( date_sunset($time, SUNFUNCS_RET_STRING, $value, $longitude, $zenith, $gmt_offset) ); var_dump( date_sunset($time, SUNFUNCS_RET_DOUBLE, $value, $longitude, $zenith, $gmt_offset) ); var_dump( date_sunset($time, SUNFUNCS_RET_TIMESTAMP, $value, $longitude, $zenith, $gmt_offset) ); - + }; ?> diff --git a/ext/date/tests/date_sunset_variation4.phpt b/ext/date/tests/date_sunset_variation4.phpt index c892f87c09..acff9c7778 100644 --- a/ext/date/tests/date_sunset_variation4.phpt +++ b/ext/date/tests/date_sunset_variation4.phpt @@ -5,7 +5,7 @@ Test date_sunset() function : usage variation - Passing unexpected values to fou /* Prototype : mixed date_sunset(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]]) * Description: Returns time of sunset for a given day and location * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing date_sunset() : usage variation ***\n"; diff --git a/ext/date/tests/date_sunset_variation5.phpt b/ext/date/tests/date_sunset_variation5.phpt index 579e1c8eb0..0a8732b84d 100644 --- a/ext/date/tests/date_sunset_variation5.phpt +++ b/ext/date/tests/date_sunset_variation5.phpt @@ -5,7 +5,7 @@ Test date_sunset() function : usage variation - Passing unexpected values to fif /* Prototype : mixed date_sunset(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]]) * Description: Returns time of sunset for a given day and location * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing date_sunset() : usage variation ***\n"; diff --git a/ext/date/tests/date_sunset_variation6.phpt b/ext/date/tests/date_sunset_variation6.phpt index 29b31f6e95..0abb858846 100644 --- a/ext/date/tests/date_sunset_variation6.phpt +++ b/ext/date/tests/date_sunset_variation6.phpt @@ -5,7 +5,7 @@ Test date_sunset() function : usage variation - Passing unexpected values to six /* Prototype : mixed date_sunset(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]]) * Description: Returns time of sunset for a given day and location * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing date_sunset() : usage variation ***\n"; diff --git a/ext/date/tests/date_sunset_variation7.phpt b/ext/date/tests/date_sunset_variation7.phpt index 00d836dcbe..cb084ae6e7 100644 --- a/ext/date/tests/date_sunset_variation7.phpt +++ b/ext/date/tests/date_sunset_variation7.phpt @@ -5,7 +5,7 @@ Test date_sunset() function : usage variation - Checking sunrise for consecutiv /* Prototype : mixed date_sunset(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]]) * Description: Returns time of sunrise for a given day and location * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing date_sunset() : usage variation ***\n"; @@ -29,7 +29,7 @@ foreach($inputs as $timezone => $value) { date_default_timezone_set($timezone); $time = mktime(8, 8, 8, 8, 11, 2008); var_dump( date_sunset($time, SUNFUNCS_RET_STRING, $value["Latitude"], $value["Longitude"], 90, $value["GMT"] )); - $time = mktime(8, 8, 8, 8, 12, 2008); + $time = mktime(8, 8, 8, 8, 12, 2008); var_dump( date_sunset($time, SUNFUNCS_RET_STRING, $value["Latitude"], $value["Longitude"], 90, $value["GMT"]) ); } ?> diff --git a/ext/date/tests/date_sunset_variation8.phpt b/ext/date/tests/date_sunset_variation8.phpt index dcccfaccb6..fe72aff1b1 100644 --- a/ext/date/tests/date_sunset_variation8.phpt +++ b/ext/date/tests/date_sunset_variation8.phpt @@ -5,7 +5,7 @@ Test date_sunset() function : usage variation - Checking with North and South p /* Prototype : mixed date_sunset(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]]) * Description: Returns time of sunrise for a given day and location * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing date_sunset() : usage variation ***\n"; @@ -28,10 +28,10 @@ foreach( $time_date as $date => $time ){ echo "\n--$date--\n"; var_dump( date_sunset($time, SUNFUNCS_RET_STRING, 90, 0 ) ); var_dump( date_sunset($time, SUNFUNCS_RET_DOUBLE, 90, 0 ) ); - var_dump( date_sunset($time, SUNFUNCS_RET_TIMESTAMP, 90, 0 ) ); + var_dump( date_sunset($time, SUNFUNCS_RET_TIMESTAMP, 90, 0 ) ); var_dump( date_sunset($time, SUNFUNCS_RET_STRING, -90, 0 ) ); var_dump( date_sunset($time, SUNFUNCS_RET_DOUBLE, -90, 0 ) ); - var_dump( date_sunset($time, SUNFUNCS_RET_TIMESTAMP, -90, 0 ) ); + var_dump( date_sunset($time, SUNFUNCS_RET_TIMESTAMP, -90, 0 ) ); } ?> diff --git a/ext/date/tests/date_sunset_variation9.phpt b/ext/date/tests/date_sunset_variation9.phpt index 56949b7e8f..5814a31c99 100644 --- a/ext/date/tests/date_sunset_variation9.phpt +++ b/ext/date/tests/date_sunset_variation9.phpt @@ -7,7 +7,7 @@ Test date_sunset() function : usage variation - Passing high positive and negati /* Prototype : mixed date_sunset(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]]) * Description: Returns time of sunset for a given day and location * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing date_sunset() : usage variation ***\n"; diff --git a/ext/date/tests/date_time_set_basic1.phpt b/ext/date/tests/date_time_set_basic1.phpt index 9c1a025d47..f9d06f080a 100644 --- a/ext/date/tests/date_time_set_basic1.phpt +++ b/ext/date/tests/date_time_set_basic1.phpt @@ -7,7 +7,7 @@ Test date_time_set() function : basic functionality * Source code: ext/date/php_date.c * Alias to functions: DateTime::setTime */ - + //Set the default time zone date_default_timezone_set("Europe/London"); diff --git a/ext/date/tests/date_time_set_error.phpt b/ext/date/tests/date_time_set_error.phpt index e722cc7151..7c5fd9131d 100644 --- a/ext/date/tests/date_time_set_error.phpt +++ b/ext/date/tests/date_time_set_error.phpt @@ -7,7 +7,7 @@ Test date_time_set() function : error conditions * Source code: ext/date/php_date.c * Alias to functions: DateTime::setTime */ - + date_default_timezone_set("Europe/London"); echo "*** Testing date_time_set() : error conditions ***\n"; @@ -30,11 +30,11 @@ var_dump( date_time_set($datetime, $hour, $min, $sec, $microseconds, $extra_arg) echo "\n-- Testing date_time_set() function with an invalid values for \$object argument --\n"; $invalid_obj = new stdClass(); -var_dump( date_time_set($invalid_obj, $hour, $min, $sec) ); +var_dump( date_time_set($invalid_obj, $hour, $min, $sec) ); $invalid_obj = 10; var_dump( date_time_set($invalid_obj, $hour, $min, $sec) ); $invalid_obj = null; -var_dump( date_time_set($invalid_obj, $hour, $min, $sec) ); +var_dump( date_time_set($invalid_obj, $hour, $min, $sec) ); ?> ===DONE=== --EXPECTF-- diff --git a/ext/date/tests/date_time_set_variation1.phpt b/ext/date/tests/date_time_set_variation1.phpt index 85e6c783cb..ec5e8b11f5 100644 --- a/ext/date/tests/date_time_set_variation1.phpt +++ b/ext/date/tests/date_time_set_variation1.phpt @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_time_set_variation2.phpt b/ext/date/tests/date_time_set_variation2.phpt index 6ab19f24ee..c79b67f48c 100644 --- a/ext/date/tests/date_time_set_variation2.phpt +++ b/ext/date/tests/date_time_set_variation2.phpt @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_time_set_variation3.phpt b/ext/date/tests/date_time_set_variation3.phpt index 7293580553..6c7e5924c3 100644 --- a/ext/date/tests/date_time_set_variation3.phpt +++ b/ext/date/tests/date_time_set_variation3.phpt @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_time_set_variation4.phpt b/ext/date/tests/date_time_set_variation4.phpt index 8a0d5c8caa..c0485146cd 100644 --- a/ext/date/tests/date_time_set_variation4.phpt +++ b/ext/date/tests/date_time_set_variation4.phpt @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_timestamp_get.phpt b/ext/date/tests/date_timestamp_get.phpt index acdf1e567e..d42b1a5385 100644 --- a/ext/date/tests/date_timestamp_get.phpt +++ b/ext/date/tests/date_timestamp_get.phpt @@ -7,7 +7,7 @@ Havard Eide <nucleuz@gmail.com> date.timezone=UTC --FILE-- <?php -$tz = date_timestamp_get(new DateTime()); +$tz = date_timestamp_get(new DateTime()); var_dump(is_int($tz)); echo "\n\n"; $tz = date_timestamp_get(time()); diff --git a/ext/date/tests/date_timestamp_set.phpt b/ext/date/tests/date_timestamp_set.phpt index 24546ee2ad..d17ffcd985 100644 --- a/ext/date/tests/date_timestamp_set.phpt +++ b/ext/date/tests/date_timestamp_set.phpt @@ -4,14 +4,14 @@ Test the basics to function date_timestamp_set(). Rodrigo Prado de Jesus <royopa [at] gmail [dot] com> --INI-- date.timezone = UTC; -date_default_timezone_set("America/Sao_Paulo"); +date_default_timezone_set("America/Sao_Paulo"); --FILE-- <?php $dftz021 = date_default_timezone_get(); //UTC -$dtms021 = date_create(); +$dtms021 = date_create(); -date_timestamp_set($dtms021, 1234567890); +date_timestamp_set($dtms021, 1234567890); var_dump(date_format($dtms021, 'B => (U) => T Y-M-d H:i:s')); ?> diff --git a/ext/date/tests/date_timestamp_set_nullparam.phpt b/ext/date/tests/date_timestamp_set_nullparam.phpt index 1bcb800242..04cde83346 100644 --- a/ext/date/tests/date_timestamp_set_nullparam.phpt +++ b/ext/date/tests/date_timestamp_set_nullparam.phpt @@ -4,14 +4,14 @@ Test the function date_timestamp_set() with first null parameter. Rodrigo Prado de Jesus <royopa [at] gmail [dot] com> --INI-- date.timezone = UTC; -date_default_timezone_set("America/Sao_Paulo"); +date_default_timezone_set("America/Sao_Paulo"); --FILE-- <?php $dftz021 = date_default_timezone_get(); //UTC -$dtms021 = date_create(); +$dtms021 = date_create(); -date_timestamp_set(null, 1234567890); +date_timestamp_set(null, 1234567890); ?> --EXPECTF-- Warning: date_timestamp_set() expects parameter 1 to be DateTime, null given in %s on line %d
\ No newline at end of file diff --git a/ext/date/tests/date_timestamp_set_nullparam2.phpt b/ext/date/tests/date_timestamp_set_nullparam2.phpt index 8983cc4e2d..ee4477e907 100644 --- a/ext/date/tests/date_timestamp_set_nullparam2.phpt +++ b/ext/date/tests/date_timestamp_set_nullparam2.phpt @@ -4,12 +4,12 @@ Test the function date_timestamp_set() with second null parameter. Rodrigo Prado de Jesus <royopa [at] gmail [dot] com> --INI-- date.timezone = UTC; -date_default_timezone_set("America/Sao_Paulo"); +date_default_timezone_set("America/Sao_Paulo"); --FILE-- <?php $dftz021 = date_default_timezone_get(); //UTC -$dtms021 = date_create(); +$dtms021 = date_create(); var_dump(date_timestamp_set($dtms021, null)); ?> diff --git a/ext/date/tests/date_timestamp_set_wrongparam_001.phpt b/ext/date/tests/date_timestamp_set_wrongparam_001.phpt index 9a0fca99c1..43fec3796a 100644 --- a/ext/date/tests/date_timestamp_set_wrongparam_001.phpt +++ b/ext/date/tests/date_timestamp_set_wrongparam_001.phpt @@ -4,12 +4,12 @@ Check the function date_timestamp_set() with first parameter wrong (array). Rodrigo Prado de Jesus <royopa [at] gmail [dot] com> --INI-- date.timezone = UTC; -date_default_timezone_set("America/Sao_Paulo"); +date_default_timezone_set("America/Sao_Paulo"); --FILE-- <?php $dftz021 = date_default_timezone_get(); //UTC -$dtms021 = array(); +$dtms021 = array(); date_timestamp_set($dtms021, 123456789); ?> diff --git a/ext/date/tests/date_timestamp_set_wrongparam_002.phpt b/ext/date/tests/date_timestamp_set_wrongparam_002.phpt index 1b3a94bffd..1f436d6c2f 100644 --- a/ext/date/tests/date_timestamp_set_wrongparam_002.phpt +++ b/ext/date/tests/date_timestamp_set_wrongparam_002.phpt @@ -4,7 +4,7 @@ Check the function date_timestamp_set() with first parameter wrong (integer). Rodrigo Prado de Jesus <royopa [at] gmail [dot] com> --INI-- date.timezone = UTC; -date_default_timezone_set("America/Sao_Paulo"); +date_default_timezone_set("America/Sao_Paulo"); --FILE-- <?php $dftz021 = date_default_timezone_get(); //UTC diff --git a/ext/date/tests/date_timestamp_set_wrongparam_003.phpt b/ext/date/tests/date_timestamp_set_wrongparam_003.phpt index 1243240c2d..149033660d 100644 --- a/ext/date/tests/date_timestamp_set_wrongparam_003.phpt +++ b/ext/date/tests/date_timestamp_set_wrongparam_003.phpt @@ -4,12 +4,12 @@ Check the function date_timestamp_set() with second parameter wrong (array). Rodrigo Prado de Jesus <royopa [at] gmail [dot] com> --INI-- date.timezone = UTC; -date_default_timezone_set("America/Sao_Paulo"); +date_default_timezone_set("America/Sao_Paulo"); --FILE-- <?php $dftz021 = date_default_timezone_get(); //UTC -$dtms021 = new DateTime(); +$dtms021 = new DateTime(); $wrong_parameter = array(); diff --git a/ext/date/tests/date_timestamp_set_wrongparam_004.phpt b/ext/date/tests/date_timestamp_set_wrongparam_004.phpt index b171e98bd4..a9aab110e2 100644 --- a/ext/date/tests/date_timestamp_set_wrongparam_004.phpt +++ b/ext/date/tests/date_timestamp_set_wrongparam_004.phpt @@ -4,12 +4,12 @@ Check the function date_timestamp_set() with 3 parameters. Rodrigo Prado de Jesus <royopa [at] gmail [dot] com> --INI-- date.timezone = UTC; -date_default_timezone_set("America/Sao_Paulo"); +date_default_timezone_set("America/Sao_Paulo"); --FILE-- <?php $dftz021 = date_default_timezone_get(); //UTC -$dtms021 = new DateTime(); +$dtms021 = new DateTime(); date_timestamp_set($dtms021, 123456789, 'error'); ?> diff --git a/ext/date/tests/date_timezone_get_basic1.phpt b/ext/date/tests/date_timezone_get_basic1.phpt index 7e86036ada..34fc273d2b 100644 --- a/ext/date/tests/date_timezone_get_basic1.phpt +++ b/ext/date/tests/date_timezone_get_basic1.phpt @@ -12,17 +12,17 @@ echo "*** Testing date_timezone_get() : basic functionality ***\n"; date_default_timezone_set("Europe/London"); $object = date_create("2009-01-30 17:57:32"); -$tz = date_timezone_get($object); +$tz = date_timezone_get($object); var_dump( timezone_name_get($tz) ); date_default_timezone_set("America/New_York"); $object = date_create("2009-01-30 17:57:32"); -$tz = date_timezone_get($object); +$tz = date_timezone_get($object); var_dump( timezone_name_get($tz) ); $la_time = timezone_open("America/Los_Angeles"); date_timezone_set($object, $la_time); -$tz = date_timezone_get($object); +$tz = date_timezone_get($object); var_dump( timezone_name_get($tz) ); ?> diff --git a/ext/date/tests/date_timezone_get_error.phpt b/ext/date/tests/date_timezone_get_error.phpt index 4d8318431c..5dc2b6fc70 100644 --- a/ext/date/tests/date_timezone_get_error.phpt +++ b/ext/date/tests/date_timezone_get_error.phpt @@ -7,14 +7,14 @@ Test date_timezone_get() function : error conditions * Source code: ext/date/php_date.c * Alias to functions: DateTimeInterface::getTimezone */ - + // Set timezone date_default_timezone_set("Europe/London"); echo "*** Testing date_timezone_get() : error conditions ***\n"; echo "\n-- Testing date_timezone_get() function with zero arguments --\n"; -var_dump( date_timezone_get() ); +var_dump( date_timezone_get() ); echo "\n-- Testing date_timezone_get() function with more than expected no. of arguments --\n"; $datetime = date_create("2009-01-30 17:57:32"); @@ -23,11 +23,11 @@ var_dump( date_timezone_get($datetime, $extra_arg) ); echo "\n-- Testing date_timezone_get() function with an invalid values for \$object argument --\n"; $invalid_obj = new stdClass(); -var_dump( date_timezone_get($invalid_obj) ); +var_dump( date_timezone_get($invalid_obj) ); $invalid_obj = 10; var_dump( date_timezone_get($invalid_obj) ); $invalid_obj = null; -var_dump( date_timezone_get($invalid_obj) ); +var_dump( date_timezone_get($invalid_obj) ); ?> ===DONE=== --EXPECTF-- diff --git a/ext/date/tests/date_timezone_get_variation1.phpt b/ext/date/tests/date_timezone_get_variation1.phpt index a5d6ed01ef..8dcc21b6f9 100644 --- a/ext/date/tests/date_timezone_get_variation1.phpt +++ b/ext/date/tests/date_timezone_get_variation1.phpt @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_timezone_set_error.phpt b/ext/date/tests/date_timezone_set_error.phpt index 3ceebf7382..a4ebdf0aad 100644 --- a/ext/date/tests/date_timezone_set_error.phpt +++ b/ext/date/tests/date_timezone_set_error.phpt @@ -7,17 +7,17 @@ Test date_timezone_set() function : error conditions * Source code: ext/date/php_date.c * Alias to functions: DateTime::setTimezone */ - + date_default_timezone_set("UTC"); echo "*** Testing date_timezone_set() : error conditions ***\n"; echo "\n-- Testing date_timezone_set() function with zero arguments --\n"; -var_dump( date_timezone_set() ); +var_dump( date_timezone_set() ); echo "\n-- Testing date_timezone_set() function with less than expected no. of arguments --\n"; $datetime = date_create("2009-01-30 17:57:32"); -var_dump( date_timezone_set($datetime) ); +var_dump( date_timezone_set($datetime) ); echo "\n-- Testing date_timezone_set() function with more than expected no. of arguments --\n"; $timezone = timezone_open("GMT"); @@ -26,11 +26,11 @@ var_dump( date_timezone_set($datetime, $timezone, $extra_arg) ); echo "\n-- Testing date_timezone_set() function with an invalid values for \$object argument --\n"; $invalid_obj = new stdClass(); -var_dump( date_timezone_set($invalid_obj, $timezone) ); +var_dump( date_timezone_set($invalid_obj, $timezone) ); $invalid_obj = 10; var_dump( date_timezone_set($invalid_obj, $timezone) ); $invalid_obj = null; -var_dump( date_timezone_set($invalid_obj, $timezone) ); +var_dump( date_timezone_set($invalid_obj, $timezone) ); ?> ===DONE=== --EXPECTF-- diff --git a/ext/date/tests/date_timezone_set_variation1.phpt b/ext/date/tests/date_timezone_set_variation1.phpt index f0071328d3..7b2407f830 100644 --- a/ext/date/tests/date_timezone_set_variation1.phpt +++ b/ext/date/tests/date_timezone_set_variation1.phpt @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_timezone_set_variation2.phpt b/ext/date/tests/date_timezone_set_variation2.phpt index f32ffa3b46..d96f8dd6b7 100644 --- a/ext/date/tests/date_timezone_set_variation2.phpt +++ b/ext/date/tests/date_timezone_set_variation2.phpt @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_variation1.phpt b/ext/date/tests/date_variation1.phpt index a7193591d0..cdbb1b1793 100644 --- a/ext/date/tests/date_variation1.phpt +++ b/ext/date/tests/date_variation1.phpt @@ -89,7 +89,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_variation2.phpt b/ext/date/tests/date_variation2.phpt index 5d2535c833..a9652b4b59 100644 --- a/ext/date/tests/date_variation2.phpt +++ b/ext/date/tests/date_variation2.phpt @@ -89,7 +89,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/getdate_error.phpt b/ext/date/tests/getdate_error.phpt index 149d06695b..5b6cb369e0 100644 --- a/ext/date/tests/getdate_error.phpt +++ b/ext/date/tests/getdate_error.phpt @@ -5,7 +5,7 @@ Test getdate() function : error conditions /* Prototype : array getdate([int timestamp]) * Description: Get date/time information * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing getdate() : error conditions ***\n"; diff --git a/ext/date/tests/getdate_variation1.phpt b/ext/date/tests/getdate_variation1.phpt index c74eb4c715..ac3bfef2ea 100644 --- a/ext/date/tests/getdate_variation1.phpt +++ b/ext/date/tests/getdate_variation1.phpt @@ -5,7 +5,7 @@ Test getdate() function : usage variation - Passing unexpected values to first a /* Prototype : array getdate([int timestamp]) * Description: Get date/time information * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing getdate() : usage variation ***\n"; diff --git a/ext/date/tests/getdate_variation2.phpt b/ext/date/tests/getdate_variation2.phpt index bd3b6d5779..cb900e260f 100644 --- a/ext/date/tests/getdate_variation2.phpt +++ b/ext/date/tests/getdate_variation2.phpt @@ -5,7 +5,7 @@ Test getdate() function : usage variation - Passing octal timestamp values /* Prototype : array getdate([int timestamp]) * Description: Get date/time information * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing getdate() : usage variation ***\n"; diff --git a/ext/date/tests/getdate_variation3.phpt b/ext/date/tests/getdate_variation3.phpt index 7001237d0a..f1b9f858b1 100644 --- a/ext/date/tests/getdate_variation3.phpt +++ b/ext/date/tests/getdate_variation3.phpt @@ -5,7 +5,7 @@ Test getdate() function : usage variation - Passing hexadcimal timestamp values /* Prototype : array getdate([int timestamp]) * Description: Get date/time information * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing getdate() : usage variation ***\n"; diff --git a/ext/date/tests/getdate_variation4.phpt b/ext/date/tests/getdate_variation4.phpt index 59c1681cd7..9e4f43da62 100644 --- a/ext/date/tests/getdate_variation4.phpt +++ b/ext/date/tests/getdate_variation4.phpt @@ -5,7 +5,7 @@ Test getdate() function : usage variation - Verifyig by supplying year-wise samp /* Prototype : array getdate([int timestamp]) * Description: Get date/time information * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing getdate() : usage variation ***\n"; diff --git a/ext/date/tests/getdate_variation5.phpt b/ext/date/tests/getdate_variation5.phpt index 9cf29a2fc8..b34b5772c2 100644 --- a/ext/date/tests/getdate_variation5.phpt +++ b/ext/date/tests/getdate_variation5.phpt @@ -5,7 +5,7 @@ Test getdate() function : usage variation - Verifyig with different timezones on /* Prototype : array getdate([int timestamp]) * Description: Get date/time information * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing getdate() : usage variation ***\n"; diff --git a/ext/date/tests/getdate_variation6.phpt b/ext/date/tests/getdate_variation6.phpt index 64943ce864..e5b3e91730 100644 --- a/ext/date/tests/getdate_variation6.phpt +++ b/ext/date/tests/getdate_variation6.phpt @@ -5,7 +5,7 @@ Test getdate() function : usage variation - Passing strings containing numbers /* Prototype : array getdate([int timestamp]) * Description: Get date/time information * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing getdate() : usage variation ***\n"; diff --git a/ext/date/tests/getdate_variation7.phpt b/ext/date/tests/getdate_variation7.phpt index dcff205f68..7563292d3f 100644 --- a/ext/date/tests/getdate_variation7.phpt +++ b/ext/date/tests/getdate_variation7.phpt @@ -7,7 +7,7 @@ Test getdate() function : usage variation - Passing high positive and negative f /* Prototype : array getdate([int timestamp]) * Description: Get date/time information * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing getdate() : usage variation ***\n"; diff --git a/ext/date/tests/gettimeofday_basic.phpt b/ext/date/tests/gettimeofday_basic.phpt index fe04f015e5..5863450361 100644 --- a/ext/date/tests/gettimeofday_basic.phpt +++ b/ext/date/tests/gettimeofday_basic.phpt @@ -5,7 +5,7 @@ Test gettimeofday() function : basic functionality /* Prototype : array gettimeofday([bool get_as_float]) * Description: Returns the current time as array * Source code: ext/standard/microtime.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gettimeofday() : basic functionality ***\n"; diff --git a/ext/date/tests/gettimeofday_error.phpt b/ext/date/tests/gettimeofday_error.phpt index 558a381fe3..374ceed044 100644 --- a/ext/date/tests/gettimeofday_error.phpt +++ b/ext/date/tests/gettimeofday_error.phpt @@ -5,7 +5,7 @@ Test gettimeofday() function : error conditions /* Prototype : array gettimeofday([bool get_as_float]) * Description: Returns the current time as array * Source code: ext/standard/microtime.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gettimeofday() : error conditions ***\n"; diff --git a/ext/date/tests/gmdate_basic.phpt b/ext/date/tests/gmdate_basic.phpt index ae036cacba..731a2da21f 100644 --- a/ext/date/tests/gmdate_basic.phpt +++ b/ext/date/tests/gmdate_basic.phpt @@ -5,7 +5,7 @@ Test gmdate() function : basic functionality /* Prototype : string gmdate(string format [, long timestamp]) * Description: Format a GMT date/time * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmdate() : basic functionality ***\n"; diff --git a/ext/date/tests/gmdate_error.phpt b/ext/date/tests/gmdate_error.phpt index fbee071269..35c66306db 100644 --- a/ext/date/tests/gmdate_error.phpt +++ b/ext/date/tests/gmdate_error.phpt @@ -5,7 +5,7 @@ Test gmdate() function : error conditions /* Prototype : string gmdate(string format [, long timestamp]) * Description: Format a GMT date/time * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmdate() : error conditions ***\n"; diff --git a/ext/date/tests/gmdate_variation1.phpt b/ext/date/tests/gmdate_variation1.phpt index e2e2331958..e507dd01d7 100644 --- a/ext/date/tests/gmdate_variation1.phpt +++ b/ext/date/tests/gmdate_variation1.phpt @@ -5,7 +5,7 @@ Test gmdate() function : usage variation - Passing unexpected values to format a /* Prototype : string gmdate(string format [, long timestamp]) * Description: Format a GMT date/time * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmdate() : usage variation ***\n"; diff --git a/ext/date/tests/gmdate_variation10.phpt b/ext/date/tests/gmdate_variation10.phpt index d5298368d3..34075ed85c 100644 --- a/ext/date/tests/gmdate_variation10.phpt +++ b/ext/date/tests/gmdate_variation10.phpt @@ -5,7 +5,7 @@ Test gmdate() function : usage variation - Passing Timezone format options to fo /* Prototype : string gmdate(string format [, long timestamp]) * Description: Format a GMT date/time * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmdate() : usage variation ***\n"; diff --git a/ext/date/tests/gmdate_variation11.phpt b/ext/date/tests/gmdate_variation11.phpt index a9520907cb..167116be52 100644 --- a/ext/date/tests/gmdate_variation11.phpt +++ b/ext/date/tests/gmdate_variation11.phpt @@ -5,7 +5,7 @@ Test gmdate() function : usage variation - Passing Full Date/Time format options /* Prototype : string gmdate(string format [, long timestamp]) * Description: Format a GMT date/time * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmdate() : usage variation ***\n"; diff --git a/ext/date/tests/gmdate_variation12.phpt b/ext/date/tests/gmdate_variation12.phpt index 8f0146f384..5ef244ccd5 100644 --- a/ext/date/tests/gmdate_variation12.phpt +++ b/ext/date/tests/gmdate_variation12.phpt @@ -5,7 +5,7 @@ Test gmdate() function : usage variation - Valid and invalid range of timestamp. /* Prototype : string gmdate(string format [, long timestamp]) * Description: Format a GMT date/time * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmdate() : usage variation ***\n"; diff --git a/ext/date/tests/gmdate_variation2.phpt b/ext/date/tests/gmdate_variation2.phpt index f22c52fcd0..4c4ade7aea 100644 --- a/ext/date/tests/gmdate_variation2.phpt +++ b/ext/date/tests/gmdate_variation2.phpt @@ -5,7 +5,7 @@ Test gmdate() function : usage variation - Passing unexpected values to timestam /* Prototype : string gmdate(string format [, long timestamp]) * Description: Format a GMT date/time * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmdate() : usage variation ***\n"; diff --git a/ext/date/tests/gmdate_variation3.phpt b/ext/date/tests/gmdate_variation3.phpt index a93d6e9239..4c6c0471a2 100644 --- a/ext/date/tests/gmdate_variation3.phpt +++ b/ext/date/tests/gmdate_variation3.phpt @@ -5,7 +5,7 @@ Test gmdate() function : usage variation - Passing numeric representation of day /* Prototype : string gmdate(string format [, long timestamp]) * Description: Format a GMT date/time * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmdate() : usage variation ***\n"; diff --git a/ext/date/tests/gmdate_variation4.phpt b/ext/date/tests/gmdate_variation4.phpt index bb97b567c6..6704588924 100644 --- a/ext/date/tests/gmdate_variation4.phpt +++ b/ext/date/tests/gmdate_variation4.phpt @@ -5,7 +5,7 @@ Test gmdate() function : usage variation - Passing textual representation of day /* Prototype : string gmdate(string format [, long timestamp]) * Description: Format a GMT date/time * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmdate() : usage variation ***\n"; diff --git a/ext/date/tests/gmdate_variation5.phpt b/ext/date/tests/gmdate_variation5.phpt index d40488a692..4dd78b535a 100644 --- a/ext/date/tests/gmdate_variation5.phpt +++ b/ext/date/tests/gmdate_variation5.phpt @@ -5,7 +5,7 @@ Test gmdate() function : usage variation - Passing Week representation to format /* Prototype : string gmdate(string format [, long timestamp]) * Description: Format a GMT date/time * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmdate() : usage variation ***\n"; diff --git a/ext/date/tests/gmdate_variation6.phpt b/ext/date/tests/gmdate_variation6.phpt index f5b63a5b3f..3785cd16dc 100644 --- a/ext/date/tests/gmdate_variation6.phpt +++ b/ext/date/tests/gmdate_variation6.phpt @@ -5,7 +5,7 @@ Test gmdate() function : usage variation - Passing Month format options to forma /* Prototype : string gmdate(string format [, long timestamp]) * Description: Format a GMT date/time * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmdate() : usage variation ***\n"; diff --git a/ext/date/tests/gmdate_variation7.phpt b/ext/date/tests/gmdate_variation7.phpt index 8d9c1b0b97..1e6b32c484 100644 --- a/ext/date/tests/gmdate_variation7.phpt +++ b/ext/date/tests/gmdate_variation7.phpt @@ -5,7 +5,7 @@ Test gmdate() function : usage variation - Passing Year format options to format /* Prototype : string gmdate(string format [, long timestamp]) * Description: Format a GMT date/time * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmdate() : usage variation ***\n"; diff --git a/ext/date/tests/gmdate_variation9.phpt b/ext/date/tests/gmdate_variation9.phpt index e210557ace..74fa312419 100644 --- a/ext/date/tests/gmdate_variation9.phpt +++ b/ext/date/tests/gmdate_variation9.phpt @@ -5,7 +5,7 @@ Test gmdate() function : usage variation - Passing Time format options to format /* Prototype : string gmdate(string format [, long timestamp]) * Description: Format a GMT date/time * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmdate() : usage variation ***\n"; @@ -32,7 +32,7 @@ foreach($time_formats as $key =>$value) { echo "\n--$key--\n"; var_dump( gmdate($value) ); var_dump( gmdate($value, $timestamp) ); -} +} ?> ===DONE=== diff --git a/ext/date/tests/gmmktime_basic.phpt b/ext/date/tests/gmmktime_basic.phpt index 58777ef771..1212fe2589 100644 --- a/ext/date/tests/gmmktime_basic.phpt +++ b/ext/date/tests/gmmktime_basic.phpt @@ -5,7 +5,7 @@ Test gmmktime() function : basic functionality /* Prototype : int gmmktime([int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]]) * Description: Get UNIX timestamp for a GMT date * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmmktime() : basic functionality ***\n"; diff --git a/ext/date/tests/gmmktime_error.phpt b/ext/date/tests/gmmktime_error.phpt index 62e62057ea..88698e3543 100644 --- a/ext/date/tests/gmmktime_error.phpt +++ b/ext/date/tests/gmmktime_error.phpt @@ -5,7 +5,7 @@ Test gmmktime() function : error conditions /* Prototype : int gmmktime([int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]]) * Description: Get UNIX timestamp for a GMT date * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmmktime() : error conditions ***\n"; diff --git a/ext/date/tests/gmmktime_variation1.phpt b/ext/date/tests/gmmktime_variation1.phpt index d0e4da8fce..33e03cfb81 100644 --- a/ext/date/tests/gmmktime_variation1.phpt +++ b/ext/date/tests/gmmktime_variation1.phpt @@ -5,7 +5,7 @@ Test gmmktime() function : usage variation - Passing unexpected values to first /* Prototype : int gmmktime([int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]]) * Description: Get UNIX timestamp for a GMT date * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmmktime() : usage variation ***\n"; diff --git a/ext/date/tests/gmmktime_variation2.phpt b/ext/date/tests/gmmktime_variation2.phpt index 5f77347a7e..0d1df0d62e 100644 --- a/ext/date/tests/gmmktime_variation2.phpt +++ b/ext/date/tests/gmmktime_variation2.phpt @@ -5,7 +5,7 @@ Test gmmktime() function : usage variation - Passing unexpected values to second /* Prototype : int gmmktime([int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]]) * Description: Get UNIX timestamp for a GMT date * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmmktime() : usage variation ***\n"; diff --git a/ext/date/tests/gmmktime_variation3.phpt b/ext/date/tests/gmmktime_variation3.phpt index a3878ccd01..a5cb38867e 100644 --- a/ext/date/tests/gmmktime_variation3.phpt +++ b/ext/date/tests/gmmktime_variation3.phpt @@ -5,7 +5,7 @@ Test gmmktime() function : usage variation - Passing unexpected values to third /* Prototype : int gmmktime([int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]]) * Description: Get UNIX timestamp for a GMT date * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmmktime() : usage variation ***\n"; diff --git a/ext/date/tests/gmmktime_variation4.phpt b/ext/date/tests/gmmktime_variation4.phpt index 41ae07afa1..114fca9da4 100644 --- a/ext/date/tests/gmmktime_variation4.phpt +++ b/ext/date/tests/gmmktime_variation4.phpt @@ -5,7 +5,7 @@ Test gmmktime() function : usage variation - Passing unexpected values to fourth /* Prototype : int gmmktime([int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]]) * Description: Get UNIX timestamp for a GMT date * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmmktime() : usage variation ***\n"; diff --git a/ext/date/tests/gmmktime_variation7.phpt b/ext/date/tests/gmmktime_variation7.phpt index 3d0d25a003..a7fc305923 100644 --- a/ext/date/tests/gmmktime_variation7.phpt +++ b/ext/date/tests/gmmktime_variation7.phpt @@ -5,7 +5,7 @@ Test gmmktime() function : usage variation - Checking with few optional argument /* Prototype : int gmmktime([int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]]) * Description: Get UNIX timestamp for a GMT date * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmmktime() : usage variation ***\n"; diff --git a/ext/date/tests/gmmktime_variation8.phpt b/ext/date/tests/gmmktime_variation8.phpt index dac3ecfe99..79e331fd2a 100644 --- a/ext/date/tests/gmmktime_variation8.phpt +++ b/ext/date/tests/gmmktime_variation8.phpt @@ -5,7 +5,7 @@ Test gmmktime() function : usage variation - Passing octal and hexadecimal value /* Prototype : int gmmktime([int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]]) * Description: Get UNIX timestamp for a GMT date * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmmktime() : usage variation ***\n"; diff --git a/ext/date/tests/gmmktime_variation9.phpt b/ext/date/tests/gmmktime_variation9.phpt index fa463e0d69..592c788574 100644 --- a/ext/date/tests/gmmktime_variation9.phpt +++ b/ext/date/tests/gmmktime_variation9.phpt @@ -5,7 +5,7 @@ Test gmmktime() function : usage variation - Passing positive and negative float /* Prototype : int gmmktime([int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]]) * Description: Get UNIX timestamp for a GMT date * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmmktime() : usage variation ***\n"; @@ -33,7 +33,7 @@ foreach($inputs as $key =>$value) { var_dump( gmmktime($hour, $min, $value, $mon, $day, $year) ); var_dump( gmmktime($hour, $min, $sec, $value, $day, $year) ); var_dump( gmmktime($hour, $min, $sec, $mon, $value, $value) ); -} +} ?> ===DONE=== --EXPECTREGEX-- diff --git a/ext/date/tests/gmstrftime_basic.phpt b/ext/date/tests/gmstrftime_basic.phpt index 17bad69d06..e6e3a57d90 100644 --- a/ext/date/tests/gmstrftime_basic.phpt +++ b/ext/date/tests/gmstrftime_basic.phpt @@ -5,7 +5,7 @@ Test gmstrftime() function : basic functionality /* Prototype : string gmstrftime(string format [, int timestamp]) * Description: Format a GMT/UCT time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmstrftime() : basic functionality ***\n"; diff --git a/ext/date/tests/gmstrftime_error.phpt b/ext/date/tests/gmstrftime_error.phpt index d28780fe03..78456f7d52 100644 --- a/ext/date/tests/gmstrftime_error.phpt +++ b/ext/date/tests/gmstrftime_error.phpt @@ -5,7 +5,7 @@ Test gmstrftime() function : error conditions /* Prototype : string gmstrftime(string format [, int timestamp]) * Description: Format a GMT/UCT time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmstrftime() : error conditions ***\n"; diff --git a/ext/date/tests/gmstrftime_variation1.phpt b/ext/date/tests/gmstrftime_variation1.phpt index d123fb2542..5c64035fca 100644 --- a/ext/date/tests/gmstrftime_variation1.phpt +++ b/ext/date/tests/gmstrftime_variation1.phpt @@ -5,7 +5,7 @@ Test gmstrftime() function : usage variation - Passing unexpected values to firs /* Prototype : string gmstrftime(string format [, int timestamp]) * Description: Format a GMT/UCT time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmstrftime() : usage variation ***\n"; diff --git a/ext/date/tests/gmstrftime_variation10.phpt b/ext/date/tests/gmstrftime_variation10.phpt index 0e54d846ea..55c8af88b6 100644 --- a/ext/date/tests/gmstrftime_variation10.phpt +++ b/ext/date/tests/gmstrftime_variation10.phpt @@ -11,7 +11,7 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') { /* Prototype : string gmstrftime(string format [, int timestamp]) * Description: Format a GMT/UCT time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmstrftime() : usage variation ***\n"; diff --git a/ext/date/tests/gmstrftime_variation11.phpt b/ext/date/tests/gmstrftime_variation11.phpt index d760a6d951..80a4572544 100644 --- a/ext/date/tests/gmstrftime_variation11.phpt +++ b/ext/date/tests/gmstrftime_variation11.phpt @@ -5,7 +5,7 @@ Test gmstrftime() function : usage variation - Checking month related formats wh /* Prototype : string gmstrftime(string format [, int timestamp]) * Description: Format a GMT/UCT time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmstrftime() : usage variation ***\n"; diff --git a/ext/date/tests/gmstrftime_variation12.phpt b/ext/date/tests/gmstrftime_variation12.phpt index 2c25af6e2a..7ef090a5ba 100644 --- a/ext/date/tests/gmstrftime_variation12.phpt +++ b/ext/date/tests/gmstrftime_variation12.phpt @@ -11,7 +11,7 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') { /* Prototype : string gmstrftime(string format [, int timestamp]) * Description: Format a GMT/UCT time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmstrftime() : usage variation ***\n"; diff --git a/ext/date/tests/gmstrftime_variation13.phpt b/ext/date/tests/gmstrftime_variation13.phpt index 6bc0b034c7..638ba8ee9f 100644 --- a/ext/date/tests/gmstrftime_variation13.phpt +++ b/ext/date/tests/gmstrftime_variation13.phpt @@ -5,7 +5,7 @@ Test gmstrftime() function : usage variation - Checking date related formats whi /* Prototype : string gmstrftime(string format [, int timestamp]) * Description: Format a GMT/UCT time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmstrftime() : usage variation ***\n"; diff --git a/ext/date/tests/gmstrftime_variation14.phpt b/ext/date/tests/gmstrftime_variation14.phpt index 880b4330c5..15f6f27726 100644 --- a/ext/date/tests/gmstrftime_variation14.phpt +++ b/ext/date/tests/gmstrftime_variation14.phpt @@ -11,7 +11,7 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') { /* Prototype : string gmstrftime(string format [, int timestamp]) * Description: Format a GMT/UCT time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmstrftime() : usage variation ***\n"; diff --git a/ext/date/tests/gmstrftime_variation15.phpt b/ext/date/tests/gmstrftime_variation15.phpt index d430e9fe48..d7391d544a 100644 --- a/ext/date/tests/gmstrftime_variation15.phpt +++ b/ext/date/tests/gmstrftime_variation15.phpt @@ -5,7 +5,7 @@ Test gmstrftime() function : usage variation - Checking time related formats whi /* Prototype : string gmstrftime(string format [, int timestamp]) * Description: Format a GMT/UCT time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmstrftime() : usage variation ***\n"; diff --git a/ext/date/tests/gmstrftime_variation16.phpt b/ext/date/tests/gmstrftime_variation16.phpt index fd9f809ea7..0bafab89f8 100644 --- a/ext/date/tests/gmstrftime_variation16.phpt +++ b/ext/date/tests/gmstrftime_variation16.phpt @@ -11,7 +11,7 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') { /* Prototype : string gmstrftime(string format [, int timestamp]) * Description: Format a GMT/UCT time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmstrftime() : usage variation ***\n"; diff --git a/ext/date/tests/gmstrftime_variation17.phpt b/ext/date/tests/gmstrftime_variation17.phpt index 63c331b8aa..a3c920bff6 100644 --- a/ext/date/tests/gmstrftime_variation17.phpt +++ b/ext/date/tests/gmstrftime_variation17.phpt @@ -5,7 +5,7 @@ Test gmstrftime() function : usage variation - Checking day related formats whic /* Prototype : string gmstrftime(string format [, int timestamp]) * Description: Format a GMT/UCT time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmstrftime() : usage variation ***\n"; diff --git a/ext/date/tests/gmstrftime_variation18.phpt b/ext/date/tests/gmstrftime_variation18.phpt index 7cd5948c6a..aa7182c559 100644 --- a/ext/date/tests/gmstrftime_variation18.phpt +++ b/ext/date/tests/gmstrftime_variation18.phpt @@ -11,7 +11,7 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') { /* Prototype : string gmstrftime(string format [, int timestamp]) * Description: Format a GMT/UCT time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmstrftime() : usage variation ***\n"; diff --git a/ext/date/tests/gmstrftime_variation19.phpt b/ext/date/tests/gmstrftime_variation19.phpt index 1202e2c107..1445861621 100644 --- a/ext/date/tests/gmstrftime_variation19.phpt +++ b/ext/date/tests/gmstrftime_variation19.phpt @@ -5,7 +5,7 @@ Test gmstrftime() function : usage variation - Checking newline and tab formats /* Prototype : string gmstrftime(string format [, int timestamp]) * Description: Format a GMT/UCT time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmstrftime() : usage variation ***\n"; diff --git a/ext/date/tests/gmstrftime_variation2.phpt b/ext/date/tests/gmstrftime_variation2.phpt index c29241b793..2026412ad1 100644 --- a/ext/date/tests/gmstrftime_variation2.phpt +++ b/ext/date/tests/gmstrftime_variation2.phpt @@ -11,7 +11,7 @@ if(PHP_INT_SIZE != 4 ) { /* Prototype : string gmstrftime(string format [, int timestamp]) * Description: Format a GMT/UCT time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmstrftime() : usage variation ***\n"; diff --git a/ext/date/tests/gmstrftime_variation20.phpt b/ext/date/tests/gmstrftime_variation20.phpt index a8898d8ec8..6ae77bec9f 100644 --- a/ext/date/tests/gmstrftime_variation20.phpt +++ b/ext/date/tests/gmstrftime_variation20.phpt @@ -11,7 +11,7 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') { /* Prototype : string gmstrftime(string format [, int timestamp]) * Description: Format a GMT/UCT time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmstrftime() : usage variation ***\n"; diff --git a/ext/date/tests/gmstrftime_variation21.phpt b/ext/date/tests/gmstrftime_variation21.phpt index 2bdb34999d..c787f6d700 100644 --- a/ext/date/tests/gmstrftime_variation21.phpt +++ b/ext/date/tests/gmstrftime_variation21.phpt @@ -5,7 +5,7 @@ Test gmstrftime() function : usage variation - Checking Preferred date and time /* Prototype : string gmstrftime(string format [, int timestamp]) * Description: Format a GMT/UCT time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmstrftime() : usage variation ***\n"; diff --git a/ext/date/tests/gmstrftime_variation22.phpt b/ext/date/tests/gmstrftime_variation22.phpt index d9abdce17a..158500a3c8 100644 --- a/ext/date/tests/gmstrftime_variation22.phpt +++ b/ext/date/tests/gmstrftime_variation22.phpt @@ -14,7 +14,7 @@ if (!setlocale(LC_TIME, "POSIX")) { /* Prototype : string gmstrftime(string format [, int timestamp]) * Description: Format a GMT/UCT time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmstrftime() : usage variation ***\n"; diff --git a/ext/date/tests/gmstrftime_variation3.phpt b/ext/date/tests/gmstrftime_variation3.phpt index bc05c7b4c0..f0abcd3a05 100644 --- a/ext/date/tests/gmstrftime_variation3.phpt +++ b/ext/date/tests/gmstrftime_variation3.phpt @@ -5,7 +5,7 @@ Test gmstrftime() function : usage variation - Passing week related format strin /* Prototype : string gmstrftime(string format [, int timestamp]) * Description: Format a GMT/UCT time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmstrftime() : usage variation ***\n"; diff --git a/ext/date/tests/gmstrftime_variation4.phpt b/ext/date/tests/gmstrftime_variation4.phpt index 619e633a9c..beb553a316 100644 --- a/ext/date/tests/gmstrftime_variation4.phpt +++ b/ext/date/tests/gmstrftime_variation4.phpt @@ -5,7 +5,7 @@ Test gmstrftime() function : usage variation - Passing month related format stri /* Prototype : string gmstrftime(string format [, int timestamp]) * Description: Format a GMT/UCT time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmstrftime() : usage variation ***\n"; diff --git a/ext/date/tests/gmstrftime_variation5.phpt b/ext/date/tests/gmstrftime_variation5.phpt index 95e3bd2396..e86a10db56 100644 --- a/ext/date/tests/gmstrftime_variation5.phpt +++ b/ext/date/tests/gmstrftime_variation5.phpt @@ -5,7 +5,7 @@ Test gmstrftime() function : usage variation - Passing date related format strin /* Prototype : string gmstrftime(string format [, int timestamp]) * Description: Format a GMT/UCT time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmstrftime() : usage variation ***\n"; diff --git a/ext/date/tests/gmstrftime_variation6.phpt b/ext/date/tests/gmstrftime_variation6.phpt index 92dd1ede30..beb6e26bde 100644 --- a/ext/date/tests/gmstrftime_variation6.phpt +++ b/ext/date/tests/gmstrftime_variation6.phpt @@ -5,7 +5,7 @@ Test gmstrftime() function : usage variation - Passing time related format strin /* Prototype : string gmstrftime(string format [, int timestamp]) * Description: Format a GMT/UCT time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmstrftime() : usage variation ***\n"; diff --git a/ext/date/tests/gmstrftime_variation7.phpt b/ext/date/tests/gmstrftime_variation7.phpt index dd0584b702..93882b3b5b 100644 --- a/ext/date/tests/gmstrftime_variation7.phpt +++ b/ext/date/tests/gmstrftime_variation7.phpt @@ -5,7 +5,7 @@ Test gmstrftime() function : usage variation - Passing day related format string /* Prototype : string gmstrftime(string format [, int timestamp]) * Description: Format a GMT/UCT time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmstrftime() : usage variation ***\n"; diff --git a/ext/date/tests/gmstrftime_variation8.phpt b/ext/date/tests/gmstrftime_variation8.phpt index 0d3f6b0632..941fff871a 100644 --- a/ext/date/tests/gmstrftime_variation8.phpt +++ b/ext/date/tests/gmstrftime_variation8.phpt @@ -5,7 +5,7 @@ Test gmstrftime() function : usage variation - Passing literal related strings t /* Prototype : string gmstrftime(string format [, int timestamp]) * Description: Format a GMT/UCT time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gmstrftime() : usage variation ***\n"; diff --git a/ext/date/tests/idate_basic.phpt b/ext/date/tests/idate_basic.phpt index 944f29f5b1..1e6186203c 100644 --- a/ext/date/tests/idate_basic.phpt +++ b/ext/date/tests/idate_basic.phpt @@ -5,7 +5,7 @@ Test idate() function : basic functionality /* Prototype : int idate(string format [, int timestamp]) * Description: Format a local time/date as integer * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing idate() : basic functionality ***\n"; diff --git a/ext/date/tests/idate_error.phpt b/ext/date/tests/idate_error.phpt index 7dad4606d7..4bd11fd263 100644 --- a/ext/date/tests/idate_error.phpt +++ b/ext/date/tests/idate_error.phpt @@ -5,7 +5,7 @@ Test idate() function : error conditions /* Prototype : int idate(string format [, int timestamp]) * Description: Format a local time/date as integer * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing idate() : error conditions ***\n"; diff --git a/ext/date/tests/idate_variation1.phpt b/ext/date/tests/idate_variation1.phpt index c0231a6c0c..1b8f7cf029 100644 --- a/ext/date/tests/idate_variation1.phpt +++ b/ext/date/tests/idate_variation1.phpt @@ -5,7 +5,7 @@ Test idate() function : usage variation - Passing unexpected values to first arg /* Prototype : int idate(string format [, int timestamp]) * Description: Format a local time/date as integer * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing idate() : usage variation ***\n"; diff --git a/ext/date/tests/idate_variation2.phpt b/ext/date/tests/idate_variation2.phpt index 16730bbc4b..b574996a17 100644 --- a/ext/date/tests/idate_variation2.phpt +++ b/ext/date/tests/idate_variation2.phpt @@ -5,7 +5,7 @@ Test idate() function : usage variation - Passing unexpected values to second op /* Prototype : int idate(string format [, int timestamp]) * Description: Format a local time/date as integer * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing idate() : usage variation ***\n"; diff --git a/ext/date/tests/idate_variation3.phpt b/ext/date/tests/idate_variation3.phpt index a2fa0c1a62..f90003d4a0 100644 --- a/ext/date/tests/idate_variation3.phpt +++ b/ext/date/tests/idate_variation3.phpt @@ -7,7 +7,7 @@ Test idate() function : usage variation - Passing higher positive and negetive f /* Prototype : int idate(string format [, int timestamp]) * Description: Format a local time/date as integer * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing idate() : usage variation ***\n"; @@ -23,7 +23,7 @@ var_dump( idate($format, $timestamp) ); echo "\n-- Testing idate() function with float -12.3456789000e10 to timestamp --\n"; $timestamp = -12.3456789000e10; var_dump( idate($format, $timestamp) ); - + ?> ===DONE=== --EXPECTF-- diff --git a/ext/date/tests/idate_variation4.phpt b/ext/date/tests/idate_variation4.phpt index 6aa1735dfb..83377315b2 100644 --- a/ext/date/tests/idate_variation4.phpt +++ b/ext/date/tests/idate_variation4.phpt @@ -5,7 +5,7 @@ Test idate() function : usage variation - Passing supported Date format characte /* Prototype : int idate(string format [, int timestamp]) * Description: Format a local time/date as integer * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing idate() : usage variation ***\n"; diff --git a/ext/date/tests/idate_variation5.phpt b/ext/date/tests/idate_variation5.phpt index e70509c596..7a5dc53b7e 100644 --- a/ext/date/tests/idate_variation5.phpt +++ b/ext/date/tests/idate_variation5.phpt @@ -5,7 +5,7 @@ Test idate() function : usage variation - Passing supported Time format characte /* Prototype : int idate(string format [, int timestamp]) * Description: Format a local time/date as integer * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing idate() : usage variation ***\n"; diff --git a/ext/date/tests/idate_variation6.phpt b/ext/date/tests/idate_variation6.phpt index bc02e275af..0db41293c0 100644 --- a/ext/date/tests/idate_variation6.phpt +++ b/ext/date/tests/idate_variation6.phpt @@ -5,7 +5,7 @@ Test idate() function : usage variation - Checking return of year(1 or 2 digits) /* Prototype : int idate(string format [, int timestamp]) * Description: Format a local time/date as integer * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing idate() : usage variation ***\n"; diff --git a/ext/date/tests/localtime_basic.phpt b/ext/date/tests/localtime_basic.phpt index fcfd636fb3..e36ab76ec9 100644 --- a/ext/date/tests/localtime_basic.phpt +++ b/ext/date/tests/localtime_basic.phpt @@ -6,7 +6,7 @@ Test localtime() function : basic functionality * Description: Returns the results of the C system call localtime as an associative array * if the associative_array argument is set to 1 other wise it is a regular array * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing localtime() : basic functionality ***\n"; diff --git a/ext/date/tests/localtime_error.phpt b/ext/date/tests/localtime_error.phpt index b231ed0749..9e0ebfc707 100644 --- a/ext/date/tests/localtime_error.phpt +++ b/ext/date/tests/localtime_error.phpt @@ -6,7 +6,7 @@ Test localtime() function : error conditions * Description: Returns the results of the C system call localtime as an associative array * if the associative_array argument is set to 1 other wise it is a regular array * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ //Set the default time zone diff --git a/ext/date/tests/localtime_variation1.phpt b/ext/date/tests/localtime_variation1.phpt index cc0b3a1138..4191692c65 100644 --- a/ext/date/tests/localtime_variation1.phpt +++ b/ext/date/tests/localtime_variation1.phpt @@ -6,7 +6,7 @@ Test localtime() function : usage variation - Passing unexpected values to first * Description: Returns the results of the C system call localtime as an associative array * if the associative_array argument is set to 1 other wise it is a regular array * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing localtime() : usage variation ***\n"; diff --git a/ext/date/tests/localtime_variation2.phpt b/ext/date/tests/localtime_variation2.phpt index 7e2f4a5eee..ec796e27f2 100644 --- a/ext/date/tests/localtime_variation2.phpt +++ b/ext/date/tests/localtime_variation2.phpt @@ -6,7 +6,7 @@ Test localtime() function : usage variation - Passing unexpected values to secon * Description: Returns the results of the C system call localtime as an associative array * if the associative_array argument is set to 1 other wise it is a regular array * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing localtime() : usage variation ***\n"; diff --git a/ext/date/tests/localtime_variation3.phpt b/ext/date/tests/localtime_variation3.phpt index c49cfbb949..eac15ca8e4 100644 --- a/ext/date/tests/localtime_variation3.phpt +++ b/ext/date/tests/localtime_variation3.phpt @@ -8,7 +8,7 @@ Test localtime() function : usage variation - Passing higher positive and negeti * Description: Returns the results of the C system call localtime as an associative array * if the associative_array argument is set to 1 other wise it is a regular array * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing localtime() : usage variation ***\n"; diff --git a/ext/date/tests/localtime_variation4.phpt b/ext/date/tests/localtime_variation4.phpt index 5eedb7a3f6..37afeedc48 100644 --- a/ext/date/tests/localtime_variation4.phpt +++ b/ext/date/tests/localtime_variation4.phpt @@ -6,7 +6,7 @@ Test localtime() function : usage variation - Passing octal values to timestamp. * Description: Returns the results of the C system call localtime as an associative array * if the associative_array argument is set to 1 other wise it is a regular array * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing localtime() : usage variation ***\n"; @@ -21,14 +21,14 @@ $inputs = array( 'Octal 0' => 00, 'Octal 10' => 012, 'Octal -10' => -012 -); +); foreach($inputs as $key =>$value) { echo "\n--$key--\n"; var_dump( localtime($value) ); var_dump( localtime($value, $is_associative) ); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/date/tests/localtime_variation5.phpt b/ext/date/tests/localtime_variation5.phpt index cd48a162af..7b09da4763 100644 --- a/ext/date/tests/localtime_variation5.phpt +++ b/ext/date/tests/localtime_variation5.phpt @@ -6,7 +6,7 @@ Test localtime() function : usage variation - Passing hexa decimal values to tim * Description: Returns the results of the C system call localtime as an associative array * if the associative_array argument is set to 1 other wise it is a regular array * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing localtime() : usage variation ***\n"; @@ -21,14 +21,14 @@ $inputs = array( 'Hexa-decimal 0' => 0x0, 'Hexa-decimal 10' => 0xA, 'Hexa-decimal -10' => -0XA -); +); foreach($inputs as $key =>$value) { echo "\n--$key--\n"; var_dump( localtime($value) ); var_dump( localtime($value, $is_associative) ); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/date/tests/microtime_basic.phpt b/ext/date/tests/microtime_basic.phpt index 88c4952295..a9045947cb 100644 --- a/ext/date/tests/microtime_basic.phpt +++ b/ext/date/tests/microtime_basic.phpt @@ -2,10 +2,10 @@ Test return type and value for expected input microtime() --FILE-- <?php -/* +/* * proto mixed microtime([bool get_as_float]) * Function is implemented in ext/standard/microtime.c -*/ +*/ var_dump(microtime()); var_dump(microtime(true)); diff --git a/ext/date/tests/microtime_error.phpt b/ext/date/tests/microtime_error.phpt index c5a45e9abd..201456b8c0 100644 --- a/ext/date/tests/microtime_error.phpt +++ b/ext/date/tests/microtime_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for microtime() --FILE-- <?php -/* +/* * proto mixed microtime([bool get_as_float]) * Function is implemented in ext/standard/microtime.c -*/ +*/ $opt_arg_0 = true; $extra_arg = 1; diff --git a/ext/date/tests/mktime-1.phpt b/ext/date/tests/mktime-1.phpt index 86723e01ac..0b98de492e 100644 --- a/ext/date/tests/mktime-1.phpt +++ b/ext/date/tests/mktime-1.phpt @@ -3,7 +3,7 @@ Check for mktime with out-of-range parameters --INI-- error_reporting=E_ALL --FILE-- -<?php +<?php date_default_timezone_set("Europe/Amsterdam"); # MacOS/X libc implementation doesn't treat out-of-range values diff --git a/ext/date/tests/mktime_basic1.phpt b/ext/date/tests/mktime_basic1.phpt index ad95f138fc..c7ac013c6e 100644 --- a/ext/date/tests/mktime_basic1.phpt +++ b/ext/date/tests/mktime_basic1.phpt @@ -5,7 +5,7 @@ Test mktime() function : basic functionality /* Prototype : int mktime ([ int $hour= date("H") [, int $minute= date("i") [, int $second= date("s") [, int $month= date("n") [, int $day= date("j") [, int $year= date("Y") [, int $is_dst= -1 ]]]]]]] ) * Description: Get Unix timestamp for a date * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ //Set the default time zone diff --git a/ext/date/tests/mktime_error.phpt b/ext/date/tests/mktime_error.phpt index c08eefe9d7..f914f823d0 100644 --- a/ext/date/tests/mktime_error.phpt +++ b/ext/date/tests/mktime_error.phpt @@ -5,7 +5,7 @@ Test mktime() function : error conditions /* Prototype : int mktime ([ int $hour= date("H") [, int $minute= date("i") [, int $second= date("s") [, int $month= date("n") [, int $day= date("j") [, int $year= date("Y") [, int $is_dst= -1 ]]]]]]] ) * Description: Get Unix timestamp for a date * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ //Set the default time zone diff --git a/ext/date/tests/mktime_variation1.phpt b/ext/date/tests/mktime_variation1.phpt index 0ccc31da40..3523155bf3 100644 --- a/ext/date/tests/mktime_variation1.phpt +++ b/ext/date/tests/mktime_variation1.phpt @@ -5,7 +5,7 @@ Test mktime() function : usage variation - Passing unexpected values to first ar /* Prototype : int mktime ([ int $hour= date("H") [, int $minute= date("i") [, int $second= date("s") [, int $month= date("n") [, int $day= date("j") [, int $year= date("Y") [, int $is_dst= -1 ]]]]]]] ) * Description: Get Unix timestamp for a date * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mktime() : usage variation - unexpected values to first argument \$hour***\n"; @@ -89,7 +89,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); @@ -100,7 +100,7 @@ $sec = 45; $month = 7; $day = 2; $year = 1963; -$is_dst = 0; +$is_dst = 0; foreach($inputs as $variation =>$hour) { echo "\n-- $variation --\n"; diff --git a/ext/date/tests/mktime_variation2.phpt b/ext/date/tests/mktime_variation2.phpt index b6957ce6dc..2c0ab35864 100644 --- a/ext/date/tests/mktime_variation2.phpt +++ b/ext/date/tests/mktime_variation2.phpt @@ -5,7 +5,7 @@ Test mktime() function : usage variation - Passing unexpected values to second a /* Prototype : int mktime ([ int $hour= date("H") [, int $minute= date("i") [, int $second= date("s") [, int $month= date("n") [, int $day= date("j") [, int $year= date("Y") [, int $is_dst= -1 ]]]]]]] ) * Description: Get Unix timestamp for a date * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mktime() : usage variation - unexpected values to second argument \$minute***\n"; @@ -89,7 +89,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/mktime_variation3.phpt b/ext/date/tests/mktime_variation3.phpt index 5ea479e801..4f1cbcc3e5 100644 --- a/ext/date/tests/mktime_variation3.phpt +++ b/ext/date/tests/mktime_variation3.phpt @@ -5,7 +5,7 @@ Test mktime() function : usage variation - Passing unexpected values to third ar /* Prototype : int mktime ([ int $hour= date("H") [, int $minute= date("i") [, int $second= date("s") [, int $month= date("n") [, int $day= date("j") [, int $year= date("Y") [, int $is_dst= -1 ]]]]]]] ) * Description: Get Unix timestamp for a date * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mktime() : usage variation - unexpected values to third argument \$second***\n"; @@ -89,7 +89,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/mktime_variation4.phpt b/ext/date/tests/mktime_variation4.phpt index af6bc1f29c..1a398d090e 100644 --- a/ext/date/tests/mktime_variation4.phpt +++ b/ext/date/tests/mktime_variation4.phpt @@ -5,7 +5,7 @@ Test mktime() function : usage variation - Passing unexpected values to forth ar /* Prototype : int mktime ([ int $hour= date("H") [, int $minute= date("i") [, int $second= date("s") [, int $month= date("n") [, int $day= date("j") [, int $year= date("Y") [, int $is_dst= -1 ]]]]]]] ) * Description: Get Unix timestamp for a date * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mktime() : usage variation - unexpected values to forth argument \$month***\n"; @@ -89,7 +89,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/mktime_variation5.phpt b/ext/date/tests/mktime_variation5.phpt index 9fbf70b907..81fcb2c44a 100644 --- a/ext/date/tests/mktime_variation5.phpt +++ b/ext/date/tests/mktime_variation5.phpt @@ -5,7 +5,7 @@ Test mktime() function : usage variation - Passing unexpected values to fifth ar /* Prototype : int mktime ([ int $hour= date("H") [, int $minute= date("i") [, int $second= date("s") [, int $month= date("n") [, int $day= date("j") [, int $year= date("Y") [, int $is_dst= -1 ]]]]]]] ) * Description: Get Unix timestamp for a date * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mktime() : usage variation - unexpected values to fifth argument \$day***\n"; @@ -89,7 +89,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/mktime_variation6.phpt b/ext/date/tests/mktime_variation6.phpt index 6328699b68..28c097ad8c 100644 --- a/ext/date/tests/mktime_variation6.phpt +++ b/ext/date/tests/mktime_variation6.phpt @@ -5,7 +5,7 @@ Test mktime() function : usage variation - Passing unexpected values to sixth ar /* Prototype : int mktime ([ int $hour= date("H") [, int $minute= date("i") [, int $second= date("s") [, int $month= date("n") [, int $day= date("j") [, int $year= date("Y") [, int $is_dst= -1 ]]]]]]] ) * Description: Get Unix timestamp for a date * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mktime() : usage variation - unexpected values to sixth argument \$year***\n"; @@ -89,7 +89,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/strftime_basic.phpt b/ext/date/tests/strftime_basic.phpt index 07f22af823..ddc02dc612 100644 --- a/ext/date/tests/strftime_basic.phpt +++ b/ext/date/tests/strftime_basic.phpt @@ -5,7 +5,7 @@ Test strftime() function : basic functionality /* Prototype : string strftime(string format [, int timestamp]) * Description: Format a local time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strftime() : basic functionality ***\n"; diff --git a/ext/date/tests/strftime_error.phpt b/ext/date/tests/strftime_error.phpt index 19663798e3..427fdd339f 100644 --- a/ext/date/tests/strftime_error.phpt +++ b/ext/date/tests/strftime_error.phpt @@ -5,7 +5,7 @@ Test strftime() function : error conditions /* Prototype : string strftime(string format [, int timestamp]) * Description: Format a local time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strftime() : error conditions ***\n"; diff --git a/ext/date/tests/strftime_variation1.phpt b/ext/date/tests/strftime_variation1.phpt index 04b4819fe5..f76b06f8d7 100644 --- a/ext/date/tests/strftime_variation1.phpt +++ b/ext/date/tests/strftime_variation1.phpt @@ -5,7 +5,7 @@ Test strftime() function : usage variation - Passing unexpected values to first /* Prototype : string strftime(string format [, int timestamp]) * Description: Format a local time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strftime() : usage variation ***\n"; diff --git a/ext/date/tests/strftime_variation10.phpt b/ext/date/tests/strftime_variation10.phpt index 7d2a1b8fcd..d37f68e3fe 100644 --- a/ext/date/tests/strftime_variation10.phpt +++ b/ext/date/tests/strftime_variation10.phpt @@ -11,7 +11,7 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') { /* Prototype : string strftime(string format [, int timestamp]) * Description: Format a local time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strftime() : usage variation ***\n"; @@ -33,7 +33,7 @@ foreach($inputs as $key =>$value) { echo "\n--$key--\n"; var_dump( strftime($value) ); var_dump( strftime($value, $timestamp) ); -} +} ?> ===DONE=== diff --git a/ext/date/tests/strftime_variation11.phpt b/ext/date/tests/strftime_variation11.phpt index 95d2d6aaa9..bec1603cc9 100644 --- a/ext/date/tests/strftime_variation11.phpt +++ b/ext/date/tests/strftime_variation11.phpt @@ -5,7 +5,7 @@ Test strftime() function : usage variation - Checking month related formats whic /* Prototype : string strftime(string format [, int timestamp]) * Description: Format a local time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strftime() : usage variation ***\n"; diff --git a/ext/date/tests/strftime_variation12.phpt b/ext/date/tests/strftime_variation12.phpt index b798f428f6..8bd12f442f 100644 --- a/ext/date/tests/strftime_variation12.phpt +++ b/ext/date/tests/strftime_variation12.phpt @@ -11,7 +11,7 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') { /* Prototype : string strftime(string format [, int timestamp]) * Description: Format a local time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strftime() : usage variation ***\n"; diff --git a/ext/date/tests/strftime_variation13.phpt b/ext/date/tests/strftime_variation13.phpt index 4e0385fd71..4e39c4c7b9 100644 --- a/ext/date/tests/strftime_variation13.phpt +++ b/ext/date/tests/strftime_variation13.phpt @@ -5,7 +5,7 @@ Test strftime() function : usage variation - Checking date related formats which /* Prototype : string strftime(string format [, int timestamp]) * Description: Format a local time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strftime() : usage variation ***\n"; @@ -29,7 +29,7 @@ foreach($inputs as $key =>$value) { echo "\n--$key--\n"; var_dump( strftime($value) ); var_dump( strftime($value, $timestamp) ); -} +} ?> ===DONE=== diff --git a/ext/date/tests/strftime_variation14.phpt b/ext/date/tests/strftime_variation14.phpt index 7ccb7d283d..b7cbf18db3 100644 --- a/ext/date/tests/strftime_variation14.phpt +++ b/ext/date/tests/strftime_variation14.phpt @@ -11,7 +11,7 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') { /* Prototype : string strftime(string format [, int timestamp]) * Description: Format a local time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strftime() : usage variation ***\n"; @@ -35,7 +35,7 @@ foreach($inputs as $key =>$value) { echo "\n--$key--\n"; var_dump( strftime($value) ); var_dump( strftime($value, $timestamp) ); -} +} ?> ===DONE=== diff --git a/ext/date/tests/strftime_variation15.phpt b/ext/date/tests/strftime_variation15.phpt index 8bfc07ddff..fe2b981f23 100644 --- a/ext/date/tests/strftime_variation15.phpt +++ b/ext/date/tests/strftime_variation15.phpt @@ -5,7 +5,7 @@ Test strftime() function : usage variation - Checking time related formats which /* Prototype : string strftime(string format [, int timestamp]) * Description: Format a local time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strftime() : usage variation ***\n"; @@ -28,7 +28,7 @@ foreach($inputs as $key =>$value) { echo "\n--$key--\n"; var_dump( strftime($value) ); var_dump( strftime($value, $timestamp) ); -} +} ?> ===DONE=== diff --git a/ext/date/tests/strftime_variation16.phpt b/ext/date/tests/strftime_variation16.phpt index 5103b3add8..a3c4858ed4 100644 --- a/ext/date/tests/strftime_variation16.phpt +++ b/ext/date/tests/strftime_variation16.phpt @@ -11,7 +11,7 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') { /* Prototype : string strftime(string format [, int timestamp]) * Description: Format a local time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strftime() : usage variation ***\n"; @@ -34,7 +34,7 @@ foreach($inputs as $key =>$value) { echo "\n--$key--\n"; var_dump( strftime($value) ); var_dump( strftime($value, $timestamp) ); -} +} ?> ===DONE=== diff --git a/ext/date/tests/strftime_variation17.phpt b/ext/date/tests/strftime_variation17.phpt index 99acdacbb4..fb42aeaab8 100644 --- a/ext/date/tests/strftime_variation17.phpt +++ b/ext/date/tests/strftime_variation17.phpt @@ -5,7 +5,7 @@ Test strftime() function : usage variation - Checking day related formats which /* Prototype : string strftime(string format [, int timestamp]) * Description: Format a local time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strftime() : usage variation ***\n"; diff --git a/ext/date/tests/strftime_variation18.phpt b/ext/date/tests/strftime_variation18.phpt index 4340325dfa..f181492a18 100644 --- a/ext/date/tests/strftime_variation18.phpt +++ b/ext/date/tests/strftime_variation18.phpt @@ -11,7 +11,7 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') { /* Prototype : string strftime(string format [, int timestamp]) * Description: Format a local time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strftime() : usage variation ***\n"; diff --git a/ext/date/tests/strftime_variation19.phpt b/ext/date/tests/strftime_variation19.phpt index 7989e01c7d..ae54251f8f 100644 --- a/ext/date/tests/strftime_variation19.phpt +++ b/ext/date/tests/strftime_variation19.phpt @@ -5,7 +5,7 @@ Test strftime() function : usage variation - Checking newline and tab formats wh /* Prototype : string strftime(string format [, int timestamp]) * Description: Format a local time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strftime() : usage variation ***\n"; @@ -27,7 +27,7 @@ foreach($inputs as $key =>$value) { echo "\n--$key--\n"; var_dump( strftime($value) ); var_dump( strftime($value, $timestamp) ); -} +} ?> ===DONE=== diff --git a/ext/date/tests/strftime_variation2.phpt b/ext/date/tests/strftime_variation2.phpt index ac76225eb3..cb5ecd605a 100644 --- a/ext/date/tests/strftime_variation2.phpt +++ b/ext/date/tests/strftime_variation2.phpt @@ -5,7 +5,7 @@ Test strftime() function : usage variation - Passing unexpected values to second /* Prototype : string strftime(string format [, int timestamp]) * Description: Format a local time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strftime() : usage variation ***\n"; diff --git a/ext/date/tests/strftime_variation20.phpt b/ext/date/tests/strftime_variation20.phpt index 336c6d2afb..0f452d7bce 100644 --- a/ext/date/tests/strftime_variation20.phpt +++ b/ext/date/tests/strftime_variation20.phpt @@ -11,7 +11,7 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') { /* Prototype : string strftime(string format [, int timestamp]) * Description: Format a local time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strftime() : usage variation ***\n"; @@ -33,7 +33,7 @@ foreach($inputs as $key =>$value) { echo "\n--$key--\n"; var_dump( strftime($value) ); var_dump( strftime($value, $timestamp) ); -} +} ?> ===DONE=== diff --git a/ext/date/tests/strftime_variation21.phpt b/ext/date/tests/strftime_variation21.phpt index 3cdc3b6995..e6bff7ce17 100644 --- a/ext/date/tests/strftime_variation21.phpt +++ b/ext/date/tests/strftime_variation21.phpt @@ -5,7 +5,7 @@ Test strftime() function : usage variation - Checking Preferred date and time re /* Prototype : string strftime(string format [, int timestamp]) * Description: Format a local time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strftime() : usage variation ***\n"; @@ -28,7 +28,7 @@ foreach($inputs as $key =>$value) { echo "\n--$key--\n"; var_dump( strftime($value) ); var_dump( strftime($value, $timestamp) ); -} +} ?> ===DONE=== diff --git a/ext/date/tests/strftime_variation22.phpt b/ext/date/tests/strftime_variation22.phpt index 7b72ca51e1..5438d1ed5b 100644 --- a/ext/date/tests/strftime_variation22.phpt +++ b/ext/date/tests/strftime_variation22.phpt @@ -14,7 +14,7 @@ if(!setlocale(LC_ALL, "POSIX")) { /* Prototype : string strftime(string format [, int timestamp]) * Description: Format a local time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strftime() : usage variation ***\n"; @@ -38,7 +38,7 @@ foreach($inputs as $key =>$value) { echo "\n--$key--\n"; var_dump( $value ); var_dump( strftime($value, $timestamp) ); -} +} ?> ===DONE=== diff --git a/ext/date/tests/strftime_variation23.phpt b/ext/date/tests/strftime_variation23.phpt index 58b266c20f..2cb7ec6727 100644 --- a/ext/date/tests/strftime_variation23.phpt +++ b/ext/date/tests/strftime_variation23.phpt @@ -7,7 +7,7 @@ Test strftime() function : usage variation - Checking large positive and negativ /* Prototype : string strftime(string format [, int timestamp]) * Description: Format a local time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strftime() : usage variation ***\n"; diff --git a/ext/date/tests/strftime_variation3.phpt b/ext/date/tests/strftime_variation3.phpt index 342cb76925..1e6938a360 100644 --- a/ext/date/tests/strftime_variation3.phpt +++ b/ext/date/tests/strftime_variation3.phpt @@ -5,7 +5,7 @@ Test strftime() function : usage variation - Passing week related format strings /* Prototype : string strftime(string format [, int timestamp]) * Description: Format a local time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strftime() : usage variation ***\n"; diff --git a/ext/date/tests/strftime_variation4.phpt b/ext/date/tests/strftime_variation4.phpt index 6236dd9e7f..366853ee41 100644 --- a/ext/date/tests/strftime_variation4.phpt +++ b/ext/date/tests/strftime_variation4.phpt @@ -5,7 +5,7 @@ Test strftime() function : usage variation - Passing month related format string /* Prototype : string strftime(string format [, int timestamp]) * Description: Format a local time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strftime() : usage variation ***\n"; diff --git a/ext/date/tests/strftime_variation5.phpt b/ext/date/tests/strftime_variation5.phpt index 90f4e37ba3..2f9180202d 100644 --- a/ext/date/tests/strftime_variation5.phpt +++ b/ext/date/tests/strftime_variation5.phpt @@ -5,7 +5,7 @@ Test strftime() function : usage variation - Passing date related format strings /* Prototype : string strftime(string format [, int timestamp]) * Description: Format a local time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strftime() : usage variation ***\n"; diff --git a/ext/date/tests/strftime_variation6.phpt b/ext/date/tests/strftime_variation6.phpt index 6713a198e9..28acdeb933 100644 --- a/ext/date/tests/strftime_variation6.phpt +++ b/ext/date/tests/strftime_variation6.phpt @@ -5,7 +5,7 @@ Test strftime() function : usage variation - Passing time related format strings /* Prototype : string strftime(string format [, int timestamp]) * Description: Format a local time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strftime() : usage variation ***\n"; diff --git a/ext/date/tests/strftime_variation7.phpt b/ext/date/tests/strftime_variation7.phpt index 67fd416ac0..3a6fcc980d 100644 --- a/ext/date/tests/strftime_variation7.phpt +++ b/ext/date/tests/strftime_variation7.phpt @@ -5,7 +5,7 @@ Test strftime() function : usage variation - Passing day related format strings /* Prototype : string strftime(string format [, int timestamp]) * Description: Format a local time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strftime() : usage variation ***\n"; diff --git a/ext/date/tests/strftime_variation8.phpt b/ext/date/tests/strftime_variation8.phpt index 2dd50931e6..8d6b69ca67 100644 --- a/ext/date/tests/strftime_variation8.phpt +++ b/ext/date/tests/strftime_variation8.phpt @@ -5,7 +5,7 @@ Test strftime() function : usage variation - Passing literal related strings to /* Prototype : string strftime(string format [, int timestamp]) * Description: Format a local time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strftime() : usage variation ***\n"; diff --git a/ext/date/tests/strftime_variation9.phpt b/ext/date/tests/strftime_variation9.phpt index 6318282253..c8506b17db 100644 --- a/ext/date/tests/strftime_variation9.phpt +++ b/ext/date/tests/strftime_variation9.phpt @@ -5,7 +5,7 @@ Test strftime() function : usage variation - Checking week related formats which /* Prototype : string strftime(string format [, int timestamp]) * Description: Format a local time/date according to locale settings * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strftime() : usage variation ***\n"; @@ -27,7 +27,7 @@ foreach($inputs as $key =>$value) { echo "\n--$key--\n"; var_dump( strftime($value) ); var_dump( strftime($value, $timestamp) ); -} +} ?> ===DONE=== diff --git a/ext/date/tests/strtotime-relative.phpt b/ext/date/tests/strtotime-relative.phpt index 769cd2ec2e..293223bb2d 100644 --- a/ext/date/tests/strtotime-relative.phpt +++ b/ext/date/tests/strtotime-relative.phpt @@ -14,28 +14,28 @@ $offsets = array( '86400 seconds', '86401 seconds', '112913 seconds', - + // offset around 7 days '134 hours', '167 hours', '168 hours', '169 hours', '183 hours', - + // offset around 6 months '178 days', '179 days', '180 days', '183 days', '184 days', - + // offset around 10 years '115 months', '119 months', '120 months', '121 months', '128 months', - + // offset around 25 years (can't do much more reliably with strtotime) '24 years', '25 years', @@ -46,7 +46,7 @@ foreach ($offsets AS $offset) { foreach (array('+', '-') AS $direction) { echo "$direction$offset: " . date(DATE_ISO8601, strtotime("$direction$offset", $base_time)) . "\n"; } -} +} ?> --EXPECT-- diff --git a/ext/date/tests/strtotime_basic.phpt b/ext/date/tests/strtotime_basic.phpt index b2d971c785..a476611f29 100644 --- a/ext/date/tests/strtotime_basic.phpt +++ b/ext/date/tests/strtotime_basic.phpt @@ -10,7 +10,7 @@ date_default_timezone_set('UTC'); /* * This is parsed as the "first following Monday OR the current day if it is a Monday" - */ + */ var_dump(date('Y-m-d', strtotime('1 Monday December 2008'))); /* * This is parsed as the "second following Monday OR the first following @@ -24,15 +24,15 @@ var_dump(date('Y-m-d', strtotime('2 Monday December 2008'))); var_dump(date('Y-m-d', strtotime('3 Monday December 2008'))); /* * This is parsed as the "first following Monday after the first Monday in December" - */ + */ var_dump(date('Y-m-d', strtotime('first Monday December 2008'))); /* * This is parsed as the "second following Monday after the first Monday in December" - */ + */ var_dump(date('Y-m-d', strtotime('second Monday December 2008'))); /* * This is parsed as the "third following Monday after the first Monday in December" - */ + */ var_dump(date('Y-m-d', strtotime('third Monday December 2008'))); ?> --EXPECT-- diff --git a/ext/date/tests/sunfuncts.phpt b/ext/date/tests/sunfuncts.phpt index 8309b69c51..672b3affe2 100644 --- a/ext/date/tests/sunfuncts.phpt +++ b/ext/date/tests/sunfuncts.phpt @@ -9,7 +9,7 @@ for($a=1;$a<=12;$a++){ echo date_sunrise(mktime(1,1,1,$a,1,2003),SUNFUNCS_RET_TIMESTAMP,31.76670,35.23330,90.83,2)." "; echo date_sunrise(mktime(1,1,1,$a,1,2003),SUNFUNCS_RET_STRING,31.76670,35.23330,90.83,2)." "; echo date_sunrise(mktime(1,1,1,$a,1,2003),SUNFUNCS_RET_DOUBLE,31.76670,35.23330,90.83,2)."\n"; - + echo date_sunset(mktime(1,1,1,$a,1,2003),SUNFUNCS_RET_TIMESTAMP,31.76670,35.23330,90.83,2)." "; echo date_sunset(mktime(1,1,1,$a,1,2003),SUNFUNCS_RET_STRING,31.76670,35.23330,90.83,2)." "; echo date_sunset(mktime(1,1,1,$a,1,2003),SUNFUNCS_RET_DOUBLE,31.76670,35.23330,90.83,2)."\n"; diff --git a/ext/date/tests/time_basic.phpt b/ext/date/tests/time_basic.phpt index 116c0a4175..7b93e9dac2 100644 --- a/ext/date/tests/time_basic.phpt +++ b/ext/date/tests/time_basic.phpt @@ -2,10 +2,10 @@ Test return type and value for expected input time() --FILE-- <?php -/* +/* * proto int time(void) * Function is implemented in ext/date/php_date.c -*/ +*/ var_dump(time()); diff --git a/ext/date/tests/time_error.phpt b/ext/date/tests/time_error.phpt index b1d136feb2..30ba99d12c 100644 --- a/ext/date/tests/time_error.phpt +++ b/ext/date/tests/time_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for time() --FILE-- <?php -/* +/* * proto int time(void) * Function is implemented in ext/date/php_date.c -*/ +*/ // Extra arguments are ignored $extra_arg = 1; diff --git a/ext/date/tests/timezone-configuration.phpt b/ext/date/tests/timezone-configuration.phpt index c70d6456d0..b395853033 100644 --- a/ext/date/tests/timezone-configuration.phpt +++ b/ext/date/tests/timezone-configuration.phpt @@ -1,6 +1,6 @@ --TEST-- timezone configuration [1] ---INI-- +--INI-- date.timezone=GMT --FILE-- <?php diff --git a/ext/date/tests/timezone_abbreviations_list_basic1.phpt b/ext/date/tests/timezone_abbreviations_list_basic1.phpt index 3c9ea1204c..0fbbc95bc6 100644 --- a/ext/date/tests/timezone_abbreviations_list_basic1.phpt +++ b/ext/date/tests/timezone_abbreviations_list_basic1.phpt @@ -19,7 +19,7 @@ var_dump( gettype($abbr) ); var_dump( count($abbr) ); echo "\n-- Format a sample entry --\n"; -var_dump( $abbr["acst"] ); +var_dump( $abbr["acst"] ); ?> ===DONE=== diff --git a/ext/date/tests/timezone_name_from_abbr_basic1.phpt b/ext/date/tests/timezone_name_from_abbr_basic1.phpt index 1a7ea5e4cf..f7745cb73f 100644 --- a/ext/date/tests/timezone_name_from_abbr_basic1.phpt +++ b/ext/date/tests/timezone_name_from_abbr_basic1.phpt @@ -5,7 +5,7 @@ Test timezone_name_from_abbr() function : basic functionality /* Prototype : string timezone_name_from_abbr ( string $abbr [, int $gmtOffset= -1 [, int $isdst= -1 ]] ) * Description: Returns the timezone name from abbrevation * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing timezone_name_from_abbr() : basic functionality ***\n"; @@ -13,7 +13,7 @@ echo "*** Testing timezone_name_from_abbr() : basic functionality ***\n"; //Set the default time zone date_default_timezone_set("Europe/London"); -echo "-- Tests with special cases first - no lookup needed --\n"; +echo "-- Tests with special cases first - no lookup needed --\n"; var_dump( timezone_name_from_abbr("GMT") ); var_dump( timezone_name_from_abbr("UTC") ); @@ -21,17 +21,17 @@ echo "-- Lookup with just name --\n"; var_dump( timezone_name_from_abbr("CET") ); var_dump( timezone_name_from_abbr("EDT") ); -echo "-- Lookup with name and offset--\n"; +echo "-- Lookup with name and offset--\n"; var_dump( timezone_name_from_abbr("ADT", -10800) ); var_dump( timezone_name_from_abbr("ADT", 14400) ); -echo "-- Tests without valid name - uses gmtOffset and isdst to find match --\n"; +echo "-- Tests without valid name - uses gmtOffset and isdst to find match --\n"; var_dump( timezone_name_from_abbr("", 3600, 1) ); var_dump( timezone_name_from_abbr("FOO", -7200, 1) ); var_dump( timezone_name_from_abbr("", -14400, 1) ); var_dump( timezone_name_from_abbr("", -14400, 0) ); -echo "-- Tests with invalid offsets --\n"; +echo "-- Tests with invalid offsets --\n"; var_dump( timezone_name_from_abbr("", 5400) ); // offset = 1.5 hrs var_dump( timezone_name_from_abbr("", 62400) ); // offset = 24 hrs ?> diff --git a/ext/date/tests/timezone_name_from_abbr_error.phpt b/ext/date/tests/timezone_name_from_abbr_error.phpt index 866cef5996..2bb16e5cb6 100644 --- a/ext/date/tests/timezone_name_from_abbr_error.phpt +++ b/ext/date/tests/timezone_name_from_abbr_error.phpt @@ -5,7 +5,7 @@ Test timezone_name_from_abbr() function : error conditions /* Prototype : string timezone_name_from_abbr ( string $abbr [, int $gmtOffset= -1 [, int $isdst= -1 ]] ) * Description: Returns the timezone name from abbrevation * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ //Set the default time zone diff --git a/ext/date/tests/timezone_name_from_abbr_variation1.phpt b/ext/date/tests/timezone_name_from_abbr_variation1.phpt index 4825d09f5b..63653a9606 100644 --- a/ext/date/tests/timezone_name_from_abbr_variation1.phpt +++ b/ext/date/tests/timezone_name_from_abbr_variation1.phpt @@ -5,7 +5,7 @@ Test timezone_name_from_abbr() function : usage variation - Passing unexpected v /* Prototype : string timezone_name_from_abbr ( string $abbr [, int $gmtOffset= -1 [, int $isdst= -1 ]] ) * Description: Returns the timezone name from abbrevation * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing timezone_name_from_abbr() : usage variation - unexpected values to first argument \$abbr***\n"; @@ -89,7 +89,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/timezone_name_from_abbr_variation2.phpt b/ext/date/tests/timezone_name_from_abbr_variation2.phpt index a3c9a1e1e0..8c68f05a95 100644 --- a/ext/date/tests/timezone_name_from_abbr_variation2.phpt +++ b/ext/date/tests/timezone_name_from_abbr_variation2.phpt @@ -5,7 +5,7 @@ Test timezone_name_from_abbr() function : usage variation - Passing unexpected v /* Prototype : string timezone_name_from_abbr ( string $abbr [, int $gmtOffset= -1 [, int $isdst= -1 ]] ) * Description: Returns the timezone name from abbrevation * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing timezone_name_from_abbr() : usage variation - unexpected values to second argument \$gmtOffset***\n"; @@ -89,7 +89,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/timezone_name_from_abbr_variation3.phpt b/ext/date/tests/timezone_name_from_abbr_variation3.phpt index 94c38a9e82..f5b46dd10e 100644 --- a/ext/date/tests/timezone_name_from_abbr_variation3.phpt +++ b/ext/date/tests/timezone_name_from_abbr_variation3.phpt @@ -5,7 +5,7 @@ Test timezone_name_from_abbr() function : usage variation - Passing unexpected v /* Prototype : string timezone_name_from_abbr ( string $abbr [, int $gmtOffset= -1 [, int $isdst= -1 ]] ) * Description: Returns the timezone name from abbrevation * Source code: ext/date/php_date.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing timezone_name_from_abbr() : usage variation - unexpected values to third argument \$isdst***\n"; @@ -89,7 +89,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/timezone_name_get_error.phpt b/ext/date/tests/timezone_name_get_error.phpt index 185b564052..fd9763480c 100644 --- a/ext/date/tests/timezone_name_get_error.phpt +++ b/ext/date/tests/timezone_name_get_error.phpt @@ -5,16 +5,16 @@ Test timezone_name_get() function : error conditions /* Prototype : string timezone_name_get ( DateTime $object ) * Description: Returns the name of the timezone * Source code: ext/date/php_date.c - * Alias to functions: DateTimeZone::getName() + * Alias to functions: DateTimeZone::getName() */ - + // Set timezone date_default_timezone_set("Europe/London"); echo "*** Testing timezone_name_get() : error conditions ***\n"; echo "\n-- Testing timezone_name_get() function with zero arguments --\n"; -var_dump( timezone_name_get() ); +var_dump( timezone_name_get() ); echo "\n-- Testing date_timezone_set() function with more than expected no. of arguments --\n"; $datetime = date_create("2009-01-30 17:57:32"); @@ -23,11 +23,11 @@ var_dump( timezone_name_get($datetime, $extra_arg) ); echo "\n-- Testing timezone_name_get() function with an invalid values for \$object argument --\n"; $invalid_obj = new stdClass(); -var_dump( timezone_name_get($invalid_obj) ); +var_dump( timezone_name_get($invalid_obj) ); $invalid_obj = 10; var_dump( timezone_name_get($invalid_obj) ); $invalid_obj = null; -var_dump( timezone_name_get($invalid_obj) ); +var_dump( timezone_name_get($invalid_obj) ); ?> ===DONE=== --EXPECTF-- diff --git a/ext/date/tests/timezone_offset_get_variation1.phpt b/ext/date/tests/timezone_offset_get_variation1.phpt index 1aeab06c5c..d0230f8273 100644 --- a/ext/date/tests/timezone_offset_get_variation1.phpt +++ b/ext/date/tests/timezone_offset_get_variation1.phpt @@ -7,7 +7,7 @@ Test timezone_offset_get() function : usage variation - Passing unexpected value * Source code: ext/date/php_date.c * Alias to functions: DateTimeZone::getOffset() */ - + echo "*** Testing timezone_offset_get() : usage variation - unexpected values to first argument \$object***\n"; //Set the default time zone @@ -98,7 +98,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/timezone_offset_get_variation2.phpt b/ext/date/tests/timezone_offset_get_variation2.phpt index 3bb8e69823..88bb2ceb01 100644 --- a/ext/date/tests/timezone_offset_get_variation2.phpt +++ b/ext/date/tests/timezone_offset_get_variation2.phpt @@ -7,7 +7,7 @@ Test timezone_offset_get() function : usage variation - Passing unexpected value * Source code: ext/date/php_date.c * Alias to functions: DateTimeZone::getOffset() */ - + echo "*** Testing timezone_offset_get() : usage variation - unexpected values to second argument \$datetime***\n"; //Set the default time zone @@ -98,7 +98,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/timezone_open_error.phpt b/ext/date/tests/timezone_open_error.phpt index 16c5f0b09f..69c5fb7110 100644 --- a/ext/date/tests/timezone_open_error.phpt +++ b/ext/date/tests/timezone_open_error.phpt @@ -7,7 +7,7 @@ Test timezone_open() function : error conditions * Source code: ext/date/php_date.c * Alias to functions: DateTime::__construct() */ - + echo "*** Testing timezone_open() : error conditions ***\n"; echo "\n-- Testing timezone_open() function with zero arguments --\n"; diff --git a/ext/date/tests/timezone_open_variation1.phpt b/ext/date/tests/timezone_open_variation1.phpt index eb4d4b782e..acb1ada305 100644 --- a/ext/date/tests/timezone_open_variation1.phpt +++ b/ext/date/tests/timezone_open_variation1.phpt @@ -88,7 +88,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); @@ -96,7 +96,7 @@ $inputs = array( foreach($inputs as $variation =>$timezone) { echo "\n-- $variation --\n"; var_dump( timezone_open($timezone) ); - + }; // closing the resource diff --git a/ext/date/tests/timezone_transitions_get_basic1.phpt b/ext/date/tests/timezone_transitions_get_basic1.phpt index 97c5f0ccc1..a7a191df31 100644 --- a/ext/date/tests/timezone_transitions_get_basic1.phpt +++ b/ext/date/tests/timezone_transitions_get_basic1.phpt @@ -22,7 +22,7 @@ echo "\n-- Get all 60s transitions --\n"; $tran = timezone_transitions_get($tz, -306972000, -37241999); var_dump( gettype($tran) ); -echo "\n-- Total number of transitions: " . count($tran). " --\n"; +echo "\n-- Total number of transitions: " . count($tran). " --\n"; echo "\n-- Format a sample entry pfor Spring 1963 --\n"; var_dump( $tran[6] ); diff --git a/ext/date/tests/timezone_transitions_get_error.phpt b/ext/date/tests/timezone_transitions_get_error.phpt index 159c883efb..c38ba1f0d1 100644 --- a/ext/date/tests/timezone_transitions_get_error.phpt +++ b/ext/date/tests/timezone_transitions_get_error.phpt @@ -7,11 +7,11 @@ Test timezone_transitions_get() function : error conditions * Source code: ext/date/php_date.c * Alias to functions: DateTimeZone::getTransitions() */ - + //Set the default time zone date_default_timezone_set("GMT"); $tz = timezone_open("Europe/London"); - + echo "*** Testing timezone_transitions_get() : error conditions ***\n"; echo "\n-- Testing timezone_transitions_get() function with zero arguments --\n"; @@ -25,11 +25,11 @@ var_dump( timezone_transitions_get($tz, $timestamp_begin, $timestamp_end, $extra echo "\n-- Testing timezone_transitions_get() function with an invalid values for \$object argument --\n"; $invalid_obj = new stdClass(); -var_dump( timezone_transitions_get($invalid_obj) ); +var_dump( timezone_transitions_get($invalid_obj) ); $invalid_obj = 10; var_dump( timezone_transitions_get($invalid_obj) ); $invalid_obj = null; -var_dump( timezone_transitions_get($invalid_obj) ); +var_dump( timezone_transitions_get($invalid_obj) ); ?> ===DONE=== --EXPECTF-- diff --git a/ext/date/tests/timezone_transitions_get_variation1.phpt b/ext/date/tests/timezone_transitions_get_variation1.phpt index f0f8552e61..214e980e2c 100644 --- a/ext/date/tests/timezone_transitions_get_variation1.phpt +++ b/ext/date/tests/timezone_transitions_get_variation1.phpt @@ -7,7 +7,7 @@ Test timezone_transitions_get() function : usage variation - Passing unexpected * Source code: ext/date/php_date.c * Alias to functions: DateTimeZone::getTransitions() */ - + echo "*** Testing timezone_transitions_get() : usage variation - unexpected values to first argument \$object***\n"; //Set the default time zone @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/timezone_transitions_get_variation2.phpt b/ext/date/tests/timezone_transitions_get_variation2.phpt index 5c7951d502..02f9ab8483 100644 --- a/ext/date/tests/timezone_transitions_get_variation2.phpt +++ b/ext/date/tests/timezone_transitions_get_variation2.phpt @@ -7,7 +7,7 @@ Test timezone_transitions_get() function : usage variation - Passing unexpected * Source code: ext/date/php_date.c * Alias to functions: DateTimeZone::getTransitions() */ - + echo "*** Testing timezone_transitions_get() : usage variation - unexpected values to first argument \$timestamp_begin ***\n"; //Set the default time zone @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/timezone_transitions_get_variation3.phpt b/ext/date/tests/timezone_transitions_get_variation3.phpt index 975e77ff34..1e136251e3 100644 --- a/ext/date/tests/timezone_transitions_get_variation3.phpt +++ b/ext/date/tests/timezone_transitions_get_variation3.phpt @@ -7,7 +7,7 @@ Test timezone_transitions_get() function : usage variation - Passing unexpected * Source code: ext/date/php_date.c * Alias to functions: DateTimeZone::getTransitions() */ - + echo "*** Testing timezone_transitions_get() : usage variation - unexpected values to first argument \$timestamp_end ***\n"; //Set the default time zone @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/timezone_version_get.phpt b/ext/date/tests/timezone_version_get.phpt index e076004289..2c75de7ebc 100644 --- a/ext/date/tests/timezone_version_get.phpt +++ b/ext/date/tests/timezone_version_get.phpt @@ -4,7 +4,7 @@ Test the basics to function timezone_version_get(). Rodrigo Prado de Jesus <royopa [at] gmail [dot] com> --INI-- date.timezone = UTC; -date_default_timezone_set("America/Sao_Paulo"); +date_default_timezone_set("America/Sao_Paulo"); --FILE-- <?php var_dump(timezone_version_get()); diff --git a/ext/date/tests/timezone_version_get_basic1.phpt b/ext/date/tests/timezone_version_get_basic1.phpt index 27224e3d44..ae7af9af86 100644 --- a/ext/date/tests/timezone_version_get_basic1.phpt +++ b/ext/date/tests/timezone_version_get_basic1.phpt @@ -6,7 +6,7 @@ Rodrigo Wanderley de Melo Cardoso <rodrigogepem@gmail.com> --INI-- date.timezone=UTC --FILE-- -<?php $versionTimezone = timezone_version_get(); +<?php $versionTimezone = timezone_version_get(); echo $versionTimezone; ?> --EXPECTREGEX-- ^[12][0-9]{3}.[0-9]+$
\ No newline at end of file diff --git a/ext/dba/tests/bug36436.phpt b/ext/dba/tests/bug36436.phpt index 19254df3c7..40cc5283cd 100644 --- a/ext/dba/tests/bug36436.phpt +++ b/ext/dba/tests/bug36436.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #36436 (DBA problem with Berkeley DB4) --SKIPIF-- -<?php +<?php $handler = 'db4'; require_once(dirname(__FILE__) .'/skipif.inc'); ?> @@ -26,8 +26,8 @@ dba_close($db); ?> ===DONE=== --CLEAN-- -<?php - require(dirname(__FILE__) .'/clean.inc'); +<?php + require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTF-- resource(%d) of type (dba persistent) diff --git a/ext/dba/tests/bug38698.phpt b/ext/dba/tests/bug38698.phpt index 1d1ed674fe..254d3e37c6 100644 --- a/ext/dba/tests/bug38698.phpt +++ b/ext/dba/tests/bug38698.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #38698 (Bug #38698 for some keys cdbmake creates corrupted db and cdb can't read valid db) --SKIPIF-- -<?php +<?php $handler = 'cdb_make'; require_once(dirname(__FILE__) .'/skipif.inc'); ?> diff --git a/ext/dba/tests/bug48240.phpt b/ext/dba/tests/bug48240.phpt index 5a72073f36..547c7a9ccc 100644 --- a/ext/dba/tests/bug48240.phpt +++ b/ext/dba/tests/bug48240.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #48240 (DBA Segmentation fault dba_nextkey) --SKIPIF-- -<?php +<?php $handler = 'db4'; require_once(dirname(__FILE__) .'/skipif.inc'); ?> @@ -20,8 +20,8 @@ dba_close($db); ?> ===DONE=== --CLEAN-- -<?php - require(dirname(__FILE__) .'/clean.inc'); +<?php + require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECT-- bool(false) diff --git a/ext/dba/tests/bug49125.phpt b/ext/dba/tests/bug49125.phpt index e06495a109..c1ecc50846 100644 --- a/ext/dba/tests/bug49125.phpt +++ b/ext/dba/tests/bug49125.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #49125 (Error in dba_exists C code) --SKIPIF-- -<?php +<?php $handler = 'db4'; require_once(dirname(__FILE__) .'/skipif.inc'); ?> @@ -23,8 +23,8 @@ dba_close($db); ?> --CLEAN-- -<?php - require(dirname(__FILE__) .'/clean.inc'); +<?php + require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECT-- bool(true) diff --git a/ext/dba/tests/bug62490.phpt b/ext/dba/tests/bug62490.phpt index 325dd34554..41a9cdead7 100644 --- a/ext/dba/tests/bug62490.phpt +++ b/ext/dba/tests/bug62490.phpt @@ -29,7 +29,7 @@ var_dump(dba_delete("a", $dba)); ?> ===DONE=== --CLEAN-- -<?php +<?php include "clean.inc"; ?> --EXPECT-- diff --git a/ext/dba/tests/bug65708.phpt b/ext/dba/tests/bug65708.phpt index b77138f6ed..ede2511c9e 100644 --- a/ext/dba/tests/bug65708.phpt +++ b/ext/dba/tests/bug65708.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #65708 (dba functions cast $key param to string in-place, bypassing copy on write) --SKIPIF-- -<?php +<?php require_once(dirname(__FILE__) .'/skipif.inc'); ?> --FILE-- @@ -28,8 +28,8 @@ dba_close($db); ?> --CLEAN-- -<?php - require(dirname(__FILE__) .'/clean.inc'); +<?php + require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECT-- integer diff --git a/ext/dba/tests/bug72157.phpt b/ext/dba/tests/bug72157.phpt index 7b3217012a..3443f4bb40 100644 --- a/ext/dba/tests/bug72157.phpt +++ b/ext/dba/tests/bug72157.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #72157 (use-after-free caused by dba_open) --SKIPIF-- -<?php +<?php require_once(dirname(__FILE__) .'/skipif.inc'); ?> --FILE-- diff --git a/ext/dba/tests/bug72885.phpt b/ext/dba/tests/bug72885.phpt index eb6777841e..bef95fd5c8 100644 --- a/ext/dba/tests/bug72885.phpt +++ b/ext/dba/tests/bug72885.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #72885 flatfile: dba_fetch() fails to read replaced entry --SKIPIF-- -<?php +<?php $handler = "flatfile"; require_once(dirname(__FILE__) .'/skipif.inc'); ?> diff --git a/ext/dba/tests/dba001.phpt b/ext/dba/tests/dba001.phpt index b63829abbf..e5a8f58f85 100644 --- a/ext/dba/tests/dba001.phpt +++ b/ext/dba/tests/dba001.phpt @@ -1,7 +1,7 @@ --TEST-- DBA File Creation Test --SKIPIF-- -<?php +<?php require_once(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); ?> @@ -17,8 +17,8 @@ DBA File Creation Test } ?> --CLEAN-- -<?php - require(dirname(__FILE__) .'/clean.inc'); +<?php + require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTF-- database handler: %s diff --git a/ext/dba/tests/dba002.phpt b/ext/dba/tests/dba002.phpt index e60e733603..051c51b9b5 100644 --- a/ext/dba/tests/dba002.phpt +++ b/ext/dba/tests/dba002.phpt @@ -1,7 +1,7 @@ --TEST-- DBA Insert/Fetch Test --SKIPIF-- -<?php +<?php require_once(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); ?> @@ -18,8 +18,8 @@ DBA Insert/Fetch Test } ?> --CLEAN-- -<?php - require(dirname(__FILE__) .'/clean.inc'); +<?php + require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTF-- database handler: %s diff --git a/ext/dba/tests/dba003.phpt b/ext/dba/tests/dba003.phpt index a027b5356e..6d1e26bfac 100644 --- a/ext/dba/tests/dba003.phpt +++ b/ext/dba/tests/dba003.phpt @@ -1,7 +1,7 @@ --TEST-- DBA Insert/Replace/Fetch Test --SKIPIF-- -<?php +<?php require_once(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); ?> @@ -20,8 +20,8 @@ DBA Insert/Replace/Fetch Test } ?> --CLEAN-- -<?php - require(dirname(__FILE__) .'/clean.inc'); +<?php + require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTF-- database handler: %s diff --git a/ext/dba/tests/dba004.phpt b/ext/dba/tests/dba004.phpt index 6e7180cf66..69bc717ea4 100644 --- a/ext/dba/tests/dba004.phpt +++ b/ext/dba/tests/dba004.phpt @@ -1,7 +1,7 @@ --TEST-- DBA Multiple Insert/Fetch Test --SKIPIF-- -<?php +<?php require_once(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); ?> @@ -24,8 +24,8 @@ DBA Multiple Insert/Fetch Test } ?> --CLEAN-- -<?php - require(dirname(__FILE__) .'/clean.inc'); +<?php + require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTF-- database handler: %s diff --git a/ext/dba/tests/dba005.phpt b/ext/dba/tests/dba005.phpt index 68ad600220..4e43beab19 100644 --- a/ext/dba/tests/dba005.phpt +++ b/ext/dba/tests/dba005.phpt @@ -1,7 +1,7 @@ --TEST-- DBA FirstKey/NextKey Loop Test With 5 Items --SKIPIF-- -<?php +<?php require_once(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); ?> @@ -31,8 +31,8 @@ DBA FirstKey/NextKey Loop Test With 5 Items } ?> --CLEAN-- -<?php - require(dirname(__FILE__) .'/clean.inc'); +<?php + require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTF-- database handler: %s diff --git a/ext/dba/tests/dba006.phpt b/ext/dba/tests/dba006.phpt index a3fc738fac..7f359a2fd8 100644 --- a/ext/dba/tests/dba006.phpt +++ b/ext/dba/tests/dba006.phpt @@ -1,7 +1,7 @@ --TEST-- DBA FirstKey/NextKey with 2 deletes --SKIPIF-- -<?php +<?php require_once(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); ?> @@ -33,8 +33,8 @@ DBA FirstKey/NextKey with 2 deletes } ?> --CLEAN-- -<?php - require(dirname(__FILE__) .'/clean.inc'); +<?php + require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTF-- database handler: %s diff --git a/ext/dba/tests/dba007.phpt b/ext/dba/tests/dba007.phpt index 2519fdc597..fbd78212f2 100644 --- a/ext/dba/tests/dba007.phpt +++ b/ext/dba/tests/dba007.phpt @@ -1,7 +1,7 @@ --TEST-- DBA Multiple File Creation Test --SKIPIF-- -<?php +<?php require_once(dirname(__FILE__) .'/skipif.inc'); if (!function_exists('dba_list')) die('skip dba_list() not available'); die("info $HND handler used"); @@ -10,8 +10,8 @@ DBA Multiple File Creation Test <?php require_once(dirname(__FILE__) .'/test.inc'); echo "database handler: $handler\n"; - $db_file1 = $db_filename1 = dirname(__FILE__).'/test1.dbm'; - $db_file2 = $db_filename2 = dirname(__FILE__).'/test2.dbm'; + $db_file1 = $db_filename1 = dirname(__FILE__).'/test1.dbm'; + $db_file2 = $db_filename2 = dirname(__FILE__).'/test2.dbm'; if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) { echo "database file created\n"; } else { @@ -34,8 +34,8 @@ DBA Multiple File Creation Test @unlink($db_filename2); ?> --CLEAN-- -<?php - require(dirname(__FILE__) .'/clean.inc'); +<?php + require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTF-- database handler: %s diff --git a/ext/dba/tests/dba009.phpt b/ext/dba/tests/dba009.phpt index 698657b2a3..3da48b0cc7 100644 --- a/ext/dba/tests/dba009.phpt +++ b/ext/dba/tests/dba009.phpt @@ -1,7 +1,7 @@ --TEST-- DBA dba_popen Test --SKIPIF-- -<?php +<?php require_once(dirname(__FILE__) .'/skipif.inc'); print("info $HND handler used"); ?> @@ -25,8 +25,8 @@ DBA dba_popen Test } ?> --CLEAN-- -<?php - require(dirname(__FILE__) .'/clean.inc'); +<?php + require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTF-- database handler: %s diff --git a/ext/dba/tests/dba010.phpt b/ext/dba/tests/dba010.phpt index c818373f1f..d411c56adb 100644 --- a/ext/dba/tests/dba010.phpt +++ b/ext/dba/tests/dba010.phpt @@ -1,7 +1,7 @@ --TEST-- DBA with array keys --SKIPIF-- -<?php +<?php require_once(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); ?> @@ -36,8 +36,8 @@ if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) { ?> --CLEAN-- -<?php - require(dirname(__FILE__) .'/clean.inc'); +<?php + require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTF-- database handler: %s diff --git a/ext/dba/tests/dba011.phpt b/ext/dba/tests/dba011.phpt index 71164be3c5..0891a30f48 100644 --- a/ext/dba/tests/dba011.phpt +++ b/ext/dba/tests/dba011.phpt @@ -1,7 +1,7 @@ --TEST-- DBA argument tests --SKIPIF-- -<?php +<?php require_once(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); ?> @@ -17,8 +17,8 @@ var_dump(dba_open($db_file, 'nq', $handler)); var_dump(dba_open($db_file, 'n', $handler, 2, 3, 4, 5, 6, 7, 8)); ?> --CLEAN-- -<?php -require(dirname(__FILE__) .'/clean.inc'); +<?php +require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTF-- database handler: flatfile diff --git a/ext/dba/tests/dba012.phpt b/ext/dba/tests/dba012.phpt index 821c4e2aba..612d543249 100644 --- a/ext/dba/tests/dba012.phpt +++ b/ext/dba/tests/dba012.phpt @@ -1,7 +1,7 @@ --TEST-- DBA dba.default_handler tests --SKIPIF-- -<?php +<?php $handler = "flatfile"; require_once(dirname(__FILE__) .'/skipif.inc'); ?> @@ -27,8 +27,8 @@ var_dump(dba_open($db_filename, 'n')); ?> --CLEAN-- -<?php -require(dirname(__FILE__) .'/clean.inc'); +<?php +require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTF-- database handler: flatfile diff --git a/ext/dba/tests/dba013.phpt b/ext/dba/tests/dba013.phpt index 8e37b26315..661275c07d 100644 --- a/ext/dba/tests/dba013.phpt +++ b/ext/dba/tests/dba013.phpt @@ -1,7 +1,7 @@ --TEST-- DBA with array key with empty array --SKIPIF-- -<?php +<?php require_once(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); ?> @@ -18,8 +18,8 @@ if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) { ?> --CLEAN-- -<?php -require(dirname(__FILE__) .'/clean.inc'); +<?php +require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTF-- database handler: %s diff --git a/ext/dba/tests/dba014.phpt b/ext/dba/tests/dba014.phpt index f08fff25d7..799fe830a5 100644 --- a/ext/dba/tests/dba014.phpt +++ b/ext/dba/tests/dba014.phpt @@ -1,7 +1,7 @@ --TEST-- DBA with array key with array containing too many elements --SKIPIF-- -<?php +<?php require_once(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); ?> @@ -18,8 +18,8 @@ if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) { ?> --CLEAN-- -<?php -require(dirname(__FILE__) .'/clean.inc'); +<?php +require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTF-- database handler: %s diff --git a/ext/dba/tests/dba015.phpt b/ext/dba/tests/dba015.phpt index dbb683dcec..4cd0ea101a 100644 --- a/ext/dba/tests/dba015.phpt +++ b/ext/dba/tests/dba015.phpt @@ -1,7 +1,7 @@ --TEST-- DBA with persistent connections --SKIPIF-- -<?php +<?php $handler = "flatfile"; require_once(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); @@ -50,8 +50,8 @@ echo dba_fetch("key2", $db_file1), "\n"; ?> ===DONE=== --CLEAN-- -<?php - require(dirname(__FILE__) .'/clean.inc'); +<?php + require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTF-- database handler: flatfile diff --git a/ext/dba/tests/dba016.phpt b/ext/dba/tests/dba016.phpt index 7739db4e08..4b0052352a 100644 --- a/ext/dba/tests/dba016.phpt +++ b/ext/dba/tests/dba016.phpt @@ -1,7 +1,7 @@ --TEST-- DBA lock modifier error message test --SKIPIF-- -<?php +<?php $handler = "flatfile"; require_once(dirname(__FILE__) .'/skipif.inc'); ?> @@ -17,8 +17,8 @@ $db_file1 = dba_popen($db_filename, 'n-t', 'flatfile'); ?> ===DONE=== --CLEAN-- -<?php - require(dirname(__FILE__) .'/clean.inc'); +<?php + require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTF-- database handler: flatfile diff --git a/ext/dba/tests/dba_cdb.phpt b/ext/dba/tests/dba_cdb.phpt index b9ef68f2be..998fc41638 100644 --- a/ext/dba/tests/dba_cdb.phpt +++ b/ext/dba/tests/dba_cdb.phpt @@ -1,7 +1,7 @@ --TEST-- DBA CDB handler test --SKIPIF-- -<?php +<?php $handler = 'cdb'; require_once(dirname(__FILE__) .'/skipif.inc'); die('info CDB does not support replace or delete'); @@ -14,8 +14,8 @@ DBA CDB handler test ?> ===DONE=== --CLEAN-- -<?php - require(dirname(__FILE__) .'/clean.inc'); +<?php + require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECT-- database handler: cdb diff --git a/ext/dba/tests/dba_cdb_001.phpt b/ext/dba/tests/dba_cdb_001.phpt index 4372754384..a0dc438636 100644 --- a/ext/dba/tests/dba_cdb_001.phpt +++ b/ext/dba/tests/dba_cdb_001.phpt @@ -1,7 +1,7 @@ --TEST-- DBA CDB handler test --SKIPIF-- -<?php +<?php $handler = 'cdb'; require_once(dirname(__FILE__) .'/skipif.inc'); die('info CDB does not support replace or delete'); @@ -63,8 +63,8 @@ else { ?> ===DONE=== --CLEAN-- -<?php -require(dirname(__FILE__) .'/clean.inc'); +<?php +require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTF-- Test 0 diff --git a/ext/dba/tests/dba_cdb_make.phpt b/ext/dba/tests/dba_cdb_make.phpt index 6a5f2dd9c3..0a1fd79b36 100644 --- a/ext/dba/tests/dba_cdb_make.phpt +++ b/ext/dba/tests/dba_cdb_make.phpt @@ -1,7 +1,7 @@ --TEST-- DBA CDB_MAKE handler test --SKIPIF-- -<?php +<?php $handler = 'cdb_make'; require_once(dirname(__FILE__) .'/skipif.inc'); die('info CDB_MAKE does not support reading'); @@ -31,8 +31,8 @@ DBA CDB_MAKE handler test } ?> --CLEAN-- -<?php - require(dirname(__FILE__) .'/clean.inc'); +<?php + require(dirname(__FILE__) .'/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 a782a572e9..9d65f8b732 100644 --- a/ext/dba/tests/dba_cdb_read.phpt +++ b/ext/dba/tests/dba_cdb_read.phpt @@ -1,7 +1,7 @@ --TEST-- DBA CDB handler test (read only) --SKIPIF-- -<?php +<?php $handler = 'cdb_make'; require_once dirname(__FILE__) .'/skipif.inc'; ?> @@ -15,7 +15,7 @@ DBA CDB handler test (read only) $a = dba_firstkey($db_file); $count= 0; $keys = $a; - while($a) { + while($a) { $a = dba_nextkey($db_file); $keys .= $a; $count++; diff --git a/ext/dba/tests/dba_db1.phpt b/ext/dba/tests/dba_db1.phpt index d0e530e026..01d96feec5 100644 --- a/ext/dba/tests/dba_db1.phpt +++ b/ext/dba/tests/dba_db1.phpt @@ -1,7 +1,7 @@ --TEST-- DBA DB1 handler test --SKIPIF-- -<?php +<?php $handler = 'db1'; require_once dirname(__FILE__) .'/skipif.inc'; ?> diff --git a/ext/dba/tests/dba_db2.phpt b/ext/dba/tests/dba_db2.phpt index 1cfbb3e340..09fefb581e 100644 --- a/ext/dba/tests/dba_db2.phpt +++ b/ext/dba/tests/dba_db2.phpt @@ -1,7 +1,7 @@ --TEST-- DBA DB2 handler test --SKIPIF-- -<?php +<?php $handler = 'db2'; require_once dirname(__FILE__) .'/skipif.inc'; ?> diff --git a/ext/dba/tests/dba_db3.phpt b/ext/dba/tests/dba_db3.phpt index 5de7e5a041..9c78eb3726 100644 --- a/ext/dba/tests/dba_db3.phpt +++ b/ext/dba/tests/dba_db3.phpt @@ -1,7 +1,7 @@ --TEST-- DBA DB3 handler test --SKIPIF-- -<?php +<?php $handler = 'db3'; require_once dirname(__FILE__) .'/skipif.inc'; ?> diff --git a/ext/dba/tests/dba_db4_000.phpt b/ext/dba/tests/dba_db4_000.phpt index 17db4bb62d..21e4a18394 100644 --- a/ext/dba/tests/dba_db4_000.phpt +++ b/ext/dba/tests/dba_db4_000.phpt @@ -1,7 +1,7 @@ --TEST-- DBA DB4 handler test --SKIPIF-- -<?php +<?php $handler = 'db4'; require_once(dirname(__FILE__) .'/skipif.inc'); ?> @@ -13,8 +13,8 @@ require_once(dirname(__FILE__) .'/dba_handler.inc'); ?> ===DONE=== --CLEAN-- -<?php -require(dirname(__FILE__) .'/clean.inc'); +<?php +require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECT-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_001.phpt b/ext/dba/tests/dba_db4_001.phpt index 992a900532..73b5da75c3 100644 --- a/ext/dba/tests/dba_db4_001.phpt +++ b/ext/dba/tests/dba_db4_001.phpt @@ -1,7 +1,7 @@ --TEST-- DBA DB4 New File Creation open("c") & Insert Test --SKIPIF-- -<?php +<?php $handler = "db4"; require_once(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); @@ -23,8 +23,8 @@ if (($db_file = dba_open($db_filename, "c", $handler)) !== FALSE) { ?> --CLEAN-- -<?php -require(dirname(__FILE__) .'/clean.inc'); +<?php +require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECT-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_002.phpt b/ext/dba/tests/dba_db4_002.phpt index 9f08311e80..1ab3117b6e 100644 --- a/ext/dba/tests/dba_db4_002.phpt +++ b/ext/dba/tests/dba_db4_002.phpt @@ -1,7 +1,7 @@ --TEST-- DBA DB4 New File Creation open("n") & Insert Test --SKIPIF-- -<?php +<?php $handler = "db4"; require_once(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); @@ -23,8 +23,8 @@ if (($db_file = dba_open($db_filename, "n", $handler)) !== FALSE) { ?> --CLEAN-- -<?php -require(dirname(__FILE__) .'/clean.inc'); +<?php +require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECT-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_003.phpt b/ext/dba/tests/dba_db4_003.phpt index 8708170fc1..5690bd9250 100644 --- a/ext/dba/tests/dba_db4_003.phpt +++ b/ext/dba/tests/dba_db4_003.phpt @@ -1,7 +1,7 @@ --TEST-- DBA DB4 File Creation open("c") with existing file --SKIPIF-- -<?php +<?php $handler = "db4"; require_once(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); @@ -32,8 +32,8 @@ echo "$s\n"; ?> --CLEAN-- -<?php -require(dirname(__FILE__) .'/clean.inc'); +<?php +require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTF-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_004.phpt b/ext/dba/tests/dba_db4_004.phpt index 1fdb353e6e..dd89f2d062 100644 --- a/ext/dba/tests/dba_db4_004.phpt +++ b/ext/dba/tests/dba_db4_004.phpt @@ -1,7 +1,7 @@ --TEST-- DBA DB4 Truncate Existing File open("n") --SKIPIF-- -<?php +<?php $handler = "db4"; require_once(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); @@ -30,8 +30,8 @@ if (($db_file = dba_open($db_filename, "n", $handler)) !== FALSE) { ?> --CLEAN-- -<?php -require(dirname(__FILE__) .'/clean.inc'); +<?php +require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECT-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_005.phpt b/ext/dba/tests/dba_db4_005.phpt index ec5f98aed1..f0cf858e9a 100644 --- a/ext/dba/tests/dba_db4_005.phpt +++ b/ext/dba/tests/dba_db4_005.phpt @@ -1,7 +1,7 @@ --TEST-- DBA DB4 New File Creation popen("c") & Insert Test --SKIPIF-- -<?php +<?php $handler = "db4"; require_once(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); @@ -23,8 +23,8 @@ if (($db_file = dba_popen($db_filename, "c", $handler)) !== FALSE) { ?> --CLEAN-- -<?php -require(dirname(__FILE__) .'/clean.inc'); +<?php +require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECT-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_006.phpt b/ext/dba/tests/dba_db4_006.phpt index 2a80161d08..7823922a9f 100644 --- a/ext/dba/tests/dba_db4_006.phpt +++ b/ext/dba/tests/dba_db4_006.phpt @@ -1,7 +1,7 @@ --TEST-- DBA DB4 New File Creation popen("n") & Insert Test --SKIPIF-- -<?php +<?php $handler = "db4"; require_once(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); @@ -23,8 +23,8 @@ if (($db_file = dba_popen($db_filename, "n", $handler)) !== FALSE) { ?> --CLEAN-- -<?php -require(dirname(__FILE__) .'/clean.inc'); +<?php +require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECT-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_007.phpt b/ext/dba/tests/dba_db4_007.phpt index 027d0af032..193d2ed341 100644 --- a/ext/dba/tests/dba_db4_007.phpt +++ b/ext/dba/tests/dba_db4_007.phpt @@ -1,7 +1,7 @@ --TEST-- DBA DB4 File Creation popen("c") with existing invalid file --SKIPIF-- -<?php +<?php $handler = "db4"; require_once(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); @@ -28,8 +28,8 @@ if (($db_file = dba_popen($db_filename, "c", $handler)) !== FALSE) { ?> --CLEAN-- -<?php -require(dirname(__FILE__) .'/clean.inc'); +<?php +require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTF-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_008.phpt b/ext/dba/tests/dba_db4_008.phpt index 2f7d130750..e5a9467555 100644 --- a/ext/dba/tests/dba_db4_008.phpt +++ b/ext/dba/tests/dba_db4_008.phpt @@ -1,7 +1,7 @@ --TEST-- DBA DB4 Truncate Existing File popen("n") --SKIPIF-- -<?php +<?php $handler = "db4"; require_once(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); @@ -30,8 +30,8 @@ if (($db_file = dba_popen($db_filename, "n", $handler)) !== FALSE) { ?> --CLEAN-- -<?php -require(dirname(__FILE__) .'/clean.inc'); +<?php +require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECT-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_009.phpt b/ext/dba/tests/dba_db4_009.phpt index 5a870c90ed..8069c84bf8 100644 --- a/ext/dba/tests/dba_db4_009.phpt +++ b/ext/dba/tests/dba_db4_009.phpt @@ -1,7 +1,7 @@ --TEST-- DBA DB4 Multiple File Creation Test --SKIPIF-- -<?php +<?php $handler = "db4"; require_once(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); @@ -11,8 +11,8 @@ die("info $HND handler used"); $handler = "db4"; require_once(dirname(__FILE__) .'/test.inc'); echo "database handler: $handler\n"; -$db_file1 = $db_filename1 = dirname(__FILE__).'/test1.dbm'; -$db_file2 = $db_filename2 = dirname(__FILE__).'/test2.dbm'; +$db_file1 = $db_filename1 = dirname(__FILE__).'/test1.dbm'; +$db_file2 = $db_filename2 = dirname(__FILE__).'/test2.dbm'; if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) { echo "database file created\n"; } else { @@ -35,8 +35,8 @@ dba_close($db_file); @unlink($db_filename2); ?> --CLEAN-- -<?php -require(dirname(__FILE__) .'/clean.inc'); +<?php +require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTF-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_011.phpt b/ext/dba/tests/dba_db4_011.phpt index e42e03b7e9..cdd57bc5ca 100644 --- a/ext/dba/tests/dba_db4_011.phpt +++ b/ext/dba/tests/dba_db4_011.phpt @@ -1,7 +1,7 @@ --TEST-- DBA DB4 with repeated key --SKIPIF-- -<?php +<?php $handler = "db4"; require_once(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); @@ -24,8 +24,8 @@ if (($db_file=dba_open($db_filename, "c", $handler))!==FALSE) { ?> --CLEAN-- -<?php -require(dirname(__FILE__) .'/clean.inc'); +<?php +require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECT-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_012.phpt b/ext/dba/tests/dba_db4_012.phpt index 2caa43c84f..e626ba0c11 100644 --- a/ext/dba/tests/dba_db4_012.phpt +++ b/ext/dba/tests/dba_db4_012.phpt @@ -1,7 +1,7 @@ --TEST-- DBA DB4 New File Creation open("rl") --SKIPIF-- -<?php +<?php $handler = "db4"; require_once(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); @@ -21,8 +21,8 @@ if (($db_file = dba_open($db_filename, "rl", $handler)) !== FALSE) { ?> --CLEAN-- -<?php -require(dirname(__FILE__) .'/clean.inc'); +<?php +require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTF-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_013.phpt b/ext/dba/tests/dba_db4_013.phpt index ba2d171dcf..133f90f88a 100644 --- a/ext/dba/tests/dba_db4_013.phpt +++ b/ext/dba/tests/dba_db4_013.phpt @@ -1,7 +1,7 @@ --TEST-- DBA DB4 File open("rl") & Insert Test --SKIPIF-- -<?php +<?php $handler = "db4"; require_once(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); @@ -29,8 +29,8 @@ if (($db_file = dba_popen($db_filename, "rl", $handler)) !== FALSE) { ?> --CLEAN-- -<?php -require(dirname(__FILE__) .'/clean.inc'); +<?php +require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTF-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_014.phpt b/ext/dba/tests/dba_db4_014.phpt index 6fb22f87b3..38d272dd28 100644 --- a/ext/dba/tests/dba_db4_014.phpt +++ b/ext/dba/tests/dba_db4_014.phpt @@ -1,7 +1,7 @@ --TEST-- DBA DB4 File open("wl") & Insert Test --SKIPIF-- -<?php +<?php $handler = "db4"; require_once(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); @@ -22,8 +22,8 @@ if (($db_file = dba_open($db_filename, "wl", $handler)) !== FALSE) { ?> --CLEAN-- -<?php -require(dirname(__FILE__) .'/clean.inc'); +<?php +require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTF-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_015.phpt b/ext/dba/tests/dba_db4_015.phpt index 163828203d..0bd79ed7f5 100644 --- a/ext/dba/tests/dba_db4_015.phpt +++ b/ext/dba/tests/dba_db4_015.phpt @@ -1,7 +1,7 @@ --TEST-- DBA DB4 File open("wl") & Insert Test --SKIPIF-- -<?php +<?php $handler = "db4"; require_once(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); @@ -29,8 +29,8 @@ if (($db_file = dba_popen($db_filename, "wl", $handler)) !== FALSE) { ?> --CLEAN-- -<?php -require(dirname(__FILE__) .'/clean.inc'); +<?php +require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECT-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_016.phpt b/ext/dba/tests/dba_db4_016.phpt index 4e97819a59..618fc868e5 100644 --- a/ext/dba/tests/dba_db4_016.phpt +++ b/ext/dba/tests/dba_db4_016.phpt @@ -1,7 +1,7 @@ --TEST-- DBA DB4 File Creation popen("c") with existing valid file --SKIPIF-- -<?php +<?php $handler = "db4"; require_once(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); @@ -44,8 +44,8 @@ if (($db_file = dba_popen($db_filename, "c", $handler)) !== FALSE) { ?> --CLEAN-- -<?php -require(dirname(__FILE__) .'/clean.inc'); +<?php +require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECT-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_017.phpt b/ext/dba/tests/dba_db4_017.phpt index 2f9469299b..8a2dbdd9ff 100644 --- a/ext/dba/tests/dba_db4_017.phpt +++ b/ext/dba/tests/dba_db4_017.phpt @@ -1,7 +1,7 @@ --TEST-- DBA DB4 file creation dba_open("cd") --SKIPIF-- -<?php +<?php $handler = "db4"; require_once(dirname(__FILE__) .'/skipif.inc'); ?> @@ -27,8 +27,8 @@ if (($db_file = dba_open($db_filename, "cd", $handler)) !== FALSE) { ?> --CLEAN-- -<?php -require(dirname(__FILE__) .'/clean.inc'); +<?php +require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECT-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_018.phpt b/ext/dba/tests/dba_db4_018.phpt index ecd1980e46..fb696e9f5f 100644 --- a/ext/dba/tests/dba_db4_018.phpt +++ b/ext/dba/tests/dba_db4_018.phpt @@ -1,7 +1,7 @@ --TEST-- DBA DB4 with persistent connections --SKIPIF-- -<?php +<?php $handler = "db4"; require_once(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); @@ -50,8 +50,8 @@ echo dba_fetch("key2", $db_file1), "\n"; ?> ===DONE=== --CLEAN-- -<?php - require(dirname(__FILE__) .'/clean.inc'); +<?php + require(dirname(__FILE__) .'/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_db4_handlers.phpt b/ext/dba/tests/dba_db4_handlers.phpt index d238f431a4..41c397bdf4 100644 --- a/ext/dba/tests/dba_db4_handlers.phpt +++ b/ext/dba/tests/dba_db4_handlers.phpt @@ -1,7 +1,7 @@ --TEST-- DBA DB4 Handler Test --SKIPIF-- -<?php +<?php $handler="db4"; require(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); @@ -39,8 +39,8 @@ foreach ($h as $key => $val) { ?> --CLEAN-- -<?php -require(dirname(__FILE__) .'/clean.inc'); +<?php +require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTREGEX-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_optimize.phpt b/ext/dba/tests/dba_db4_optimize.phpt index d090f495bd..e8b5d6bb65 100644 --- a/ext/dba/tests/dba_db4_optimize.phpt +++ b/ext/dba/tests/dba_db4_optimize.phpt @@ -28,8 +28,8 @@ if (($db_file=dba_open($db_filename, "n", $handler))!==FALSE) { ===DONE=== <?php exit(0); ?> --CLEAN-- -<?php -require(dirname(__FILE__) .'/clean.inc'); +<?php +require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECT-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_sync.phpt b/ext/dba/tests/dba_db4_sync.phpt index 5fb4728fbf..a72aed4e71 100644 --- a/ext/dba/tests/dba_db4_sync.phpt +++ b/ext/dba/tests/dba_db4_sync.phpt @@ -28,8 +28,8 @@ if (($db_file=dba_open($db_filename, "n", $handler))!==FALSE) { ===DONE=== <?php exit(0); ?> --CLEAN-- -<?php -require(dirname(__FILE__) .'/clean.inc'); +<?php +require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECT-- database handler: db4 diff --git a/ext/dba/tests/dba_dbm.phpt b/ext/dba/tests/dba_dbm.phpt index fd7643414f..26ea91f9f2 100644 --- a/ext/dba/tests/dba_dbm.phpt +++ b/ext/dba/tests/dba_dbm.phpt @@ -1,7 +1,7 @@ --TEST-- DBA DBM handler test --SKIPIF-- -<?php +<?php $handler = 'dbm'; require_once dirname(__FILE__) .'/skipif.inc'; ?> @@ -13,8 +13,8 @@ DBA DBM handler test ?> ===DONE=== --CLEAN-- -<?php - require(dirname(__FILE__) .'/clean.inc'); +<?php + require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECT-- database handler: dbm diff --git a/ext/dba/tests/dba_flatfile.phpt b/ext/dba/tests/dba_flatfile.phpt index ac7f86ebda..c6064239c6 100644 --- a/ext/dba/tests/dba_flatfile.phpt +++ b/ext/dba/tests/dba_flatfile.phpt @@ -1,7 +1,7 @@ --TEST-- DBA FlatFile handler test --SKIPIF-- -<?php +<?php $handler = 'flatfile'; require_once(dirname(__FILE__) .'/skipif.inc'); ?> @@ -13,8 +13,8 @@ DBA FlatFile handler test ?> ===DONE=== --CLEAN-- -<?php - require(dirname(__FILE__) .'/clean.inc'); +<?php + require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECT-- database handler: flatfile diff --git a/ext/dba/tests/dba_gdbm.phpt b/ext/dba/tests/dba_gdbm.phpt index d8fde4b628..18ee455e4d 100644 --- a/ext/dba/tests/dba_gdbm.phpt +++ b/ext/dba/tests/dba_gdbm.phpt @@ -1,7 +1,7 @@ --TEST-- DBA GDBM handler test --SKIPIF-- -<?php +<?php $handler = 'gdbm'; require_once dirname(__FILE__) .'/skipif.inc'; ?> @@ -11,7 +11,7 @@ DBA GDBM handler test require_once dirname(__FILE__) .'/test.inc'; $lock_flag = ''; // lock in library require_once dirname(__FILE__) .'/dba_handler.inc'; - + // Read during write is system dependent. Important is that there is no deadlock ?> ===DONE=== diff --git a/ext/dba/tests/dba_handlers.phpt b/ext/dba/tests/dba_handlers.phpt index 9f66a79f27..41c23b5cf6 100644 --- a/ext/dba/tests/dba_handlers.phpt +++ b/ext/dba/tests/dba_handlers.phpt @@ -1,7 +1,7 @@ --TEST-- DBA Handler Test --SKIPIF-- -<?php +<?php $handler="flatfile"; require(dirname(__FILE__) .'/skipif.inc'); die("info $HND handler used"); @@ -51,8 +51,8 @@ foreach ($h as $key => $val) { ?> --CLEAN-- -<?php -require(dirname(__FILE__) .'/clean.inc'); +<?php +require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTF-- database handler: flatfile diff --git a/ext/dba/tests/dba_inifile.phpt b/ext/dba/tests/dba_inifile.phpt index ae06aee09f..ad7b72a82d 100644 --- a/ext/dba/tests/dba_inifile.phpt +++ b/ext/dba/tests/dba_inifile.phpt @@ -1,7 +1,7 @@ --TEST-- DBA INIFILE handler test --SKIPIF-- -<?php +<?php $handler = 'inifile'; require_once dirname(__FILE__) .'/skipif.inc'; ?> @@ -13,8 +13,8 @@ DBA INIFILE handler test ?> ===DONE=== --CLEAN-- -<?php - require(dirname(__FILE__) .'/clean.inc'); +<?php + require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECT-- database handler: inifile diff --git a/ext/dba/tests/dba_ndbm.phpt b/ext/dba/tests/dba_ndbm.phpt index 193db6f94d..a3478862eb 100644 --- a/ext/dba/tests/dba_ndbm.phpt +++ b/ext/dba/tests/dba_ndbm.phpt @@ -1,7 +1,7 @@ --TEST-- DBA NDBM handler test --SKIPIF-- -<?php +<?php $handler = 'ndbm'; require_once dirname(__FILE__) .'/skipif.inc'; ?> diff --git a/ext/dba/tests/dba_optimize.phpt b/ext/dba/tests/dba_optimize.phpt index 794d7e8f79..6347d4983c 100644 --- a/ext/dba/tests/dba_optimize.phpt +++ b/ext/dba/tests/dba_optimize.phpt @@ -35,8 +35,8 @@ if (($db_file=dba_open($db_filename, "n", $handler))!==FALSE) { ===DONE=== <?php exit(0); ?> --CLEAN-- -<?php - require(dirname(__FILE__) .'/clean.inc'); +<?php + require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTF-- database handler: flatfile diff --git a/ext/dba/tests/dba_qdbm.phpt b/ext/dba/tests/dba_qdbm.phpt index 13e10594ef..45fed53824 100644 --- a/ext/dba/tests/dba_qdbm.phpt +++ b/ext/dba/tests/dba_qdbm.phpt @@ -14,8 +14,8 @@ DBA QDBM handler test ?> ===DONE=== --CLEAN-- -<?php - require(dirname(__FILE__) .'/clean.inc'); +<?php + require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTF-- database handler: qdbm diff --git a/ext/dba/tests/dba_sync.phpt b/ext/dba/tests/dba_sync.phpt index e0906eeeef..0e64ea2905 100644 --- a/ext/dba/tests/dba_sync.phpt +++ b/ext/dba/tests/dba_sync.phpt @@ -35,8 +35,8 @@ if (($db_file=dba_open($db_filename, "n", $handler))!==FALSE) { ===DONE=== <?php exit(0); ?> --CLEAN-- -<?php - require(dirname(__FILE__) .'/clean.inc'); +<?php + require(dirname(__FILE__) .'/clean.inc'); ?> --EXPECTF-- database handler: flatfile diff --git a/ext/dom/tests/DOMAttr_value_basic_001.phpt b/ext/dom/tests/DOMAttr_value_basic_001.phpt index cfc68bdaa8..05ad1022de 100644 --- a/ext/dom/tests/DOMAttr_value_basic_001.phpt +++ b/ext/dom/tests/DOMAttr_value_basic_001.phpt @@ -13,4 +13,4 @@ print $attr->value."\n"; ===DONE=== --EXPECT-- ===DONE=== - + diff --git a/ext/dom/tests/DOMCharacterData_length_error_001.phpt b/ext/dom/tests/DOMCharacterData_length_error_001.phpt index e8bf16ab98..31a17c6186 100644 --- a/ext/dom/tests/DOMCharacterData_length_error_001.phpt +++ b/ext/dom/tests/DOMCharacterData_length_error_001.phpt @@ -14,4 +14,4 @@ print $character_data->length; --EXPECTF-- Warning: main(): Invalid State Error in %s ===DONE=== - + diff --git a/ext/dom/tests/DOMDocument_relaxNGValidateSource_basic.phpt b/ext/dom/tests/DOMDocument_relaxNGValidateSource_basic.phpt index 94f86eb9d2..fa777f8ce5 100644 --- a/ext/dom/tests/DOMDocument_relaxNGValidateSource_basic.phpt +++ b/ext/dom/tests/DOMDocument_relaxNGValidateSource_basic.phpt @@ -9,7 +9,7 @@ require_once('skipif.inc'); --FILE-- <?php $rng = <<< RNG -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?> <grammar ns="" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> <start> @@ -23,7 +23,7 @@ $rng = <<< RNG RNG; $good_xml = <<< GOOD_XML -<?xml version="1.0"?> +<?xml version="1.0"?> <apple> <pear>Pear</pear> </apple> diff --git a/ext/dom/tests/DOMDocument_relaxNGValidateSource_error1.phpt b/ext/dom/tests/DOMDocument_relaxNGValidateSource_error1.phpt index 7da71a57a1..a277a30a2d 100644 --- a/ext/dom/tests/DOMDocument_relaxNGValidateSource_error1.phpt +++ b/ext/dom/tests/DOMDocument_relaxNGValidateSource_error1.phpt @@ -9,7 +9,7 @@ require_once('skipif.inc'); --FILE-- <?php $rng = <<< RNG -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?> <grammar ns="" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> <start> @@ -23,7 +23,7 @@ $rng = <<< RNG RNG; $bad_xml = <<< BAD_XML -<?xml version="1.0"?> +<?xml version="1.0"?> <apple> <pear>Pear</pear> <pear>Pear</pear> diff --git a/ext/dom/tests/DOMDocument_relaxNGValidateSource_error2.phpt b/ext/dom/tests/DOMDocument_relaxNGValidateSource_error2.phpt index d689934f4e..b11dc63f7e 100644 --- a/ext/dom/tests/DOMDocument_relaxNGValidateSource_error2.phpt +++ b/ext/dom/tests/DOMDocument_relaxNGValidateSource_error2.phpt @@ -9,7 +9,7 @@ require_once('skipif.inc'); --FILE-- <?php $rng = <<< RNG -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?> <grammar ns="" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> <start> @@ -20,7 +20,7 @@ $rng = <<< RNG RNG; $xml = <<< XML -<?xml version="1.0"?> +<?xml version="1.0"?> <apple> <pear>Pear</pear> </apple> diff --git a/ext/dom/tests/DOMDocument_relaxNGValidate_basic.phpt b/ext/dom/tests/DOMDocument_relaxNGValidate_basic.phpt index 7a08f37fa5..3e4d003ba4 100644 --- a/ext/dom/tests/DOMDocument_relaxNGValidate_basic.phpt +++ b/ext/dom/tests/DOMDocument_relaxNGValidate_basic.phpt @@ -10,7 +10,7 @@ require_once('skipif.inc'); <?php $rng = dirname(__FILE__).'/DOMDocument_relaxNGValidate_basic.rng'; $xml = <<< XML -<?xml version="1.0"?> +<?xml version="1.0"?> <apple> <pear>Pear</pear> </apple> diff --git a/ext/dom/tests/DOMDocument_relaxNGValidate_error1.phpt b/ext/dom/tests/DOMDocument_relaxNGValidate_error1.phpt index 82957c35bd..53c773b221 100644 --- a/ext/dom/tests/DOMDocument_relaxNGValidate_error1.phpt +++ b/ext/dom/tests/DOMDocument_relaxNGValidate_error1.phpt @@ -10,7 +10,7 @@ require_once('skipif.inc'); <?php $rng = dirname(__FILE__).'/DOMDocument_relaxNGValidate_basic.rng'; $xml = <<< XML -<?xml version="1.0"?> +<?xml version="1.0"?> <apple> <pear>Pear</pear> <pear>Pear</pear> diff --git a/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt b/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt index 7c5f8901e7..0f26e57d0c 100644 --- a/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt +++ b/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt @@ -10,7 +10,7 @@ require_once('skipif.inc'); <?php $rng = dirname(__FILE__).'/foo.rng'; $xml = <<< XML -<?xml version="1.0"?> +<?xml version="1.0"?> <apple> <pear>Pear</pear> <pear>Pear</pear> diff --git a/ext/dom/tests/DOMDocument_saveHTML_variant2.phpt b/ext/dom/tests/DOMDocument_saveHTML_variant2.phpt index 86b150d519..9c02e13adc 100644 --- a/ext/dom/tests/DOMDocument_saveHTML_variant2.phpt +++ b/ext/dom/tests/DOMDocument_saveHTML_variant2.phpt @@ -1,5 +1,5 @@ --TEST-- -DOMDocument::saveHTML() vs DOMDocumet::saveXML() +DOMDocument::saveHTML() vs DOMDocumet::saveXML() --SKIPIF-- <?php require_once dirname(__FILE__) .'/skipif.inc'; diff --git a/ext/dom/tests/DOMElement_hasAttributes_basic.phpt b/ext/dom/tests/DOMElement_hasAttributes_basic.phpt index 39366eaab1..a6a2055066 100644 --- a/ext/dom/tests/DOMElement_hasAttributes_basic.phpt +++ b/ext/dom/tests/DOMElement_hasAttributes_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -DOMNode: hasAttributes() +DOMNode: hasAttributes() --CREDITS-- James Lewis <james@s-1.com> #TestFest 2008 @@ -22,15 +22,15 @@ echo "Verify that we have a DOMElement object:\n"; echo get_class($element), "\n"; echo "\nElement should have attributes:\n"; -var_dump($element->hasAttributes()); +var_dump($element->hasAttributes()); -$nodelist=$dom->getElementsByTagName('tbody') ; +$nodelist=$dom->getElementsByTagName('tbody') ; $element = $nodelist->item(0); echo "\nVerify that we have a DOMElement object:\n"; echo get_class($element), "\n"; -echo "\nElement should have no attributes:\n"; +echo "\nElement should have no attributes:\n"; var_dump($element->hasAttributes()); diff --git a/ext/dom/tests/DOMImplementation_createDocumentType_basic.phpt b/ext/dom/tests/DOMImplementation_createDocumentType_basic.phpt index 880aae9d7c..06ae48e93d 100644 --- a/ext/dom/tests/DOMImplementation_createDocumentType_basic.phpt +++ b/ext/dom/tests/DOMImplementation_createDocumentType_basic.phpt @@ -7,8 +7,8 @@ include('skipif.inc'); --FILE-- <?php $imp = new DOMImplementation(); -$doctype = $imp->createDocumentType("html", - "-//W3C//DTD XHTML 1.0 Strict//EN", +$doctype = $imp->createDocumentType("html", + "-//W3C//DTD XHTML 1.0 Strict//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"); $doc = $imp->createDocument(null, 'html', $doctype); echo $doc->saveHTML(); diff --git a/ext/dom/tests/DOMNode_cloneNode_basic.phpt b/ext/dom/tests/DOMNode_cloneNode_basic.phpt index ef66626ad8..be8f491922 100644 --- a/ext/dom/tests/DOMNode_cloneNode_basic.phpt +++ b/ext/dom/tests/DOMNode_cloneNode_basic.phpt @@ -28,7 +28,7 @@ $xml = <<< EOXML EOXML; function dumpcourse($current) { - $title = ($current->nodeType != XML_TEXT_NODE && $current->hasAttribute('title')) ? $current->getAttribute('title'):"no title"; + $title = ($current->nodeType != XML_TEXT_NODE && $current->hasAttribute('title')) ? $current->getAttribute('title'):"no title"; echo "Course: $title:";echo(get_class($current)), "\n"; echo "~";var_dump($current->textContent); } diff --git a/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt b/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt index 470921cfee..1055d64f1d 100644 --- a/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt +++ b/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt @@ -5,7 +5,7 @@ Test whether a node has child nodes: hasChildNodes() include('skipif.inc'); ?> --FILE-- -<?php +<?php /* Create an XML document * with strcuture diff --git a/ext/dom/tests/DOMNode_issamenode_basic.phpt b/ext/dom/tests/DOMNode_issamenode_basic.phpt index e008340ead..21feda8a7e 100644 --- a/ext/dom/tests/DOMNode_issamenode_basic.phpt +++ b/ext/dom/tests/DOMNode_issamenode_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -DOMNode: isSameNode() +DOMNode: isSameNode() --CREDITS-- James Lewis <james@s-1.com> #TestFest 2008 @@ -17,18 +17,18 @@ if(!$dom) { } $node = $dom->documentElement; -if($node->isSameNode($node)) - echo "EXPECTING SAME NODE, PASSED\n" ; +if($node->isSameNode($node)) + echo "EXPECTING SAME NODE, PASSED\n" ; else - echo "EXPECTING SAME NODE, FAILED\n" ; + echo "EXPECTING SAME NODE, FAILED\n" ; -$nodelist=$dom->getElementsByTagName('tbody') ; +$nodelist=$dom->getElementsByTagName('tbody') ; if($nodelist->item(0)->isSameNode($node)) - echo "EXPECTING NOT SAME NODE, FAILED\n" ; + echo "EXPECTING NOT SAME NODE, FAILED\n" ; else - echo "EXPECTING NOT SAME NODE, PASSED\n" ; - + echo "EXPECTING NOT SAME NODE, PASSED\n" ; + ?> ===DONE=== --EXPECT-- diff --git a/ext/dom/tests/DOMNode_removeChild_basic.phpt b/ext/dom/tests/DOMNode_removeChild_basic.phpt index e1399f959d..92cb79d128 100644 --- a/ext/dom/tests/DOMNode_removeChild_basic.phpt +++ b/ext/dom/tests/DOMNode_removeChild_basic.phpt @@ -28,7 +28,7 @@ $xml = <<< EOXML EOXML; function dumpcourse($current) { - $title = ($current->nodeType != XML_TEXT_NODE && $current->hasAttribute('title')) ? $current->getAttribute('title'):"no title"; + $title = ($current->nodeType != XML_TEXT_NODE && $current->hasAttribute('title')) ? $current->getAttribute('title'):"no title"; echo "Course: $title:";echo get_class($current), "\n"; echo "~";var_dump($current->textContent); } diff --git a/ext/dom/tests/bug28721.phpt b/ext/dom/tests/bug28721.phpt index 464498ef80..818e62973e 100644 --- a/ext/dom/tests/bug28721.phpt +++ b/ext/dom/tests/bug28721.phpt @@ -24,7 +24,7 @@ function print_node_r(DomNode $node) { print_node($node->previousSibling); else echo "NULL\n"; - + echo $indent . "nextSibling: "; if ( $node->nextSibling ) print_node($node->nextSibling); @@ -33,7 +33,7 @@ function print_node_r(DomNode $node) { if ( !$node->hasChildNodes() ) return; - + foreach ($node->childNodes as $child) { $old_indent = $indent; diff --git a/ext/dom/tests/bug28817.phpt b/ext/dom/tests/bug28817.phpt index 9683088680..50d81b1aa7 100644 --- a/ext/dom/tests/bug28817.phpt +++ b/ext/dom/tests/bug28817.phpt @@ -17,7 +17,7 @@ class z extends domDocument{ $this->p_array[] = 'tiro'; $this->p_variable = 'Cessante causa cessat effectus'; - } + } } $z=new z(); diff --git a/ext/dom/tests/bug38474.phpt b/ext/dom/tests/bug38474.phpt index 54226efe56..9c694c432e 100644 --- a/ext/dom/tests/bug38474.phpt +++ b/ext/dom/tests/bug38474.phpt @@ -1,11 +1,11 @@ --TEST-- Bug #38474 (getAttribute select attribute by order, even when prefixed) (OK to fail with libxml2 < 2.6.2x) --SKIPIF-- -<?php +<?php require_once('skipif.inc'); if (version_compare(LIBXML_DOTTED_VERSION, "2.6.20", "<")) { print "skip libxml version " . LIBXML_DOTTED_VERSION; -} +} ?> --FILE-- <?php diff --git a/ext/dom/tests/bug42082.phpt b/ext/dom/tests/bug42082.phpt index 1ec561003e..9708937ff7 100644 --- a/ext/dom/tests/bug42082.phpt +++ b/ext/dom/tests/bug42082.phpt @@ -28,4 +28,4 @@ bool(true) bool(false) bool(false) ===DONE=== - + diff --git a/ext/dom/tests/bug43364.phpt b/ext/dom/tests/bug43364.phpt index 6e08ffc01f..e4808f19ed 100644 --- a/ext/dom/tests/bug43364.phpt +++ b/ext/dom/tests/bug43364.phpt @@ -3,7 +3,7 @@ Bug #43364 (recursive xincludes don't remove internal xml nodes properly) --SKIPIF-- <?php require_once('skipif.inc'); ?> --FILE-- -<?php +<?php function loopElements($nodes) { $count = 0; diff --git a/ext/dom/tests/bug46185.phpt b/ext/dom/tests/bug46185.phpt index 02117cdd67..927a6e59e6 100644 --- a/ext/dom/tests/bug46185.phpt +++ b/ext/dom/tests/bug46185.phpt @@ -3,7 +3,7 @@ Bug #46185 (importNode changes the namespace of an XML element). --SKIPIF-- <?php require_once('skipif.inc'); ?> --FILE-- -<?php +<?php $aDOM = new DOMDocument(); $aDOM->loadXML('<?xml version="1.0"?> <ns1:a xmlns:ns1="urn::ns"/>'); diff --git a/ext/dom/tests/bug46335.phpt b/ext/dom/tests/bug46335.phpt index bea4ae9e7d..18d4039aab 100644 --- a/ext/dom/tests/bug46335.phpt +++ b/ext/dom/tests/bug46335.phpt @@ -3,7 +3,7 @@ Bug #46335 (DOMText::splitText doesn't handle multibyte characters). --SKIPIF-- <?php require_once('skipif.inc'); ?> --FILE-- -<?php +<?php $textascii = 'This is an "example" of using DOM splitText'; $text = 'This is an ‘example’ of using DOM splitText'; $start = 30; diff --git a/ext/dom/tests/bug47430.phpt b/ext/dom/tests/bug47430.phpt index 243fe8441c..efce132a2e 100644 --- a/ext/dom/tests/bug47430.phpt +++ b/ext/dom/tests/bug47430.phpt @@ -3,7 +3,7 @@ Bug #47430 (Errors after writing to nodeValue parameter of an absent previousSib --SKIPIF-- <?php require_once('skipif.inc'); ?> --FILE-- -<?php +<?php $xml = '<?xml version="1.0"?><html><p><i>Hello</i></p><p><i>World!</i></p></html>'; $dom = new DOMDocument(); diff --git a/ext/dom/tests/bug47848.phpt b/ext/dom/tests/bug47848.phpt index b4453c7209..e484e9c5dd 100644 --- a/ext/dom/tests/bug47848.phpt +++ b/ext/dom/tests/bug47848.phpt @@ -3,7 +3,7 @@ Bug #47848 (importNode doesn't preserve attribute namespaces) --SKIPIF-- <?php require_once('skipif.inc'); ?> --FILE-- -<?php +<?php $aDOM = new DOMDocument(); $aDOM->appendChild($aDOM->createElementNS('http://friend2friend.net/','f2f:a')); diff --git a/ext/dom/tests/bug47849.phpt b/ext/dom/tests/bug47849.phpt index 7e6b02c8cf..c0628e81f3 100644 --- a/ext/dom/tests/bug47849.phpt +++ b/ext/dom/tests/bug47849.phpt @@ -3,7 +3,7 @@ Bug #47849 (Non-deep import loses the namespace). --SKIPIF-- <?php require_once('skipif.inc'); ?> --FILE-- -<?php +<?php $aDOM= new DOMDocument(); $aDOM->appendChild($aDOM->createElementNS('urn::root','r:root')); diff --git a/ext/dom/tests/bug69846.phpt b/ext/dom/tests/bug69846.phpt index 2e8e05aa2c..fcca4c06d6 100644 --- a/ext/dom/tests/bug69846.phpt +++ b/ext/dom/tests/bug69846.phpt @@ -6,7 +6,7 @@ Bug #69846 Segmenation fault (access violation) when iterating over DOMNodeList <?php $tmpDomDocument = new DOMDocument(); - + $xml = '<?xml version="1.0" encoding="UTF-8"?><dummy xmlns:xfa="http://www.xfa.org/schema/xfa-data/1.0/"><xfa:data> <form1> <TextField1>Value A</TextField1> diff --git a/ext/dom/tests/canonicalization.phpt b/ext/dom/tests/canonicalization.phpt index 167f094ff8..11575819a6 100644 --- a/ext/dom/tests/canonicalization.phpt +++ b/ext/dom/tests/canonicalization.phpt @@ -40,7 +40,7 @@ echo $doc->c14N(TRUE, FALSE, array('query'=>'(//. | //@* | //namespace::*)'))."\ using xpath query with registered namespace. test namespace prefix is also included. */ echo $doc->c14N(TRUE, FALSE, - array('query'=>'(//a:contain | //a:bar | .//namespace::*)', + array('query'=>'(//a:contain | //a:bar | .//namespace::*)', 'namespaces'=>array('a'=>'http://www.example.com/ns/foo')), array('test'))."\n\n"; diff --git a/ext/dom/tests/dom001.phpt b/ext/dom/tests/dom001.phpt index a0c78fbb0a..910a18c628 100644 --- a/ext/dom/tests/dom001.phpt +++ b/ext/dom/tests/dom001.phpt @@ -46,7 +46,7 @@ echo "--------- creating a new attribute\n"; //$attr = $dom->createAttribute("src", "picture.gif"); //print_r($attr); -//$rootnode->set_attributeNode($attr); +//$rootnode->set_attributeNode($attr); $attr = $rootnode->setAttribute("src", "picture.gif"); $attr = $rootnode->getAttribute("src"); print_r($attr); diff --git a/ext/dom/tests/dom006.phpt b/ext/dom/tests/dom006.phpt index b8e8ed1724..6872a293ee 100644 --- a/ext/dom/tests/dom006.phpt +++ b/ext/dom/tests/dom006.phpt @@ -18,7 +18,7 @@ Class books extends domDocument { $bookElement->appendChild($authorElement); $this->documentElement->appendChild($bookElement); } - + } $dom = new books; diff --git a/ext/dom/tests/dom_set_attr_node.phpt b/ext/dom/tests/dom_set_attr_node.phpt index 18c697710a..677dfa5e70 100644 --- a/ext/dom/tests/dom_set_attr_node.phpt +++ b/ext/dom/tests/dom_set_attr_node.phpt @@ -31,7 +31,7 @@ ob_start(); $contents = ob_get_contents(); ob_end_clean(); echo preg_replace('/object\(DOMAttr\).+\{.*?\}/s', 'DOMAttr', $contents); -} +} ?> --EXPECTF-- diff --git a/ext/enchant/tests/broker_describe.phpt b/ext/enchant/tests/broker_describe.phpt index 721d618df3..a25a77bd8e 100644 --- a/ext/enchant/tests/broker_describe.phpt +++ b/ext/enchant/tests/broker_describe.phpt @@ -31,22 +31,22 @@ $counter = 0; if($broker) { echo("OK\n"); - $provider = enchant_broker_describe($broker); - + $provider = enchant_broker_describe($broker); + if (is_array($provider)) { echo("OK\n"); - + if ((isset($provider[$counter]['name']) && isset($provider[$counter]['desc']) && isset($provider[$counter]['file']))) { echo("OK\n"); - - } else { + + } else { echo("failed, broker describe\n"); - + } } else { echo "failed, brocker describe array \n"; } - + enchant_broker_free($broker); } else { diff --git a/ext/enchant/tests/broker_free.phpt b/ext/enchant/tests/broker_free.phpt index dd9149468d..6964895962 100644 --- a/ext/enchant/tests/broker_free.phpt +++ b/ext/enchant/tests/broker_free.phpt @@ -13,7 +13,7 @@ $broker = enchant_broker_init(); if (is_resource($broker)) { echo "OK\n"; enchant_broker_free($broker); - + } else { exit("init failed\n"); } diff --git a/ext/enchant/tests/broker_free_01.phpt b/ext/enchant/tests/broker_free_01.phpt index 3de4c4b7e3..77391cdd60 100644 --- a/ext/enchant/tests/broker_free_01.phpt +++ b/ext/enchant/tests/broker_free_01.phpt @@ -12,7 +12,7 @@ if (!is_resource(enchant_broker_init())) {die("skip, resource dont load\n");} $broker = enchant_broker_init(); if (is_resource($broker)) { echo("OK\n"); - + if (enchant_broker_free($broker)) { echo("OK\n"); } else { diff --git a/ext/enchant/tests/broker_free_02.phpt b/ext/enchant/tests/broker_free_02.phpt index a777d889ae..75ce5cb8ac 100644 --- a/ext/enchant/tests/broker_free_02.phpt +++ b/ext/enchant/tests/broker_free_02.phpt @@ -16,23 +16,23 @@ $newWord = array("iLoveJava","iLoveJavascript","iLoveRuby","iLovePerl","iLoveAwk if (is_resource($broker)) { echo("OK\n"); - $requestDict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']); - + $requestDict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']); + if ($requestDict) { echo("OK\n"); for($x=0;$x<count($newWord);$x++) { $AddtoPersonalDict = enchant_dict_add_to_personal($requestDict,$newWord[$x]); } - + if (NULL === $AddtoPersonalDict) { var_dump($AddtoPersonalDict); - + if (enchant_broker_free_dict($requestDict)) { echo("OK\n"); - + if (enchant_broker_free($broker)) { echo("OK\n"); - + } else { echo("broker free failed\n"); } @@ -43,8 +43,8 @@ if (is_resource($broker)) { echo("dict add to personal failed\n"); } } else { - echo("broker request dict failed\n"); - } + echo("broker request dict failed\n"); + } } else { echo("init failed\n"); } diff --git a/ext/enchant/tests/broker_free_dict.phpt b/ext/enchant/tests/broker_free_dict.phpt index f0b6bb6dc3..0e18ae7cc6 100644 --- a/ext/enchant/tests/broker_free_dict.phpt +++ b/ext/enchant/tests/broker_free_dict.phpt @@ -3,7 +3,7 @@ enchant_broker_free_dict(resource $dict); function --CREDITS-- marcosptf - <marcosptf@yahoo.com.br> --SKIPIF-- -<?php +<?php if(!extension_loaded('enchant')) die('skip, enchant not loader'); if(!is_resource(enchant_broker_init())) {die("skip, resource dont load\n");} if(!is_array(enchant_broker_list_dicts(enchant_broker_init()))) {die("skip, dont has dictionary install in this machine! \n");} @@ -16,29 +16,29 @@ $newWord = "iLoveJava"; if (is_resource($broker)) { echo("OK\n"); $requestDict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']); - + if ($requestDict) { echo("OK\n"); - $AddtoPersonalDict = enchant_dict_add_to_personal($requestDict, $newWord); - + $AddtoPersonalDict = enchant_dict_add_to_personal($requestDict, $newWord); + if (NULL === $AddtoPersonalDict) { - var_dump($AddtoPersonalDict); - + var_dump($AddtoPersonalDict); + if (enchant_broker_free_dict($requestDict)) { echo("OK\n"); - + } else { echo("dict broker free has failed\n"); } - + } else { echo("dict add to personal failed\n"); } - + } else { - echo("broker request dict failed\n"); + echo("broker request dict failed\n"); } - + } else { echo("broker is not a resource; failed;\n"); } diff --git a/ext/enchant/tests/broker_get_error.phpt b/ext/enchant/tests/broker_get_error.phpt index e8d248eca6..93f6130c24 100644 --- a/ext/enchant/tests/broker_get_error.phpt +++ b/ext/enchant/tests/broker_get_error.phpt @@ -13,7 +13,7 @@ $broker = enchant_broker_init(); if (is_resource($broker)) { echo("OK\n"); $enchantErr = enchant_broker_get_error($broker); - + if ("" == $enchantErr) { echo("OK\n"); } else { diff --git a/ext/enchant/tests/broker_init.phpt b/ext/enchant/tests/broker_init.phpt index 12c25e3ddc..b13541c070 100644 --- a/ext/enchant/tests/broker_init.phpt +++ b/ext/enchant/tests/broker_init.phpt @@ -3,7 +3,7 @@ enchant_broker_init() function --CREDITS-- marcosptf - <marcosptf@yahoo.com.br> --SKIPIF-- -<?php +<?php if(!extension_loaded('enchant')) die('skip, enchant not loader'); if (!is_resource(enchant_broker_init())) {die("skip, resource dont load\n");} ?> @@ -12,7 +12,7 @@ if (!is_resource(enchant_broker_init())) {die("skip, resource dont load\n");} $broker = enchant_broker_init(); if (is_resource($broker)) { echo("OK\n"); -} else { +} else { echo("failure, its not a resource\n"); } ?> diff --git a/ext/enchant/tests/broker_list_dicts.phpt b/ext/enchant/tests/broker_list_dicts.phpt index 3b29a5d5e5..6d155516c0 100644 --- a/ext/enchant/tests/broker_list_dicts.phpt +++ b/ext/enchant/tests/broker_list_dicts.phpt @@ -30,7 +30,7 @@ $broker = enchant_broker_init(); if (is_resource($broker)) { echo("OK\n"); $brokerListDicts = enchant_broker_list_dicts($broker); - + if (is_array($brokerListDicts)) { echo("OK\n"); } else { diff --git a/ext/enchant/tests/broker_request_dict.phpt b/ext/enchant/tests/broker_request_dict.phpt index 5b7abe76bf..3cf952f869 100644 --- a/ext/enchant/tests/broker_request_dict.phpt +++ b/ext/enchant/tests/broker_request_dict.phpt @@ -16,7 +16,7 @@ $dicts = enchant_broker_list_dicts($broker); if (is_array($dicts)) { if (count($dicts)) { $dict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']); - + if (is_resource($dict)) { echo "OK\n"; } else { diff --git a/ext/enchant/tests/broker_request_dict_01.phpt b/ext/enchant/tests/broker_request_dict_01.phpt index 518b16de44..49deeaaf30 100644 --- a/ext/enchant/tests/broker_request_dict_01.phpt +++ b/ext/enchant/tests/broker_request_dict_01.phpt @@ -3,7 +3,7 @@ enchant_broker_request_dict() function --CREDITS-- marcosptf - <marcosptf@yahoo.com.br> --SKIPIF-- -<?php +<?php if(!extension_loaded('enchant')) die('skip, enchant not loader'); if (!is_resource(enchant_broker_init())) {die("skip, resource dont load\n");} if (!is_array(enchant_broker_list_dicts(enchant_broker_init()))) {die("skip, dont has dictionary install in this machine! \n");} diff --git a/ext/enchant/tests/broker_request_pwl_dict.phpt b/ext/enchant/tests/broker_request_pwl_dict.phpt index 6235aeea5f..a8beadba6c 100644 --- a/ext/enchant/tests/broker_request_pwl_dict.phpt +++ b/ext/enchant/tests/broker_request_pwl_dict.phpt @@ -3,7 +3,7 @@ resource enchant_broker_request_pwl_dict(resource $broker, string $filename); fu --CREDITS-- marcosptf - <marcosptf@yahoo.com.br> --SKIPIF-- -<?php +<?php if(!extension_loaded('enchant')) die('skip, enchant not loader'); if(!is_resource(enchant_broker_init())) {die("skip, resource dont load\n");} ?> @@ -15,11 +15,11 @@ $pathPwlDict = __DIR__ . "/enchant_broker_request_pwl_dict.pwl"; if (is_resource($broker)) { echo("OK\n"); $requestDict = enchant_broker_request_pwl_dict($broker, $pathPwlDict); - + if (is_resource($requestDict)) { echo("OK\n"); $dictdescribe = enchant_dict_describe($requestDict); - + if ($pathPwlDict === $dictdescribe['file']) { echo("OK\n"); } else { diff --git a/ext/enchant/tests/bug13181.phpt b/ext/enchant/tests/bug13181.phpt index 79b28333d2..742e0c79fe 100644 --- a/ext/enchant/tests/bug13181.phpt +++ b/ext/enchant/tests/bug13181.phpt @@ -1,7 +1,7 @@ --TEST-- bug #13181, leaving a context frees the broker resources --SKIPIF-- -<?php +<?php if (!extension_loaded('enchant')) { echo "skip: Enchant extension not enabled\n"; exit; diff --git a/ext/enchant/tests/dict_add_to_personal.phpt b/ext/enchant/tests/dict_add_to_personal.phpt index 96bac1e256..e711a25f45 100644 --- a/ext/enchant/tests/dict_add_to_personal.phpt +++ b/ext/enchant/tests/dict_add_to_personal.phpt @@ -3,7 +3,7 @@ enchant_dict_add_to_personal() function --CREDITS-- marcosptf - <marcosptf@yahoo.com.br> --SKIPIF-- -<?php +<?php if(!extension_loaded('enchant')) die('skip, enchant not loader'); if (!is_resource(enchant_broker_init())) {die("skip, resource dont load\n");} if (!is_array(enchant_broker_list_dicts(enchant_broker_init()))) {die("skip, dont has dictionary install in this machine! \n");} @@ -17,21 +17,21 @@ $newWord = "iLoveJava"; if (is_resource($broker)) { echo("OK\n"); $requestDict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']); - + if ($requestDict) { echo("OK\n"); - $AddtoPersonalDict = enchant_dict_add_to_personal($requestDict,$newWord); - + $AddtoPersonalDict = enchant_dict_add_to_personal($requestDict,$newWord); + if (NULL === $AddtoPersonalDict) { - var_dump($AddtoPersonalDict); - + var_dump($AddtoPersonalDict); + } else { echo("dict add to personal failed\n"); } - + } else { - echo("broker request dict failed\n"); - + echo("broker request dict failed\n"); + } } else { diff --git a/ext/enchant/tests/dict_add_to_session.phpt b/ext/enchant/tests/dict_add_to_session.phpt index 78f66f8447..441d2dde74 100644 --- a/ext/enchant/tests/dict_add_to_session.phpt +++ b/ext/enchant/tests/dict_add_to_session.phpt @@ -17,24 +17,24 @@ $newWord = "iLoveJavaScript"; if (is_resource($broker)) { echo("OK\n"); $requestDict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']); - + if ($requestDict) { echo("OK\n"); $AddtoSessionDict = enchant_dict_add_to_session($requestDict,$newWord); - + if (NULL === $AddtoSessionDict) { var_dump($AddtoSessionDict); } else { echo("dict add to session failed\n"); - + } - + } else { echo("broker request dict failed\n"); } } else { echo("broker is not a resource; failed;\n"); - + } echo "OK\n"; ?> diff --git a/ext/enchant/tests/dict_check.phpt b/ext/enchant/tests/dict_check.phpt index fd5cf45b34..eb4198c4cf 100644 --- a/ext/enchant/tests/dict_check.phpt +++ b/ext/enchant/tests/dict_check.phpt @@ -3,7 +3,7 @@ enchant_dict_check() function --CREDITS-- marcosptf - <marcosptf@yahoo.com.br> --SKIPIF-- -<?php +<?php if(!extension_loaded('enchant')) die('skip, enchant not loader'); if (!is_resource(enchant_broker_init())) {die("skip, resource dont load\n");} if (!is_array(enchant_broker_list_dicts(enchant_broker_init()))) {die("skip, dont has dictionary install in this machine! \n");} @@ -17,21 +17,21 @@ $newWord = "java"; if (is_resource($broker)) { echo("OK\n"); $requestDict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']); - + if ($requestDict) { echo("OK\n"); enchant_dict_add_to_personal($requestDict, $newWord); - + if (enchant_dict_check($requestDict, $newWord)) { echo("OK\n"); - + } else { echo("dict check new word failed\n"); } - + } else { - echo("broker request dict failed\n"); - + echo("broker request dict failed\n"); + } } else { diff --git a/ext/enchant/tests/dict_describe.phpt b/ext/enchant/tests/dict_describe.phpt index 60a1e7c3f3..18cdbfe379 100644 --- a/ext/enchant/tests/dict_describe.phpt +++ b/ext/enchant/tests/dict_describe.phpt @@ -16,14 +16,14 @@ $dicts = enchant_broker_list_dicts($broker); if (is_resource($broker)) { echo("OK\n"); $requestDict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']); - + if ($requestDict) { echo("OK\n"); $dictDescribe = enchant_dict_describe($requestDict); - + if (is_array($dictDescribe)) { echo("OK\n"); - + } else { echo("broker request dict failed\n"); } diff --git a/ext/enchant/tests/dict_get_error.phpt b/ext/enchant/tests/dict_get_error.phpt index fc942a55ef..271214a786 100644 --- a/ext/enchant/tests/dict_get_error.phpt +++ b/ext/enchant/tests/dict_get_error.phpt @@ -16,7 +16,7 @@ $dicts = enchant_broker_list_dicts($broker); if (is_resource($broker)) { echo("OK\n"); $requestDict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']); - + if ($requestDict) { var_dump(enchant_dict_get_error($requestDict)); } else { diff --git a/ext/enchant/tests/dict_is_in_session.phpt b/ext/enchant/tests/dict_is_in_session.phpt index 6bf4af4839..4e670d5512 100644 --- a/ext/enchant/tests/dict_is_in_session.phpt +++ b/ext/enchant/tests/dict_is_in_session.phpt @@ -17,11 +17,11 @@ $newWord = "aspell"; if (is_resource($broker)) { echo("OK\n"); $requestDict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']); - + if ($requestDict) { echo("OK\n"); $AddtoPersonalDict = enchant_dict_add_to_personal($requestDict,$newWord); - + if (NULL === $AddtoPersonalDict) { var_dump(enchant_dict_is_in_session($requestDict,$newWord)); } else { diff --git a/ext/enchant/tests/dict_quick_check_01.phpt b/ext/enchant/tests/dict_quick_check_01.phpt index 4ef46829c3..a4dd818111 100644 --- a/ext/enchant/tests/dict_quick_check_01.phpt +++ b/ext/enchant/tests/dict_quick_check_01.phpt @@ -17,10 +17,10 @@ $word = "aspell"; if (is_resource($broker)) { echo("OK\n"); $requestDict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']); - + if ($requestDict) { enchant_dict_quick_check($requestDict,$word,$sugs); - + if (is_array($sugs)) { echo("OK\n"); } else { diff --git a/ext/enchant/tests/dict_store_replacement.phpt b/ext/enchant/tests/dict_store_replacement.phpt index 3383e77fe1..8ecd7b06a0 100644 --- a/ext/enchant/tests/dict_store_replacement.phpt +++ b/ext/enchant/tests/dict_store_replacement.phpt @@ -18,11 +18,11 @@ $rightWord = "java"; if (is_resource($broker)) { echo("OK\n"); $requestDict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']); - + if ($requestDict) { echo("OK\n"); $AddtoPersonalDict = enchant_dict_store_replacement($requestDict,$wrongWord,$rightWord); - + if (NULL === $AddtoPersonalDict) { var_dump($AddtoPersonalDict); } else { diff --git a/ext/enchant/tests/dict_suggest.phpt b/ext/enchant/tests/dict_suggest.phpt index 7317120a3b..85aa823579 100644 --- a/ext/enchant/tests/dict_suggest.phpt +++ b/ext/enchant/tests/dict_suggest.phpt @@ -3,7 +3,7 @@ enchant_dict_suggest() function --CREDITS-- marcosptf - <marcosptf@yahoo.com.br> --SKIPIF-- -<?php +<?php if(!extension_loaded('enchant')) die('skip, enchant not loader'); if (!is_resource(enchant_broker_init())) {die("skip, resource dont load\n");} if (!is_array(enchant_broker_list_dicts(enchant_broker_init()))) {die("skip, dont has dictionary install in this machine! \n");} @@ -17,20 +17,20 @@ $sugs = "soong"; if (is_resource($broker)) { echo("OK\n"); $requestDict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']); - + if ($requestDict) { echo("OK\n"); - $dictSuggest = enchant_dict_suggest($requestDict,$sugs); + $dictSuggest = enchant_dict_suggest($requestDict,$sugs); if (is_array($dictSuggest)) { echo("OK\n"); } else { echo("dict suggest failed\n"); } - + } else { - echo("broker request dict failed\n"); - + echo("broker request dict failed\n"); + } } else { diff --git a/ext/enchant/tests/enchant_broker_set_dict_path.phpt b/ext/enchant/tests/enchant_broker_set_dict_path.phpt index 47a65093bc..3911a7fe4c 100644 --- a/ext/enchant/tests/enchant_broker_set_dict_path.phpt +++ b/ext/enchant/tests/enchant_broker_set_dict_path.phpt @@ -19,23 +19,23 @@ $dictTypeValue2 = 2; if (is_resource($broker)) { echo("OK\n"); - + if (enchant_broker_set_dict_path($broker, $dictTypeValue1, $backEndDictType1)) { echo("OK\n"); - + if (enchant_broker_set_dict_path($broker, $dictTypeValue2, $backEndDictType2)) { echo("OK\n"); - - if ( + + if ( (enchant_broker_get_dict_path($broker,$dictTypeValue1) == $backEndDictType1) && - (enchant_broker_get_dict_path($broker,$dictTypeValue2) == $backEndDictType2) + (enchant_broker_get_dict_path($broker,$dictTypeValue2) == $backEndDictType2) ) { echo("OK\n"); } else { echo("broker get dict path has failed \n"); - } - + } + } else { echo("broker set dict path {$backEndDictType2} has failed \n"); } diff --git a/ext/exif/tests/bug48378.phpt b/ext/exif/tests/bug48378.phpt index 286ce61073..a66aba3a51 100644 --- a/ext/exif/tests/bug48378.phpt +++ b/ext/exif/tests/bug48378.phpt @@ -5,7 +5,7 @@ Bug #48378 (Infinite recursion due to corrupt JPEG) --FILE-- <?php exif_read_data( -dirname(__FILE__) . "/bug48378.jpeg", +dirname(__FILE__) . "/bug48378.jpeg", "FILE,COMPUTED,ANY_TAG" ); ?> diff --git a/ext/exif/tests/bug72735/bug72682.phpt b/ext/exif/tests/bug72735/bug72682.phpt index d738b96eca..42a80b2eea 100644 --- a/ext/exif/tests/bug72735/bug72682.phpt +++ b/ext/exif/tests/bug72735/bug72682.phpt @@ -9,7 +9,7 @@ foreach (['nokia.jpg', 'samsung.jpg', 'panasonic.jpg'] as $picture) { $info = exif_read_data(__DIR__ . DIRECTORY_SEPARATOR . $picture); var_dump($info['MakerNote']); -} +} ?> --EXPECT-- nokia.jpg: string(5) "Nikon" diff --git a/ext/exif/tests/bug72735/bug72735.phpt b/ext/exif/tests/bug72735/bug72735.phpt index 8b6c170434..082f3e6153 100644 --- a/ext/exif/tests/bug72735/bug72735.phpt +++ b/ext/exif/tests/bug72735/bug72735.phpt @@ -16,7 +16,7 @@ foreach (['nokia.jpg', 'samsung.jpg', 'panasonic.jpg'] as $picture) { } echo 'int(' . $len . ')', PHP_EOL; -} +} ?> --EXPECT-- nokia.jpg: int(5899) diff --git a/ext/exif/tests/exif004.phpt b/ext/exif/tests/exif004.phpt index 8797955f8c..356c10aa87 100644 --- a/ext/exif/tests/exif004.phpt +++ b/ext/exif/tests/exif004.phpt @@ -1,7 +1,7 @@ --TEST-- Check for exif_read_data, Unicode WinXP tags --SKIPIF-- -<?php +<?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'); diff --git a/ext/exif/tests/exif_imagetype_variation1.phpt b/ext/exif/tests/exif_imagetype_variation1.phpt index d33217c5f8..c190aed15c 100644 --- a/ext/exif/tests/exif_imagetype_variation1.phpt +++ b/ext/exif/tests/exif_imagetype_variation1.phpt @@ -21,7 +21,7 @@ unset($unset_var); class sample { public function __toString() { return "obj'ct"; - } + } } // Defining resource @@ -65,13 +65,13 @@ $values = array ( // unset variable $unset_var, - + // objects new sample(), // resource $file_handle, - + NULL, null ); diff --git a/ext/exif/tests/exif_tagname_variation1-64bit.phpt b/ext/exif/tests/exif_tagname_variation1-64bit.phpt index 4e61c25bb9..f603aecd86 100644 --- a/ext/exif/tests/exif_tagname_variation1-64bit.phpt +++ b/ext/exif/tests/exif_tagname_variation1-64bit.phpt @@ -23,7 +23,7 @@ unset($unset_var); class sample { public function __toString() { return "obj'ct"; - } + } } // Defining resource @@ -67,13 +67,13 @@ $values = array ( // unset variable $unset_var, - + // objects new sample(), // resource $file_handle, - + NULL, null ); diff --git a/ext/exif/tests/exif_tagname_variation1.phpt b/ext/exif/tests/exif_tagname_variation1.phpt index d6dd0ffc97..b63b8a1b01 100644 --- a/ext/exif/tests/exif_tagname_variation1.phpt +++ b/ext/exif/tests/exif_tagname_variation1.phpt @@ -21,7 +21,7 @@ unset($unset_var); class sample { public function __toString() { return "obj'ct"; - } + } } // Defining resource @@ -63,13 +63,13 @@ $values = array ( // unset variable $unset_var, - + // objects new sample(), // resource $file_handle, - + NULL, null ); diff --git a/ext/fileinfo/tests/finfo_buffer_basic-mb.phpt b/ext/fileinfo/tests/finfo_buffer_basic-mb.phpt index 8a675ea75a..0c0a364469 100644 --- a/ext/fileinfo/tests/finfo_buffer_basic-mb.phpt +++ b/ext/fileinfo/tests/finfo_buffer_basic-mb.phpt @@ -7,7 +7,7 @@ Test finfo_buffer() function : basic functionality /* Prototype : string finfo_buffer(resource finfo, char *string [, int options [, resource context]]) * Description: Return infromation about a string buffer. * Source code: ext/fileinfo/fileinfo.c - * Alias to functions: + * Alias to functions: */ $magicFile = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'magic私はガラスを食べられます'; diff --git a/ext/fileinfo/tests/finfo_buffer_basic.phpt b/ext/fileinfo/tests/finfo_buffer_basic.phpt index e6caa697c4..ee617d2565 100644 --- a/ext/fileinfo/tests/finfo_buffer_basic.phpt +++ b/ext/fileinfo/tests/finfo_buffer_basic.phpt @@ -7,7 +7,7 @@ Test finfo_buffer() function : basic functionality /* Prototype : string finfo_buffer(resource finfo, char *string [, int options [, resource context]]) * Description: Return infromation about a string buffer. * Source code: ext/fileinfo/fileinfo.c - * Alias to functions: + * Alias to functions: */ $magicFile = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'magic'; diff --git a/ext/fileinfo/tests/finfo_buffer_error.phpt b/ext/fileinfo/tests/finfo_buffer_error.phpt index 088836fc27..6a3d463d71 100644 --- a/ext/fileinfo/tests/finfo_buffer_error.phpt +++ b/ext/fileinfo/tests/finfo_buffer_error.phpt @@ -7,7 +7,7 @@ Test finfo_buffer() function : error conditions /* Prototype : string finfo_buffer(resource finfo, char *string [, int options [, resource context]]) * Description: Return infromation about a string buffer. * Source code: ext/fileinfo/fileinfo.c - * Alias to functions: + * Alias to functions: */ $magicFile = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'magic'; diff --git a/ext/fileinfo/tests/finfo_buffer_variation1-mb.phpt b/ext/fileinfo/tests/finfo_buffer_variation1-mb.phpt index 7dab9e1839..2eb9a40b28 100644 --- a/ext/fileinfo/tests/finfo_buffer_variation1-mb.phpt +++ b/ext/fileinfo/tests/finfo_buffer_variation1-mb.phpt @@ -7,7 +7,7 @@ Test finfo_buffer() function : basic functionality /* Prototype : string finfo_buffer(resource finfo, char *string [, int options [, resource context]]) * Description: Return infromation about a string buffer. * Source code: ext/fileinfo/fileinfo.c - * Alias to functions: + * Alias to functions: */ $magicFile = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'magic私はガラスを食べられます'; diff --git a/ext/fileinfo/tests/finfo_buffer_variation1.phpt b/ext/fileinfo/tests/finfo_buffer_variation1.phpt index 1d99986697..2882a337cc 100644 --- a/ext/fileinfo/tests/finfo_buffer_variation1.phpt +++ b/ext/fileinfo/tests/finfo_buffer_variation1.phpt @@ -7,7 +7,7 @@ Test finfo_buffer() function : basic functionality /* Prototype : string finfo_buffer(resource finfo, char *string [, int options [, resource context]]) * Description: Return infromation about a string buffer. * Source code: ext/fileinfo/fileinfo.c - * Alias to functions: + * Alias to functions: */ $magicFile = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'magic'; diff --git a/ext/fileinfo/tests/finfo_close_basic.phpt b/ext/fileinfo/tests/finfo_close_basic.phpt index 966431d99d..d6b00dbd42 100644 --- a/ext/fileinfo/tests/finfo_close_basic.phpt +++ b/ext/fileinfo/tests/finfo_close_basic.phpt @@ -7,7 +7,7 @@ Test finfo_close() function : basic functionality /* Prototype : resource finfo_close(resource finfo) * Description: Close fileinfo resource. * Source code: ext/fileinfo/fileinfo.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing finfo_close() : basic functionality ***\n"; diff --git a/ext/fileinfo/tests/finfo_close_error.phpt b/ext/fileinfo/tests/finfo_close_error.phpt index 85dc75406e..fdfc722ef7 100644 --- a/ext/fileinfo/tests/finfo_close_error.phpt +++ b/ext/fileinfo/tests/finfo_close_error.phpt @@ -7,7 +7,7 @@ Test finfo_close() function : error conditions /* Prototype : resource finfo_close(resource finfo) * Description: Close fileinfo resource. * Source code: ext/fileinfo/fileinfo.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing finfo_close() : error conditions ***\n"; diff --git a/ext/fileinfo/tests/finfo_file_basic.phpt b/ext/fileinfo/tests/finfo_file_basic.phpt index c99695ef52..6207eed41f 100644 --- a/ext/fileinfo/tests/finfo_file_basic.phpt +++ b/ext/fileinfo/tests/finfo_file_basic.phpt @@ -7,7 +7,7 @@ Test finfo_file() function : basic functionality /* Prototype : string finfo_file(resource finfo, char *file_name [, int options [, resource context]]) * Description: Return information about a file. * Source code: ext/fileinfo/fileinfo.c - * Alias to functions: + * Alias to functions: */ $magicFile = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'magic'; diff --git a/ext/fileinfo/tests/finfo_file_regex.phpt b/ext/fileinfo/tests/finfo_file_regex.phpt index d6c027d133..c7e562a79f 100644 --- a/ext/fileinfo/tests/finfo_file_regex.phpt +++ b/ext/fileinfo/tests/finfo_file_regex.phpt @@ -1,7 +1,7 @@ --TEST-- Test finfo_file() function : regex rules --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); +<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/fileinfo/tests/finfo_open_basic.phpt b/ext/fileinfo/tests/finfo_open_basic.phpt index 30fe7c2364..5816de8ef9 100644 --- a/ext/fileinfo/tests/finfo_open_basic.phpt +++ b/ext/fileinfo/tests/finfo_open_basic.phpt @@ -7,7 +7,7 @@ Test finfo_open() function : basic functionality /* Prototype : resource finfo_open([int options [, string arg]]) * Description: Create a new fileinfo resource. * Source code: ext/fileinfo/fileinfo.c - * Alias to functions: + * Alias to functions: */ $magicFile = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'magic'; diff --git a/ext/fileinfo/tests/finfo_open_error.phpt b/ext/fileinfo/tests/finfo_open_error.phpt index c4883981ce..5610d8eeb8 100644 --- a/ext/fileinfo/tests/finfo_open_error.phpt +++ b/ext/fileinfo/tests/finfo_open_error.phpt @@ -1,13 +1,13 @@ --TEST-- Test finfo_open() function : error functionality --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); +<?php require_once(dirname(__FILE__) . '/skipif.inc'); --FILE-- <?php /* Prototype : resource finfo_open([int options [, string arg]]) * Description: Create a new fileinfo resource. * Source code: ext/fileinfo/fileinfo.c - * Alias to functions: + * Alias to functions: */ $magicFile = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'magic'; diff --git a/ext/fileinfo/tests/finfo_open_variation1.phpt b/ext/fileinfo/tests/finfo_open_variation1.phpt index 1bc46f4ad3..ee17b2be93 100644 --- a/ext/fileinfo/tests/finfo_open_variation1.phpt +++ b/ext/fileinfo/tests/finfo_open_variation1.phpt @@ -7,7 +7,7 @@ Test finfo_open() function : variations in opening /* Prototype : resource finfo_open([int options [, string arg]]) * Description: Create a new fileinfo resource. * Source code: ext/fileinfo/fileinfo.c - * Alias to functions: + * Alias to functions: */ $magicFile = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'magic'; diff --git a/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt b/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt index 40b788b316..d5b6d5130d 100644 --- a/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt +++ b/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt @@ -7,7 +7,7 @@ Test finfo_set_flags() function : basic functionality /* Prototype : bool finfo_set_flags(resource finfo, int options) * Description: Set libmagic configuration options. * Source code: ext/fileinfo/fileinfo.c - * Alias to functions: + * Alias to functions: */ $magicFile = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'magic私はガラスを食べられます'; diff --git a/ext/fileinfo/tests/finfo_set_flags_basic.phpt b/ext/fileinfo/tests/finfo_set_flags_basic.phpt index 5b5ab517b1..ca2f2de88b 100644 --- a/ext/fileinfo/tests/finfo_set_flags_basic.phpt +++ b/ext/fileinfo/tests/finfo_set_flags_basic.phpt @@ -7,7 +7,7 @@ Test finfo_set_flags() function : basic functionality /* Prototype : bool finfo_set_flags(resource finfo, int options) * Description: Set libmagic configuration options. * Source code: ext/fileinfo/fileinfo.c - * Alias to functions: + * Alias to functions: */ $magicFile = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'magic'; diff --git a/ext/fileinfo/tests/mime_content_type_002.phpt b/ext/fileinfo/tests/mime_content_type_002.phpt index e56b2b198a..4022a67077 100644 --- a/ext/fileinfo/tests/mime_content_type_002.phpt +++ b/ext/fileinfo/tests/mime_content_type_002.phpt @@ -4,7 +4,7 @@ mime_content_type(): Testing parameter <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> --FILE-- <?php - + var_dump(mime_content_type(__FILE__)); var_dump(mime_content_type(fopen(__FILE__, 'r'))); var_dump(mime_content_type('.')); diff --git a/ext/filter/tests/002.phpt b/ext/filter/tests/002.phpt index 7136b251a6..7629f0125a 100644 --- a/ext/filter/tests/002.phpt +++ b/ext/filter/tests/002.phpt @@ -4,7 +4,7 @@ GET test with 2 values and an empty one a=1&b=&c=3 --FILE-- <?php echo $_GET['a']; -echo $_GET['b']; +echo $_GET['b']; echo $_GET['c']; ?> --EXPECT-- diff --git a/ext/filter/tests/003.phpt b/ext/filter/tests/003.phpt index 43e6cd9b03..e49e240448 100644 --- a/ext/filter/tests/003.phpt +++ b/ext/filter/tests/003.phpt @@ -6,7 +6,7 @@ d=4&e=5 a=1&b=&c=3 --FILE-- <?php echo $_GET['a']; -echo $_GET['b']; +echo $_GET['b']; echo $_GET['c']; echo $_POST['d']; echo $_POST['e']; diff --git a/ext/filter/tests/004.phpt b/ext/filter/tests/004.phpt index b899124936..e36682979c 100644 --- a/ext/filter/tests/004.phpt +++ b/ext/filter/tests/004.phpt @@ -10,7 +10,7 @@ d="quotes"&e=\slash a=O'Henry&b=&c=<b>Bold</b> --FILE-- <?php echo $_GET['a']; -echo $_GET['b']; +echo $_GET['b']; echo $_GET['c']; echo $_POST['d']; echo $_POST['e']; diff --git a/ext/filter/tests/005.phpt b/ext/filter/tests/005.phpt index b3735f5627..7ddb8a783b 100644 --- a/ext/filter/tests/005.phpt +++ b/ext/filter/tests/005.phpt @@ -7,14 +7,14 @@ filter.default=stripped --GET-- id=f03_photos&pgurl=http%3A//fifaworldcup.yahoo.com/03/en/photozone/index.html --FILE-- -<?php +<?php echo $_GET['id']; echo "\n"; -echo $_GET['pgurl']; +echo $_GET['pgurl']; echo "\n"; echo $_REQUEST['id']; echo "\n"; -echo $_REQUEST['pgurl']; +echo $_REQUEST['pgurl']; ?> --EXPECT-- f03_photos diff --git a/ext/filter/tests/007.phpt b/ext/filter/tests/007.phpt index 67c0b89f5f..87f9a77a12 100644 --- a/ext/filter/tests/007.phpt +++ b/ext/filter/tests/007.phpt @@ -31,7 +31,7 @@ var_dump(filter_has_var("", array())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(false) diff --git a/ext/filter/tests/008.phpt b/ext/filter/tests/008.phpt index 773c1ef7c7..a3cb7172ff 100644 --- a/ext/filter/tests/008.phpt +++ b/ext/filter/tests/008.phpt @@ -10,7 +10,7 @@ var_dump(filter_list(array())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(22) { [0]=> string(3) "int" diff --git a/ext/filter/tests/009.phpt b/ext/filter/tests/009.phpt index d09f996fd0..5c38e5603a 100644 --- a/ext/filter/tests/009.phpt +++ b/ext/filter/tests/009.phpt @@ -16,7 +16,7 @@ var_dump(filter_id(0,0,0)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(513) int(513) int(518) diff --git a/ext/filter/tests/010.phpt b/ext/filter/tests/010.phpt index 38b436f58d..3e71d331bd 100644 --- a/ext/filter/tests/010.phpt +++ b/ext/filter/tests/010.phpt @@ -18,7 +18,7 @@ var_dump(filter_var(1, 0, array())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(7) { [0]=> int(1) diff --git a/ext/filter/tests/012.phpt b/ext/filter/tests/012.phpt index 9a8ead944d..cd74081e8c 100644 --- a/ext/filter/tests/012.phpt +++ b/ext/filter/tests/012.phpt @@ -11,7 +11,7 @@ var_dump(filter_input(INPUT_COOKIE, "")); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- NULL NULL NULL diff --git a/ext/filter/tests/013.phpt b/ext/filter/tests/013.phpt index 421c5d55bf..c9dd915d83 100644 --- a/ext/filter/tests/013.phpt +++ b/ext/filter/tests/013.phpt @@ -40,7 +40,7 @@ var_dump(filter_var("010", FILTER_VALIDATE_INT)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- int(234) int(234) int(234) diff --git a/ext/filter/tests/014.phpt b/ext/filter/tests/014.phpt index 8837457147..6b34a19b77 100644 --- a/ext/filter/tests/014.phpt +++ b/ext/filter/tests/014.phpt @@ -30,11 +30,11 @@ var_dump(filter_var("", FILTER_VALIDATE_BOOLEAN)); var_dump(filter_var(-1, FILTER_VALIDATE_BOOLEAN)); var_dump(filter_var("000000", FILTER_VALIDATE_BOOLEAN)); var_dump(filter_var("111111", FILTER_VALIDATE_BOOLEAN)); - + echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- bool(false) bool(false) bool(false) diff --git a/ext/filter/tests/015.phpt b/ext/filter/tests/015.phpt index 03a78a8645..70b68bbca3 100644 --- a/ext/filter/tests/015.phpt +++ b/ext/filter/tests/015.phpt @@ -66,7 +66,7 @@ var_dump(filter_var("http://www.example.com/index.php?a=b&c=d", FILTER_VALIDATE_ echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(29) "http://example.com/index.html" string(32) "http://www.example.com/index.php" string(31) "http://www.example/img/test.png" diff --git a/ext/filter/tests/016.phpt b/ext/filter/tests/016.phpt index c6783444d0..9f644f671f 100644 --- a/ext/filter/tests/016.phpt +++ b/ext/filter/tests/016.phpt @@ -27,7 +27,7 @@ foreach ($values as $value) { echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(5) "a@b.c" string(17) "abuse@example.com" bool(false) diff --git a/ext/filter/tests/017.phpt b/ext/filter/tests/017.phpt index 518ee79256..d11688eceb 100644 --- a/ext/filter/tests/017.phpt +++ b/ext/filter/tests/017.phpt @@ -14,7 +14,7 @@ var_dump(filter_var("data", FILTER_VALIDATE_REGEXP)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(4) "data" bool(false) string(4) "data" diff --git a/ext/filter/tests/018.phpt b/ext/filter/tests/018.phpt index 833500fd33..640a2556bd 100644 --- a/ext/filter/tests/018.phpt +++ b/ext/filter/tests/018.phpt @@ -30,7 +30,7 @@ var_dump(filter_var("::1", FILTER_VALIDATE_IP, FILTER_FLAG_IPV6 | FILTER_FLAG_NO var_dump(filter_var("127.0.0.1", FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(11) "192.168.0.1" bool(false) string(3) "::1" diff --git a/ext/filter/tests/019.phpt b/ext/filter/tests/019.phpt index 1665181cd2..09fdddca8e 100644 --- a/ext/filter/tests/019.phpt +++ b/ext/filter/tests/019.phpt @@ -13,7 +13,7 @@ var_dump(filter_var("1.1.1.1", FILTER_VALIDATE_IP)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- bool(false) bool(false) bool(false) diff --git a/ext/filter/tests/020.phpt b/ext/filter/tests/020.phpt index c2ab6096d5..855897da9b 100644 --- a/ext/filter/tests/020.phpt +++ b/ext/filter/tests/020.phpt @@ -12,7 +12,7 @@ var_dump(filter_var(-1, FILTER_SANITIZE_MAGIC_QUOTES)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(36) "test\'asd\'asd\'\' asd\\\'\"asdfasdf" string(2) "\'" string(0) "" diff --git a/ext/filter/tests/021.phpt b/ext/filter/tests/021.phpt index 994dac282b..43248b1fba 100644 --- a/ext/filter/tests/021.phpt +++ b/ext/filter/tests/021.phpt @@ -25,7 +25,7 @@ var_dump(filter_var("", FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(6) "123456" string(11) "12312312323" string(5) "12323" diff --git a/ext/filter/tests/022.phpt b/ext/filter/tests/022.phpt index d8d118540e..91aca3e632 100644 --- a/ext/filter/tests/022.phpt +++ b/ext/filter/tests/022.phpt @@ -10,10 +10,10 @@ var_dump(filter_var("a[!@#$%^&*()@a@#$%^&*(.com@#$%^&*(", FILTER_SANITIZE_EMAIL) var_dump(filter_var("white space here \ \ \" som more", FILTER_SANITIZE_EMAIL)); var_dump(filter_var("", FILTER_SANITIZE_EMAIL)); var_dump(filter_var("123456789000000", FILTER_SANITIZE_EMAIL)); - + echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(5) "a@b.c" string(30) "a[!@#$%^&*@a@#$%^&*.com@#$%^&*" string(21) "whitespaceheresommore" diff --git a/ext/filter/tests/023.phpt b/ext/filter/tests/023.phpt index f8d4137bf0..577239a882 100644 --- a/ext/filter/tests/023.phpt +++ b/ext/filter/tests/023.phpt @@ -10,10 +10,10 @@ var_dump(filter_var("a[!@#<b>$%^&*()@a@#$%^&*(.<br>com@#$%^&*(", FILTER_UNSAFE_R var_dump(filter_var("white space here \ \ \" some more", FILTER_UNSAFE_RAW, FILTER_FLAG_ENCODE_AMP)); var_dump(filter_var("", FILTER_UNSAFE_RAW, FILTER_FLAG_ENCODE_AMP)); var_dump(filter_var(" 123456789000000 <qwertyuiop> ", FILTER_UNSAFE_RAW, FILTER_FLAG_ENCODE_AMP)); - + echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(18) "}"<p>test para</p>" string(53) "a[!@#<b>$%^&*()@a@#$%^&*(.<br>com@#$%^&*(" string(32) "white space here \ \ " some more" diff --git a/ext/filter/tests/024.phpt b/ext/filter/tests/024.phpt index 7d7349fcd4..026a90a5bd 100644 --- a/ext/filter/tests/024.phpt +++ b/ext/filter/tests/024.phpt @@ -12,7 +12,7 @@ var_dump(filter_var("!@#$%^&*()QWERTYUIOP{ASDFGHJKL:\"ZXCVBNM<>?", FILTER_SANITI echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(26) "%22%3Cbr%3Eblah%3C%2Fph%3E" string(0) "" string(23) "%20%20text%20here%20%20" diff --git a/ext/filter/tests/025.phpt b/ext/filter/tests/025.phpt index df8c3737bf..fc04918357 100644 --- a/ext/filter/tests/025.phpt +++ b/ext/filter/tests/025.phpt @@ -15,7 +15,7 @@ var_dump(filter_var(".", FILTER_SANITIZE_STRING)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(0) "" string(0) "" string(12) "!@#$%^&*()'"" diff --git a/ext/filter/tests/026.phpt b/ext/filter/tests/026.phpt index 7cfc557fcb..caab24c840 100644 --- a/ext/filter/tests/026.phpt +++ b/ext/filter/tests/026.phpt @@ -19,7 +19,7 @@ var_dump(filter_var("", FILTER_SANITIZE_STRIPPED, FILTER_FLAG_STRIP_HIGH)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(40) "Let me see you Stripped down to the bone" string(11) "!@#$%^&*()>" string(0) "" diff --git a/ext/filter/tests/027.phpt b/ext/filter/tests/027.phpt index 759030a643..b5a85cf852 100644 --- a/ext/filter/tests/027.phpt +++ b/ext/filter/tests/027.phpt @@ -19,7 +19,7 @@ var_dump(filter_var("", FILTER_SANITIZE_ENCODED, FILTER_FLAG_ENCODE_HIGH)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(75) "%3F%3E%3C%21%40%23%24%25%5E%26%2A%28%29%7D%7B%7EQwertyuilfdsasdfgmnbvcxcvbn" string(17) "%3Cdata%26sons%3E" string(0) "" diff --git a/ext/filter/tests/028.phpt b/ext/filter/tests/028.phpt index c0ab16fe83..f88a628252 100644 --- a/ext/filter/tests/028.phpt +++ b/ext/filter/tests/028.phpt @@ -22,7 +22,7 @@ var_dump(filter_var("кириллица", FILTER_SANITIZE_SPECIAL_CHARS, FILTER_ echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(55) "?><!@#$%^&*()}{~Qwertyuilfdsasdfgmnbvcxcvbn" string(23) "<data&sons>" string(0) "" diff --git a/ext/filter/tests/029.phpt b/ext/filter/tests/029.phpt index c1ede74ab0..14b516c35a 100644 --- a/ext/filter/tests/029.phpt +++ b/ext/filter/tests/029.phpt @@ -9,7 +9,7 @@ filter_var() and FILTER_CALLBACK function test($var) { return strtoupper($var); } - + var_dump(filter_var("data", FILTER_CALLBACK, array("options"=>"test"))); var_dump(filter_var("~!@#$%^&*()_QWERTYUIOPASDFGHJKLZXCVBNM<>>?\"}{:", FILTER_CALLBACK, array("options"=>"test"))); var_dump(filter_var("", FILTER_CALLBACK, array("options"=>"test"))); @@ -31,7 +31,7 @@ var_dump(filter_var("", FILTER_CALLBACK, array("options"=>array("test_class","te /* empty function without return value */ function test1($var) { } - + var_dump(filter_var("data", FILTER_CALLBACK, array("options"=>"test1"))); var_dump(filter_var("~!@#$%^&*()_QWERTYUIOPASDFGHJKLZXCVBNM<>>?\"}{:", FILTER_CALLBACK, array("options"=>"test1"))); var_dump(filter_var("", FILTER_CALLBACK, array("options"=>"test1"))); @@ -40,7 +40,7 @@ var_dump(filter_var("", FILTER_CALLBACK, array("options"=>"test1"))); function test2(&$var) { $var = 1; } - + var_dump(filter_var("data", FILTER_CALLBACK, array("options"=>"test2"))); var_dump(filter_var("~!@#$%^&*()_QWERTYUIOPASDFGHJKLZXCVBNM<>>?\"}{:", FILTER_CALLBACK, array("options"=>"test2"))); var_dump(filter_var("", FILTER_CALLBACK, array("options"=>"test2"))); @@ -49,7 +49,7 @@ var_dump(filter_var("", FILTER_CALLBACK, array("options"=>"test2"))); function test3(&$var) { unset($var); } - + var_dump(filter_var("data", FILTER_CALLBACK, array("options"=>"test3"))); var_dump(filter_var("~!@#$%^&*()_QWERTYUIOPASDFGHJKLZXCVBNM<>>?\"}{:", FILTER_CALLBACK, array("options"=>"test3"))); var_dump(filter_var("", FILTER_CALLBACK, array("options"=>"test3"))); @@ -59,7 +59,7 @@ function test4(&$var) { unset($var); return 1; } - + var_dump(filter_var("data", FILTER_CALLBACK, array("options"=>"test4"))); /* thrown exception in the callback */ @@ -75,7 +75,7 @@ try { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(4) "DATA" string(46) "~!@#$%^&*()_QWERTYUIOPASDFGHJKLZXCVBNM<>>?"}{:" string(0) "" diff --git a/ext/filter/tests/030.phpt b/ext/filter/tests/030.phpt index c5af15e152..086c4c2886 100644 --- a/ext/filter/tests/030.phpt +++ b/ext/filter/tests/030.phpt @@ -23,22 +23,22 @@ $ipv6_test = array( "0:0:0:0:0:0:0:13.1.68.3" => false, "::13.1.68.3" => true, "::FFFF:129.144.52.38" => true, - + "1:2:3:4:5:6::129.144.52.38" => false, "::1:2:3:4:5:6:129.144.52.38" => false, "1:2:3::4:5:6:129.144.52.38" => false, - + "1:2:3:4::5:6:7:8" => false, "::1:2:3:4:5:6:7" => true, "::1:2:3:4:5:6:7:8" => false, "1:2:3:4:5:6:7::" => true, "1:2:3:4:5:6:7:8::" => false, "1:2:3:4:5:6:7::8" => false, - + "1:2:3:4:5:6:7:8g" => false, "1:2:3:4:5:6:7:g" => false, "1:2:3:4:5g:6:7:8" => false, - + 'a:b:c:d:e::1.2.3.4' => true, '::0:a:b:c:d:e:f' => true, '0:a:b:c:d:e:f::' => true, @@ -53,12 +53,12 @@ foreach ($ipv6_test as $ip => $exp) { $out = filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6); $out = (int) ($out === false ? 0 : 1); if ($exp != $out) { - echo "$ip failed (expected ", $exp?"true":"false", ", got ", + echo "$ip failed (expected ", $exp?"true":"false", ", got ", $out?"true":"false", ")\n"; } } echo "Ok\n"; ?> ---EXPECT-- +--EXPECT-- Ok diff --git a/ext/filter/tests/033.phpt b/ext/filter/tests/033.phpt index a899493161..da7f390983 100644 --- a/ext/filter/tests/033.phpt +++ b/ext/filter/tests/033.phpt @@ -9,7 +9,7 @@ default_charset=UTF-8 <?php include dirname(__FILE__) . '/033_run.inc'; ?> ---EXPECT-- +--EXPECT-- int 1 123 boolean 1 float 1 123 diff --git a/ext/filter/tests/034.phpt b/ext/filter/tests/034.phpt index 37481813a9..759420af41 100644 --- a/ext/filter/tests/034.phpt +++ b/ext/filter/tests/034.phpt @@ -29,5 +29,5 @@ foreach($booleans as $val=>$exp) { } echo "Ok."; ?> ---EXPECT-- +--EXPECT-- Ok. diff --git a/ext/filter/tests/039.phpt b/ext/filter/tests/039.phpt index ae883db3e3..501414deee 100644 --- a/ext/filter/tests/039.phpt +++ b/ext/filter/tests/039.phpt @@ -49,7 +49,7 @@ var_dump($a, $b); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- -- (1) Warning: filter_var_array() expects parameter 1 to be array, null given in %s on line %d diff --git a/ext/filter/tests/040.phpt b/ext/filter/tests/040.phpt index 1d578a4f13..d77b33135e 100644 --- a/ext/filter/tests/040.phpt +++ b/ext/filter/tests/040.phpt @@ -24,7 +24,7 @@ var_dump(filter_has_var("", "cc")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: filter_has_var() expects exactly 2 parameters, 0 given in %s on line %d bool(false) bool(false) diff --git a/ext/filter/tests/041.phpt b/ext/filter/tests/041.phpt index 0a2e3f0a11..febcbfe362 100644 --- a/ext/filter/tests/041.phpt +++ b/ext/filter/tests/041.phpt @@ -8,7 +8,7 @@ filter.default_flags=0 --COOKIE-- abc=dir; def=true; abc=root; xyz="foo bar"; --FILE-- -<?php +<?php var_dump($_COOKIE); var_dump(filter_has_var(INPUT_COOKIE, "abc")); var_dump(filter_input(INPUT_COOKIE, "abc")); diff --git a/ext/filter/tests/042.phpt b/ext/filter/tests/042.phpt index 08f4dd633a..4d5ec34158 100644 --- a/ext/filter/tests/042.phpt +++ b/ext/filter/tests/042.phpt @@ -3,7 +3,7 @@ Combination of strip & sanitize filters --SKIPIF-- <?php if (!extension_loaded("filter")) die("skip"); ?> --FILE-- -<?php +<?php $var = 'XYZ< script>alert(/ext/filter+bypass/);< /script>ABC'; $a = filter_var($var, FILTER_SANITIZE_STRING, array("flags" => FILTER_FLAG_STRIP_LOW)); echo $a . "\n"; diff --git a/ext/filter/tests/043.phpt b/ext/filter/tests/043.phpt index 92ac0517d1..b889e35476 100644 --- a/ext/filter/tests/043.phpt +++ b/ext/filter/tests/043.phpt @@ -3,7 +3,7 @@ Character encoding test --SKIPIF-- <?php if (!extension_loaded("filter")) die("skip"); ?> --FILE-- -<?php +<?php $flags = FILTER_FLAG_ENCODE_AMP|FILTER_FLAG_ENCODE_LOW|FILTER_FLAG_ENCODE_HIGH; for ($i = 0; $i < 256; $i++) { diff --git a/ext/filter/tests/044.phpt b/ext/filter/tests/044.phpt index ff4689381d..c456d473bb 100644 --- a/ext/filter/tests/044.phpt +++ b/ext/filter/tests/044.phpt @@ -5,7 +5,7 @@ Integer validation with spaces --INI-- precision=14 --FILE-- -<?php +<?php $vals = array( " ", diff --git a/ext/filter/tests/045.phpt b/ext/filter/tests/045.phpt index ad8f47ec9a..8fb934c2f0 100644 --- a/ext/filter/tests/045.phpt +++ b/ext/filter/tests/045.phpt @@ -4,7 +4,7 @@ Options must not be changed by filter_var() <?php if (!extension_loaded("filter")) die("skip"); ?> --FILE-- <?php -$a = array("flags"=>(string)FILTER_FLAG_ALLOW_HEX, "options" => array("min_range"=>"0", "max_range"=>"1024")); +$a = array("flags"=>(string)FILTER_FLAG_ALLOW_HEX, "options" => array("min_range"=>"0", "max_range"=>"1024")); $ret = filter_var("0xff", FILTER_VALIDATE_INT, $a); echo ($ret === 255 && $a["options"]["min_range"] === "0")?"ok\n":"bug\n"; echo ($ret === 255 && $a["options"]["max_range"] === "1024")?"ok\n":"bug\n"; diff --git a/ext/filter/tests/055.phpt b/ext/filter/tests/055.phpt index 688dbb2b54..28f94fe408 100644 --- a/ext/filter/tests/055.phpt +++ b/ext/filter/tests/055.phpt @@ -26,7 +26,7 @@ foreach ($values as $value) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(17) "01-23-45-67-89-ab" string(17) "01-23-45-67-89-ab" bool(false) diff --git a/ext/filter/tests/056.phpt b/ext/filter/tests/056.phpt index 4a27a9fa10..74f5a2a011 100644 --- a/ext/filter/tests/056.phpt +++ b/ext/filter/tests/056.phpt @@ -39,7 +39,7 @@ var_dump(filter_var('test._example.com', FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOS echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(11) "example.com" string(71) "www.thelongestdomainnameintheworldandthensomeandthensomemoreandmore.com" bool(false) diff --git a/ext/filter/tests/PMOPB45.phpt b/ext/filter/tests/PMOPB45.phpt index 532eb219d3..a403b3c6e7 100644 --- a/ext/filter/tests/PMOPB45.phpt +++ b/ext/filter/tests/PMOPB45.phpt @@ -7,5 +7,5 @@ PMOPB-45-2007:PHP ext/filter Email Validation Vulnerability $var = "test@example.com\n"; var_dump(filter_var($var, FILTER_VALIDATE_EMAIL)); ?> ---EXPECT-- +--EXPECT-- bool(false) diff --git a/ext/filter/tests/bug39846.phpt b/ext/filter/tests/bug39846.phpt index 57407f1082..3beeaf8920 100644 --- a/ext/filter/tests/bug39846.phpt +++ b/ext/filter/tests/bug39846.phpt @@ -7,6 +7,6 @@ Bug #39846 (ipv4 trailing data validation) var_dump(filter_var('192.168.1.100random-text-here', FILTER_VALIDATE_IP)); var_dump(filter_var("192.168.1.155\0foo", FILTER_VALIDATE_IP)); ?> ---EXPECT-- +--EXPECT-- bool(false) bool(false) diff --git a/ext/filter/tests/bug44445.phpt b/ext/filter/tests/bug44445.phpt index 36a8641419..a8dcc046ec 100644 --- a/ext/filter/tests/bug44445.phpt +++ b/ext/filter/tests/bug44445.phpt @@ -7,6 +7,6 @@ Bug #44445 (email validator does not handle domains starting/ending with a -) var_dump(filter_var("foo@-foo.com",FILTER_VALIDATE_EMAIL)); var_dump(filter_var("foo@foo-.com",FILTER_VALIDATE_EMAIL)); ?> ---EXPECT-- +--EXPECT-- bool(false) bool(false) diff --git a/ext/filter/tests/bug46973.phpt b/ext/filter/tests/bug46973.phpt index 8c5d9db910..974e14567c 100644 --- a/ext/filter/tests/bug46973.phpt +++ b/ext/filter/tests/bug46973.phpt @@ -8,7 +8,7 @@ Bug #46973 (IPv6 address filter rejects valid address) var_dump(filter_var('1fff::a88:85a3::172.31.128.1', FILTER_VALIDATE_IP,FILTER_FLAG_IPV6)); var_dump(filter_var('3ffe:6a88:85a3:08d3:1319:8a2e:0370:7344', FILTER_VALIDATE_IP,FILTER_FLAG_IPV6)); var_dump(filter_var('1fff::a88:85a3::172.31.128.1', FILTER_VALIDATE_IP,FILTER_FLAG_IPV6)); - + ?> --EXPECT-- bool(false) diff --git a/ext/filter/tests/bug47435.phpt b/ext/filter/tests/bug47435.phpt index 9388679ebb..f192c76a0b 100644 --- a/ext/filter/tests/bug47435.phpt +++ b/ext/filter/tests/bug47435.phpt @@ -19,7 +19,7 @@ var_dump(filter_var("5f::1", FILTER_VALIDATE_IP, FILTER_FLAG_IPV6 | FILTER_FLAG_ var_dump(filter_var("3ff3::1", FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)); var_dump(filter_var("3ff3::1", FILTER_VALIDATE_IP, FILTER_FLAG_IPV6 | FILTER_FLAG_NO_RES_RANGE)); ?> ---EXPECT-- +--EXPECT-- string(7) "FC00::1" bool(false) string(2) "::" diff --git a/ext/filter/tests/bug49274.phpt b/ext/filter/tests/bug49274.phpt index c9141a3956..ff2a4a4ea4 100644 --- a/ext/filter/tests/bug49274.phpt +++ b/ext/filter/tests/bug49274.phpt @@ -6,5 +6,5 @@ <?php var_dump(filter_var(new stdClass, FILTER_VALIDATE_EMAIL)); ?> ---EXPECT-- +--EXPECT-- bool(false) diff --git a/ext/filter/tests/bug50158.phpt b/ext/filter/tests/bug50158.phpt index 8b29e72b2d..1a9c3b1ad2 100644 --- a/ext/filter/tests/bug50158.phpt +++ b/ext/filter/tests/bug50158.phpt @@ -5,17 +5,17 @@ Bug #50158 (FILTER_VALIDATE_EMAIL fails with valid addresses containing = or ?) --FILE-- <?php -$email_address = "test=mail@example.com"; -var_dump(filter_var($email_address, FILTER_VALIDATE_EMAIL)); - -$email_address = "test-mail@example.com"; -var_dump(filter_var($email_address, FILTER_VALIDATE_EMAIL)); - -$email_address = "test+mail@example.com"; -var_dump(filter_var($email_address, FILTER_VALIDATE_EMAIL)); +$email_address = "test=mail@example.com"; +var_dump(filter_var($email_address, FILTER_VALIDATE_EMAIL)); -$email_address = "test?mail@example.com"; -var_dump(filter_var($email_address, FILTER_VALIDATE_EMAIL)); +$email_address = "test-mail@example.com"; +var_dump(filter_var($email_address, FILTER_VALIDATE_EMAIL)); + +$email_address = "test+mail@example.com"; +var_dump(filter_var($email_address, FILTER_VALIDATE_EMAIL)); + +$email_address = "test?mail@example.com"; +var_dump(filter_var($email_address, FILTER_VALIDATE_EMAIL)); ?> --EXPECT-- diff --git a/ext/filter/tests/bug50632.phpt b/ext/filter/tests/bug50632.phpt index 2f33b91ff7..3f11202bb1 100644 --- a/ext/filter/tests/bug50632.phpt +++ b/ext/filter/tests/bug50632.phpt @@ -7,5 +7,5 @@ bug 50632, filter_input() does not return default value if the variable does not $foo = filter_input(INPUT_GET, 'foo', FILTER_VALIDATE_INT, array('flags' => FILTER_REQUIRE_SCALAR, 'options' => array('default' => 23))); var_dump($foo); ?> ---EXPECT-- +--EXPECT-- int(23) diff --git a/ext/filter/tests/bug51192.phpt b/ext/filter/tests/bug51192.phpt index 96c67eae1d..16ffeff644 100644 --- a/ext/filter/tests/bug51192.phpt +++ b/ext/filter/tests/bug51192.phpt @@ -7,7 +7,7 @@ bug 51192, FILTER_VALIDATE_URL will invalidate a hostname that includes '-' var_dump(filter_var('http://example.com/path', FILTER_VALIDATE_URL)); var_dump(filter_var('http://exa-mple.com/path', FILTER_VALIDATE_URL)); var_dump(filter_var('http://exa_mple.com/path', FILTER_VALIDATE_URL)); ---EXPECT-- +--EXPECT-- string(23) "http://example.com/path" string(24) "http://exa-mple.com/path" bool(false) diff --git a/ext/filter/tests/bug52929.phpt b/ext/filter/tests/bug52929.phpt index 29332959f7..1b22318818 100644 --- a/ext/filter/tests/bug52929.phpt +++ b/ext/filter/tests/bug52929.phpt @@ -12,7 +12,7 @@ var_dump(filter_var('xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx // An invalid address likely to crash PHP due to stack exhaustion if it goes to // the validation regex. var_dump(filter_var(str_repeat('x', 8000), FILTER_VALIDATE_EMAIL)); ---EXPECT-- +--EXPECT-- string(19) "valid@email.address" bool(false) bool(false) diff --git a/ext/filter/tests/bug53037.phpt b/ext/filter/tests/bug53037.phpt index 4a1e9e318b..82ecc7a75e 100644 --- a/ext/filter/tests/bug53037.phpt +++ b/ext/filter/tests/bug53037.phpt @@ -9,6 +9,6 @@ var_dump( filter_var("", FILTER_DEFAULT, array('flags' => FILTER_FLAG_EMPTY_STRING_NULL)) ); ?> ---EXPECT-- +--EXPECT-- string(0) "" NULL diff --git a/ext/filter/tests/bug53150.phpt b/ext/filter/tests/bug53150.phpt index 4906888bdf..a8030137c3 100644 --- a/ext/filter/tests/bug53150.phpt +++ b/ext/filter/tests/bug53150.phpt @@ -17,7 +17,7 @@ var_dump(filter_var('191.255.0.0', FILTER_VALIDATE_IP)); var_dump(filter_var('191.255.0.0', FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)); ?> ---EXPECT-- +--EXPECT-- string(9) "127.0.0.1" string(3) "::1" bool(false) diff --git a/ext/filter/tests/bug55478.phpt b/ext/filter/tests/bug55478.phpt index 243d7078e7..bbfd50e9b7 100644 --- a/ext/filter/tests/bug55478.phpt +++ b/ext/filter/tests/bug55478.phpt @@ -5,7 +5,7 @@ Bug #55478 (FILTER_VALIDATE_EMAIL fails with internationalized domain name addre --FILE-- <?php $email_address = "test@xn--example--7za.de"; // "example-ä.de" -var_dump(filter_var($email_address, FILTER_VALIDATE_EMAIL)); +var_dump(filter_var($email_address, FILTER_VALIDATE_EMAIL)); ?> ---EXPECT-- +--EXPECT-- string(24) "test@xn--example--7za.de" diff --git a/ext/filter/tests/bug7715.phpt b/ext/filter/tests/bug7715.phpt index b281db4f49..2f7766587d 100644 --- a/ext/filter/tests/bug7715.phpt +++ b/ext/filter/tests/bug7715.phpt @@ -22,7 +22,7 @@ foreach ($data as $val) { } echo "\n"; ?> ---EXPECT-- +--EXPECT-- float(0.23) float(-42) float(42) diff --git a/ext/filter/tests/bug8315.phpt b/ext/filter/tests/bug8315.phpt index 094d82f210..0fce5db3e8 100644 --- a/ext/filter/tests/bug8315.phpt +++ b/ext/filter/tests/bug8315.phpt @@ -10,6 +10,6 @@ var_dump(filter_var($var, FILTER_VALIDATE_INT)); $var="3".chr(0)."foo"; var_dump(filter_var($var, FILTER_VALIDATE_FLOAT)); ?> ---EXPECT-- +--EXPECT-- bool(false) bool(false) diff --git a/ext/filter/tests/callback_closure.phpt b/ext/filter/tests/callback_closure.phpt index e27a31b37e..0ece4ab285 100644 --- a/ext/filter/tests/callback_closure.phpt +++ b/ext/filter/tests/callback_closure.phpt @@ -10,5 +10,5 @@ $callback = function ($var) { $var = "test"; var_dump(filter_var($var, FILTER_CALLBACK, array('options'=> $callback))); ?> ---EXPECT-- +--EXPECT-- string(4) "test" diff --git a/ext/filter/tests/callback_non_modified_var.phpt b/ext/filter/tests/callback_non_modified_var.phpt index f0d557577b..e546fcc89d 100644 --- a/ext/filter/tests/callback_non_modified_var.phpt +++ b/ext/filter/tests/callback_non_modified_var.phpt @@ -10,5 +10,5 @@ function callback($var) { $var = "test"; var_dump(filter_var($var, FILTER_CALLBACK, array('options'=>'callback'))); ?> ---EXPECT-- +--EXPECT-- string(4) "test" diff --git a/ext/gd/tests/001-mb.phpt b/ext/gd/tests/001-mb.phpt index 743df7d2c7..9307450f5b 100644 --- a/ext/gd/tests/001-mb.phpt +++ b/ext/gd/tests/001-mb.phpt @@ -16,7 +16,7 @@ var_dump(imagecreatefrompng($file)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: imagecreatefrompng(%s001私はガラスを食べられます.test): failed to open stream: No such file or directory in %s on line %d bool(false) diff --git a/ext/gd/tests/001.phpt b/ext/gd/tests/001.phpt index b0ac2a398f..039511a558 100644 --- a/ext/gd/tests/001.phpt +++ b/ext/gd/tests/001.phpt @@ -16,7 +16,7 @@ var_dump(imagecreatefrompng($file)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: imagecreatefrompng(%s001.test): failed to open stream: No such file or directory in %s on line %d bool(false) diff --git a/ext/gd/tests/bug38179.phpt b/ext/gd/tests/bug38179.phpt index 8adc389228..07becd0703 100644 --- a/ext/gd/tests/bug38179.phpt +++ b/ext/gd/tests/bug38179.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #38179 (imagecopy from a palette to a truecolor image loses alpha channel) +Bug #38179 (imagecopy from a palette to a truecolor image loses alpha channel) --SKIPIF-- <?php if (!function_exists('imagecopy')) die("skip gd extension not available\n"); diff --git a/ext/gd/tests/bug40764.phpt b/ext/gd/tests/bug40764.phpt index cbe262fe7a..3802094e25 100644 --- a/ext/gd/tests/bug40764.phpt +++ b/ext/gd/tests/bug40764.phpt @@ -1,8 +1,8 @@ --TEST-- Bug #40764 (line thickness not respected for horizontal and vertical lines) --SKIPIF-- -<?php - if (!extension_loaded('gd')) die("skip gd extension not available\n"); +<?php + 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 78a61bec95..ba5950dd15 100644 --- a/ext/gd/tests/bug41442.phpt +++ b/ext/gd/tests/bug41442.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #41442 (imagegd2() under output control) --SKIPIF-- -<?php +<?php if (!extension_loaded('gd')) { die("skip gd extension not available."); } @@ -31,7 +31,7 @@ var_dump(imagecreatefromstring($str2)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- resource(%d) of type (gd) resource(%d) of type (gd) Done diff --git a/ext/gd/tests/bug48555.phpt b/ext/gd/tests/bug48555.phpt index d378aafd8e..43e14db05f 100644 --- a/ext/gd/tests/bug48555.phpt +++ b/ext/gd/tests/bug48555.phpt @@ -21,7 +21,7 @@ var_dump($with_line_break); if ($with_line_break==$without_line_break) { echo "with line break == without line break".PHP_EOL; } else { - echo "with line break != without line break".PHP_EOL; + echo "with line break != without line break".PHP_EOL; } ?> diff --git a/ext/gd/tests/bug50194.phpt b/ext/gd/tests/bug50194.phpt index f68165be42..0ccab83063 100644 --- a/ext/gd/tests/bug50194.phpt +++ b/ext/gd/tests/bug50194.phpt @@ -13,7 +13,7 @@ require_once __DIR__ . DIRECTORY_SEPARATOR . 'func.inc'; $im = imagecreatetruecolor(240, 55); $background = imagecolorallocatealpha($im, 60, 60, 60, 0); // no tranparency $black = imagecolorallocate($im, 0, 0, 0); -imagealphablending($im, false); +imagealphablending($im, false); imagefilledrectangle($im, 0, 0, 239, 54, $background); $text = 'Testing ... '; $font = __DIR__ . DIRECTORY_SEPARATOR . 'Tuffy.ttf'; diff --git a/ext/gd/tests/bug53156.phpt b/ext/gd/tests/bug53156.phpt index ceb37c13c4..63482217a8 100644 --- a/ext/gd/tests/bug53156.phpt +++ b/ext/gd/tests/bug53156.phpt @@ -12,7 +12,7 @@ if (!GD_BUNDLED && version_compare(GD_VERSION, '2.3', '<')) { function draw_and_check_pixel($x, $y) { global $img, $black, $red; - + echo (imagecolorat($img, $x, $y) === $black) ? '+' : '-'; imagesetpixel($img, $x, $y, $red); } @@ -20,7 +20,7 @@ function draw_and_check_pixel($x, $y) function draw_and_check_rectangle($x1, $y1, $x2, $y2) { global $img, $black; - + echo 'Rectangle: '; imagerectangle($img, $x1, $y1, $x2, $y2, $black); $x = ($x1 + $x2) / 2; diff --git a/ext/gd/tests/bug72298.phpt b/ext/gd/tests/bug72298.phpt index 7fba241ed1..512aa8b4c1 100644 --- a/ext/gd/tests/bug72298.phpt +++ b/ext/gd/tests/bug72298.phpt @@ -6,7 +6,7 @@ Bug #72298: pass2_no_dither out-of-bounds access ?> --FILE-- <?php -$img = imagecreatetruecolor (1 , 1); +$img = imagecreatetruecolor (1 , 1); imagecolortransparent($img, 0); imagetruecolortopalette($img, false, 4); ?> diff --git a/ext/gd/tests/bug72339.phpt b/ext/gd/tests/bug72339.phpt index 20daea8106..5f8a96d552 100644 --- a/ext/gd/tests/bug72339.phpt +++ b/ext/gd/tests/bug72339.phpt @@ -31,7 +31,7 @@ if ($im) { unlink($fname); ?> ---EXPECTF-- +--EXPECTF-- Warning: imagecreatefromgd2(): product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully in %sbug72339.php on line %d diff --git a/ext/gd/tests/bug72697.phpt b/ext/gd/tests/bug72697.phpt index 6110385fcb..d243bd2f14 100644 --- a/ext/gd/tests/bug72697.phpt +++ b/ext/gd/tests/bug72697.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #72697: select_colors write out-of-bounds --SKIPIF-- -<?php +<?php if (!function_exists("imagecreatetruecolor")) die("skip"); if (PHP_INT_MAX !== 9223372036854775807) die("skip for 64-bit long systems only"); ?> diff --git a/ext/gd/tests/bug72730.phpt b/ext/gd/tests/bug72730.phpt index e7c13cb5e9..a15252ea41 100644 --- a/ext/gd/tests/bug72730.phpt +++ b/ext/gd/tests/bug72730.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #72730: imagegammacorrect allows arbitrary write access --SKIPIF-- -<?php +<?php if (!function_exists("imagecreatetruecolor")) die("skip"); ?> --FILE-- diff --git a/ext/gd/tests/copypalette.phpt b/ext/gd/tests/copypalette.phpt index ec00c030a4..3e29b42a43 100644 --- a/ext/gd/tests/copypalette.phpt +++ b/ext/gd/tests/copypalette.phpt @@ -20,7 +20,7 @@ for ($i=0; $i<256; $i++) { if ($c['red']!=$i || $c['green']!=$i || $c['blue']!=$i) { $failed = true; break; - } + } } echo "copy palette 255 colors: "; echo $failed ? 'failed' : 'ok'; @@ -34,7 +34,7 @@ imagepalettecopy($im2, $im); $c = imagecolorsforindex($im2, 0); if ($c['red']!=0 || $c['green']!=0 || $c['blue']!=0 || $c['alpha']!=100) { $failed = true; -} +} echo 'copy palette 1 color and alpha: '; echo $failed ? 'failed' : 'ok'; echo "\n"; diff --git a/ext/gd/tests/gd_info_basic.phpt b/ext/gd/tests/gd_info_basic.phpt index 61a2304e8f..b027462a41 100644 --- a/ext/gd/tests/gd_info_basic.phpt +++ b/ext/gd/tests/gd_info_basic.phpt @@ -1,7 +1,7 @@ --TEST-- gd_info() --SKIPIF-- -<?php +<?php if (!function_exists('gd_info')) { die('skip gd_info() not available'); } @@ -15,9 +15,9 @@ gd_info() * Alias to functions: */ echo "basic test of gd_info() function\n"; - + var_dump(gd_info()); - + echo "\nDone\n"; ?> --EXPECTF-- diff --git a/ext/gd/tests/github_bug_215.phpt b/ext/gd/tests/github_bug_215.phpt index 8657f95d76..1426186971 100644 --- a/ext/gd/tests/github_bug_215.phpt +++ b/ext/gd/tests/github_bug_215.phpt @@ -1,15 +1,15 @@ ---TEST-- +--TEST-- Github #215 (imagefilltoborder stack overflow when invalid pallete index used) ---SKIPIF-- -<?php -if (!extension_loaded("gd")) die("skip GD not present"); +--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"); } -?> +?> --FILE-- <?php -$image = imagecreate( 10, 10 ); +$image = imagecreate( 10, 10 ); $bgd = imagecolorallocate( $image, 0, 0, 0 ); $border = imagecolorallocate( $image, 255, 0, 0 ); $fillcolor = imagecolorallocate( $image, 255, 0, 0 ); @@ -37,8 +37,8 @@ imagefilltoborder( $image, 0,0, $border+10, $fillcolor+10); echo "#5 passes"; -?> ---EXPECT-- +?> +--EXPECT-- #1 passes #2 passes #3 passes diff --git a/ext/gd/tests/imageantialias_error1.phpt b/ext/gd/tests/imageantialias_error1.phpt index 53fe0cc66a..8a9d5315a6 100644 --- a/ext/gd/tests/imageantialias_error1.phpt +++ b/ext/gd/tests/imageantialias_error1.phpt @@ -4,7 +4,7 @@ Testing wrong parameter resource in imageantialias() of GD library Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imageantialias_error2.phpt b/ext/gd/tests/imageantialias_error2.phpt index 6bde8fe54a..7971e90cae 100644 --- a/ext/gd/tests/imageantialias_error2.phpt +++ b/ext/gd/tests/imageantialias_error2.phpt @@ -4,7 +4,7 @@ Testing wrong parameter passing in imageantialias() of GD library Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagearc_basic.phpt b/ext/gd/tests/imagearc_basic.phpt index b4761f2399..0cbacc33dd 100644 --- a/ext/gd/tests/imagearc_basic.phpt +++ b/ext/gd/tests/imagearc_basic.phpt @@ -4,7 +4,7 @@ Testing imagearc() of GD library Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagearc_error1.phpt b/ext/gd/tests/imagearc_error1.phpt index 1e63406832..5437f3da67 100644 --- a/ext/gd/tests/imagearc_error1.phpt +++ b/ext/gd/tests/imagearc_error1.phpt @@ -4,7 +4,7 @@ Testing wrong param passing imagearc() of GD library Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagearc_variation1.phpt b/ext/gd/tests/imagearc_variation1.phpt index 1b36eedf29..f84d8d76ec 100644 --- a/ext/gd/tests/imagearc_variation1.phpt +++ b/ext/gd/tests/imagearc_variation1.phpt @@ -4,7 +4,7 @@ Testing passing negative end angle to imagearc() of GD library Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagearc_variation2.phpt b/ext/gd/tests/imagearc_variation2.phpt index 40227c3750..d4b4afefcd 100644 --- a/ext/gd/tests/imagearc_variation2.phpt +++ b/ext/gd/tests/imagearc_variation2.phpt @@ -4,7 +4,7 @@ Testing passing negative start angle to imagearc() of GD library Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagechar_basic.phpt b/ext/gd/tests/imagechar_basic.phpt index f238aabae4..3616f449ec 100644 --- a/ext/gd/tests/imagechar_basic.phpt +++ b/ext/gd/tests/imagechar_basic.phpt @@ -4,7 +4,7 @@ Testing imagechar() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagechar_error1.phpt b/ext/gd/tests/imagechar_error1.phpt index 373d3042e4..c91a3ec55b 100644 --- a/ext/gd/tests/imagechar_error1.phpt +++ b/ext/gd/tests/imagechar_error1.phpt @@ -4,7 +4,7 @@ Testing error on non-resource parameter 1 of imagechar() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagechar_error2.phpt b/ext/gd/tests/imagechar_error2.phpt index 02a95994f6..1666788ead 100644 --- a/ext/gd/tests/imagechar_error2.phpt +++ b/ext/gd/tests/imagechar_error2.phpt @@ -4,7 +4,7 @@ Testing error on non-image resource parameter 1 of imagechar() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagechar_error3.phpt b/ext/gd/tests/imagechar_error3.phpt index 5fff2013bf..4db74c6198 100644 --- a/ext/gd/tests/imagechar_error3.phpt +++ b/ext/gd/tests/imagechar_error3.phpt @@ -4,7 +4,7 @@ Testing error on non-long parameter 2 of imagechar() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagechar_error4.phpt b/ext/gd/tests/imagechar_error4.phpt index 9220584ae8..469a732759 100644 --- a/ext/gd/tests/imagechar_error4.phpt +++ b/ext/gd/tests/imagechar_error4.phpt @@ -4,7 +4,7 @@ Testing error on non-long parameter 3 of imagechar() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagechar_error5.phpt b/ext/gd/tests/imagechar_error5.phpt index 7ea0e72a82..b01736eadd 100644 --- a/ext/gd/tests/imagechar_error5.phpt +++ b/ext/gd/tests/imagechar_error5.phpt @@ -4,7 +4,7 @@ Testing error on non-long parameter 4 of imagechar() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagechar_error6.phpt b/ext/gd/tests/imagechar_error6.phpt index eaef2f88c2..4ec608a60c 100644 --- a/ext/gd/tests/imagechar_error6.phpt +++ b/ext/gd/tests/imagechar_error6.phpt @@ -4,7 +4,7 @@ Testing error on non-string parameter 5 of imagechar() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagechar_error7.phpt b/ext/gd/tests/imagechar_error7.phpt index 3d847f3410..b2c7d80b70 100644 --- a/ext/gd/tests/imagechar_error7.phpt +++ b/ext/gd/tests/imagechar_error7.phpt @@ -4,7 +4,7 @@ Testing error on non-long parameter 6 of imagechar() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecharup_basic.phpt b/ext/gd/tests/imagecharup_basic.phpt index 50b0a59613..258f8b6e38 100644 --- a/ext/gd/tests/imagecharup_basic.phpt +++ b/ext/gd/tests/imagecharup_basic.phpt @@ -4,7 +4,7 @@ Testing imagecharup() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecharup_error1.phpt b/ext/gd/tests/imagecharup_error1.phpt index e0b3e318a9..aaa2a2a68f 100644 --- a/ext/gd/tests/imagecharup_error1.phpt +++ b/ext/gd/tests/imagecharup_error1.phpt @@ -4,7 +4,7 @@ Testing error on non-resource parameter 1 of imagecharup() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecharup_error2.phpt b/ext/gd/tests/imagecharup_error2.phpt index b78dc9221e..e2db7bb558 100644 --- a/ext/gd/tests/imagecharup_error2.phpt +++ b/ext/gd/tests/imagecharup_error2.phpt @@ -4,7 +4,7 @@ Testing error on non-image resource parameter 1 of imagecharup() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecharup_error3.phpt b/ext/gd/tests/imagecharup_error3.phpt index 13f716b133..8c614520bb 100644 --- a/ext/gd/tests/imagecharup_error3.phpt +++ b/ext/gd/tests/imagecharup_error3.phpt @@ -4,7 +4,7 @@ Testing error on non-long parameter 2 of imagecharup() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecharup_error4.phpt b/ext/gd/tests/imagecharup_error4.phpt index b403d0eec7..62de44f842 100644 --- a/ext/gd/tests/imagecharup_error4.phpt +++ b/ext/gd/tests/imagecharup_error4.phpt @@ -4,7 +4,7 @@ Testing error on non-long parameter 3 of imagecharup() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecharup_error5.phpt b/ext/gd/tests/imagecharup_error5.phpt index a4a7c88100..42661263d0 100644 --- a/ext/gd/tests/imagecharup_error5.phpt +++ b/ext/gd/tests/imagecharup_error5.phpt @@ -4,7 +4,7 @@ Testing error on non-long parameter 4 of imagecharup() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecharup_error6.phpt b/ext/gd/tests/imagecharup_error6.phpt index a1f12f1ea6..c7f40d576c 100644 --- a/ext/gd/tests/imagecharup_error6.phpt +++ b/ext/gd/tests/imagecharup_error6.phpt @@ -4,7 +4,7 @@ Testing error on non-string parameter 5 of imagecharup() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecharup_error7.phpt b/ext/gd/tests/imagecharup_error7.phpt index c10835daae..207154f11c 100644 --- a/ext/gd/tests/imagecharup_error7.phpt +++ b/ext/gd/tests/imagecharup_error7.phpt @@ -4,7 +4,7 @@ Testing error on non-long parameter 6 of imagecharup() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecolorallocate_basic.phpt b/ext/gd/tests/imagecolorallocate_basic.phpt index 22efeb60e9..426350782e 100644 --- a/ext/gd/tests/imagecolorallocate_basic.phpt +++ b/ext/gd/tests/imagecolorallocate_basic.phpt @@ -8,7 +8,7 @@ if(!extension_loaded('gd')) { if(!function_exists('imagecreatetruecolor')) { die('skip imagecreatetruecolor function is not available'); } -?> +?> --FILE-- <?php /* Prototype : int imagecolorallocate(resource im, int red, int green, int blue) diff --git a/ext/gd/tests/imagecolorallocate_error.phpt b/ext/gd/tests/imagecolorallocate_error.phpt index 6c685b2c98..518eac74d6 100644 --- a/ext/gd/tests/imagecolorallocate_error.phpt +++ b/ext/gd/tests/imagecolorallocate_error.phpt @@ -5,7 +5,7 @@ Test imagecolorallocate() function : error conditions if(!extension_loaded('gd')) { die('skip gd extension is not loaded'); } -?> +?> --FILE-- <?php /* Prototype : int imagecolorallocate(resource im, int red, int green, int blue) diff --git a/ext/gd/tests/imagecolorallocate_variation1.phpt b/ext/gd/tests/imagecolorallocate_variation1.phpt index a9e13907aa..b5c5823e8e 100644 --- a/ext/gd/tests/imagecolorallocate_variation1.phpt +++ b/ext/gd/tests/imagecolorallocate_variation1.phpt @@ -5,7 +5,7 @@ Test imagecolorallocate() function : usage variations - passing different data if(!extension_loaded('gd')) { die('skip gd extension is not loaded'); } -?> +?> --FILE-- <?php /* Prototype : int imagecolorallocate(resource im, int red, int green, int blue) @@ -70,7 +70,7 @@ $values = array( 'int indexed array' => $index_array, 'associative array' => $assoc_array, 'nested arrays' => array('foo', $index_array, $assoc_array), - + // null data 'uppercase NULL' => NULL, 'lowercase null' => null, @@ -100,7 +100,7 @@ $values = array( // unset data 'unset var' => @$unset_var, - + //resource "file resource" => $fp ); diff --git a/ext/gd/tests/imagecolorallocate_variation2.phpt b/ext/gd/tests/imagecolorallocate_variation2.phpt index 9f631af210..aad888e584 100644 --- a/ext/gd/tests/imagecolorallocate_variation2.phpt +++ b/ext/gd/tests/imagecolorallocate_variation2.phpt @@ -9,7 +9,7 @@ if(!function_exists('imagecreatetruecolor')) { die('skip imagecreatetruecolor function is not available'); } if (PHP_INT_SIZE != 8) die('skip 64-bit only'); -?> +?> --FILE-- <?php /* Prototype : int imagecolorallocate(resource im, int red, int green, int blue) @@ -65,7 +65,7 @@ $values = array( 'int indexed array' => $index_array, 'associative array' => $assoc_array, 'nested arrays' => array('foo', $index_array, $assoc_array), - + // null data 'uppercase NULL' => NULL, 'lowercase null' => null, @@ -95,7 +95,7 @@ $values = array( // unset data 'unset var' => @$unset_var, - + //resource "file resource" => $fp ); diff --git a/ext/gd/tests/imagecolorallocate_variation3.phpt b/ext/gd/tests/imagecolorallocate_variation3.phpt index 76bb4ba360..62fafb3c89 100644 --- a/ext/gd/tests/imagecolorallocate_variation3.phpt +++ b/ext/gd/tests/imagecolorallocate_variation3.phpt @@ -8,7 +8,7 @@ if(!extension_loaded('gd')) { if(!function_exists('imagecreatetruecolor')) { die('skip imagecreatetruecolor function is not available'); } -?> +?> --FILE-- <?php /* Prototype : imagecolorallocate(resource im, int red, int green, int blue) @@ -64,7 +64,7 @@ $values = array( 'int indexed array' => $index_array, 'associative array' => $assoc_array, 'nested arrays' => array('foo', $index_array, $assoc_array), - + // null data 'uppercase NULL' => NULL, 'lowercase null' => null, @@ -94,7 +94,7 @@ $values = array( // unset data 'unset var' => @$unset_var, - + //resource "file resource" => $fp ); diff --git a/ext/gd/tests/imagecolorallocate_variation4.phpt b/ext/gd/tests/imagecolorallocate_variation4.phpt index d1e1f45513..18a9172be5 100644 --- a/ext/gd/tests/imagecolorallocate_variation4.phpt +++ b/ext/gd/tests/imagecolorallocate_variation4.phpt @@ -64,7 +64,7 @@ $values = array( 'int indexed array' => $index_array, 'associative array' => $assoc_array, 'nested arrays' => array('foo', $index_array, $assoc_array), - + // null data 'uppercase NULL' => NULL, 'lowercase null' => null, @@ -94,7 +94,7 @@ $values = array( // unset data 'unset var' => @$unset_var, - + //resource "file resource" => $fp ); diff --git a/ext/gd/tests/imagecolorallocate_variation5.phpt b/ext/gd/tests/imagecolorallocate_variation5.phpt index 27cdaeb5f7..43b51216c1 100644 --- a/ext/gd/tests/imagecolorallocate_variation5.phpt +++ b/ext/gd/tests/imagecolorallocate_variation5.phpt @@ -28,7 +28,7 @@ $values = array( "Octal 012" => 012, "Octal -012" => -012, "Octal 0377" => 0377, - + // hexa-decimal integer data "Hexa-decimal 0x0" => 0x0, "Hexa-decimal 0xA" => 0xA, diff --git a/ext/gd/tests/imagecolorallocate_variation6.phpt b/ext/gd/tests/imagecolorallocate_variation6.phpt index 48b096cb26..ee74ee974e 100644 --- a/ext/gd/tests/imagecolorallocate_variation6.phpt +++ b/ext/gd/tests/imagecolorallocate_variation6.phpt @@ -20,10 +20,10 @@ echo "*** Testing imagecolorallocate() : usage variations ***\n"; $values = array( //Decimal integera data "Decimal 256" => 256, - + // octal integer data "Octal 0400" => 0400, - + // hexa-decimal integer data "Hexa-decimal 0x100" => 0x100 ); diff --git a/ext/gd/tests/imagecolorallocatealpha_basic.phpt b/ext/gd/tests/imagecolorallocatealpha_basic.phpt index f0d1e45e6e..536e2cf842 100644 --- a/ext/gd/tests/imagecolorallocatealpha_basic.phpt +++ b/ext/gd/tests/imagecolorallocatealpha_basic.phpt @@ -3,7 +3,7 @@ Testing imagecolorallocatealpha() --CREDITS-- Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- -<?php +<?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"); diff --git a/ext/gd/tests/imagecolorallocatealpha_error1.phpt b/ext/gd/tests/imagecolorallocatealpha_error1.phpt index a9030248bb..bba9262422 100644 --- a/ext/gd/tests/imagecolorallocatealpha_error1.phpt +++ b/ext/gd/tests/imagecolorallocatealpha_error1.phpt @@ -3,7 +3,7 @@ Testing imagecolorallocatealpha(): Wrong types for parameter 1 --CREDITS-- Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecolorallocatealpha_error2.phpt b/ext/gd/tests/imagecolorallocatealpha_error2.phpt index f1e82b3779..018f243dc4 100644 --- a/ext/gd/tests/imagecolorallocatealpha_error2.phpt +++ b/ext/gd/tests/imagecolorallocatealpha_error2.phpt @@ -3,7 +3,7 @@ Testing imagecolorallocatealpha(): Wrong types for parameter 2 --CREDITS-- Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecolorallocatealpha_error3.phpt b/ext/gd/tests/imagecolorallocatealpha_error3.phpt index 51018f797d..b6afa80e8d 100644 --- a/ext/gd/tests/imagecolorallocatealpha_error3.phpt +++ b/ext/gd/tests/imagecolorallocatealpha_error3.phpt @@ -3,7 +3,7 @@ Testing imagecolorallocatealpha(): Wrong types for parameter 3 --CREDITS-- Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecolorallocatealpha_error4.phpt b/ext/gd/tests/imagecolorallocatealpha_error4.phpt index 4c517e5c37..6003bf18b4 100644 --- a/ext/gd/tests/imagecolorallocatealpha_error4.phpt +++ b/ext/gd/tests/imagecolorallocatealpha_error4.phpt @@ -3,7 +3,7 @@ Testing imagecolorallocatealpha(): Wrong types for parameter 4 --CREDITS-- Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecolorallocatealpha_error5.phpt b/ext/gd/tests/imagecolorallocatealpha_error5.phpt index f1fcc0df73..5c36b9757d 100644 --- a/ext/gd/tests/imagecolorallocatealpha_error5.phpt +++ b/ext/gd/tests/imagecolorallocatealpha_error5.phpt @@ -3,7 +3,7 @@ Testing imagecolorallocatealpha(): Wrong types for parameter 5 --CREDITS-- Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecolordeallocate_basic.phpt b/ext/gd/tests/imagecolordeallocate_basic.phpt index 3c80c690f8..877e8b64c4 100644 --- a/ext/gd/tests/imagecolordeallocate_basic.phpt +++ b/ext/gd/tests/imagecolordeallocate_basic.phpt @@ -4,7 +4,7 @@ Testing imagecolordeallocate() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecolordeallocate_error1.phpt b/ext/gd/tests/imagecolordeallocate_error1.phpt index 6d642d4a26..82460139b6 100644 --- a/ext/gd/tests/imagecolordeallocate_error1.phpt +++ b/ext/gd/tests/imagecolordeallocate_error1.phpt @@ -4,7 +4,7 @@ Testing imagecolordeallocate() of GD library with invalid resource type Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecolordeallocate_error2.phpt b/ext/gd/tests/imagecolordeallocate_error2.phpt index 989e0fd97a..ca880529b8 100644 --- a/ext/gd/tests/imagecolordeallocate_error2.phpt +++ b/ext/gd/tests/imagecolordeallocate_error2.phpt @@ -4,7 +4,7 @@ Testing imagecolordeallocate() of GD library with no resource Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecolordeallocate_error3.phpt b/ext/gd/tests/imagecolordeallocate_error3.phpt index 8000218ade..e9be1ea66a 100644 --- a/ext/gd/tests/imagecolordeallocate_error3.phpt +++ b/ext/gd/tests/imagecolordeallocate_error3.phpt @@ -4,7 +4,7 @@ Testing imagecolordeallocate() of GD library with Out of range intergers (Above) Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecolordeallocate_error4.phpt b/ext/gd/tests/imagecolordeallocate_error4.phpt index 7aaeffebee..22fc2fa3ef 100644 --- a/ext/gd/tests/imagecolordeallocate_error4.phpt +++ b/ext/gd/tests/imagecolordeallocate_error4.phpt @@ -4,7 +4,7 @@ Testing imagecolordeallocate() of GD library with Out of range intergers (Below) Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecolormatch_basic.phpt b/ext/gd/tests/imagecolormatch_basic.phpt index 46e8878d9d..ff59e66b7b 100644 --- a/ext/gd/tests/imagecolormatch_basic.phpt +++ b/ext/gd/tests/imagecolormatch_basic.phpt @@ -4,7 +4,7 @@ Basic test imagecolormatch() of GD library Paulo Alves de Sousa Filho <pspalves [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecolormatch_error1.phpt b/ext/gd/tests/imagecolormatch_error1.phpt index 9750a8b245..5e8d82cc39 100644 --- a/ext/gd/tests/imagecolormatch_error1.phpt +++ b/ext/gd/tests/imagecolormatch_error1.phpt @@ -4,7 +4,7 @@ Send only 1 parameter imagecolormatch() of GD library Paulo Alves de Sousa Filho <pspalves [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecolormatch_error2.phpt b/ext/gd/tests/imagecolormatch_error2.phpt index bdb3c2460e..2240f987df 100644 --- a/ext/gd/tests/imagecolormatch_error2.phpt +++ b/ext/gd/tests/imagecolormatch_error2.phpt @@ -4,7 +4,7 @@ Send not TrueColor to Image 1 parameter imagecolormatch() of GD library Paulo Alves de Sousa Filho <pspalves [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecolormatch_error3.phpt b/ext/gd/tests/imagecolormatch_error3.phpt index 8793e15227..245ebca646 100644 --- a/ext/gd/tests/imagecolormatch_error3.phpt +++ b/ext/gd/tests/imagecolormatch_error3.phpt @@ -4,7 +4,7 @@ Send not TrueColor to Image 1 parameter imagecolormatch() of GD library Paulo Alves de Sousa Filho <pspalves [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecolormatch_error4.phpt b/ext/gd/tests/imagecolormatch_error4.phpt index 0bfe767c2b..4579192571 100644 --- a/ext/gd/tests/imagecolormatch_error4.phpt +++ b/ext/gd/tests/imagecolormatch_error4.phpt @@ -4,7 +4,7 @@ using different image sizes imagecolormatch() of GD library Paulo Alves de Sousa Filho <pspalves [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecolorstotal_basic.phpt b/ext/gd/tests/imagecolorstotal_basic.phpt index 71eddd9ff4..32e4f8a721 100644 --- a/ext/gd/tests/imagecolorstotal_basic.phpt +++ b/ext/gd/tests/imagecolorstotal_basic.phpt @@ -9,7 +9,7 @@ if(!extension_loaded('gd')) { if(!function_exists('imagecolorstotal') || !function_exists('imagecreatefromgif')) { die('skip imagecolorstotal and imagecreatefromgif functions not available in this build'); } -?> +?> --FILE-- <?php /* Prototype : int imagecolorstotal ( resource $image ) diff --git a/ext/gd/tests/imagecolorstotal_error.phpt b/ext/gd/tests/imagecolorstotal_error.phpt index a7f3b95719..59999423ca 100644 --- a/ext/gd/tests/imagecolorstotal_error.phpt +++ b/ext/gd/tests/imagecolorstotal_error.phpt @@ -8,7 +8,7 @@ if(!extension_loaded('gd')) { if(!function_exists('imagecolorstotal')) { die('skip imagecolorstotal function is not available'); } -?> +?> --FILE-- <?php /* Prototype : int imagecolorstotal ( resource $image ) @@ -31,7 +31,7 @@ var_dump( imagecolorstotal($im, $extra_arg) ); echo "\n-- Testing imagecolorstotal() function with a invalid resource\n"; var_dump( imagecolorstotal($im) ); -fclose($im); +fclose($im); ?> ===DONE=== --EXPECTF-- diff --git a/ext/gd/tests/imagecolourstotal_basic.phpt b/ext/gd/tests/imagecolourstotal_basic.phpt index 0db589bdf6..599bfa1ed8 100644 --- a/ext/gd/tests/imagecolourstotal_basic.phpt +++ b/ext/gd/tests/imagecolourstotal_basic.phpt @@ -16,7 +16,7 @@ Felix De Vliegher <felix.devliegher@gmail.com> /* Prototype : int imagecolorstotal(resource im) * Description: Find out the number of colors in an image's palette * Source code: ext/gd/gd.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing imagecolorstotal() : basic functionality ***\n"; diff --git a/ext/gd/tests/imageconvolution_basic.phpt b/ext/gd/tests/imageconvolution_basic.phpt index 972de76f86..be6ff52eaa 100644 --- a/ext/gd/tests/imageconvolution_basic.phpt +++ b/ext/gd/tests/imageconvolution_basic.phpt @@ -4,7 +4,7 @@ Testing imageconvolution() of GD library Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imageconvolution_error1.phpt b/ext/gd/tests/imageconvolution_error1.phpt index 5dc250a85b..7090bf4a57 100644 --- a/ext/gd/tests/imageconvolution_error1.phpt +++ b/ext/gd/tests/imageconvolution_error1.phpt @@ -4,7 +4,7 @@ Testing wrong param passing imageconvolution() of GD library Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imageconvolution_error2.phpt b/ext/gd/tests/imageconvolution_error2.phpt index 5161c198c3..217e3e1547 100644 --- a/ext/gd/tests/imageconvolution_error2.phpt +++ b/ext/gd/tests/imageconvolution_error2.phpt @@ -4,7 +4,7 @@ Testing wrong array size 2x3 in imageconvolution() of GD library Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imageconvolution_error3.phpt b/ext/gd/tests/imageconvolution_error3.phpt index df6b148bd1..5f1ddc95be 100644 --- a/ext/gd/tests/imageconvolution_error3.phpt +++ b/ext/gd/tests/imageconvolution_error3.phpt @@ -4,7 +4,7 @@ Testing wrong array size 3x2 in imageconvolution() of GD library Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecopymerge_basic.phpt b/ext/gd/tests/imagecopymerge_basic.phpt index f324eaedf1..d533209f6d 100644 --- a/ext/gd/tests/imagecopymerge_basic.phpt +++ b/ext/gd/tests/imagecopymerge_basic.phpt @@ -7,7 +7,7 @@ Cleston Viel Vieira de Sousa <cleston [dot] vs [at] gmail [dot] com> Updated by Sean Fraaser <frasmage [at] gmail [dot] com> PHP[tek] 2017 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecopymerge_error.phpt b/ext/gd/tests/imagecopymerge_error.phpt index e43bf69452..90d9c55871 100644 --- a/ext/gd/tests/imagecopymerge_error.phpt +++ b/ext/gd/tests/imagecopymerge_error.phpt @@ -4,7 +4,7 @@ Testing wrong parameter passing imagecopymerge() of GD library Cleston Viel Vieira de Sousa <cleston [dot] vs [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecopymergegray_basic.phpt b/ext/gd/tests/imagecopymergegray_basic.phpt index baad9b43ac..a4e587123f 100644 --- a/ext/gd/tests/imagecopymergegray_basic.phpt +++ b/ext/gd/tests/imagecopymergegray_basic.phpt @@ -4,7 +4,7 @@ Testing imagecopymergegray() of GD library Sean Fraser <frasmage [at] gmail [dot] com> PHP[tek] 2017 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagecopyresampled_basic.phpt b/ext/gd/tests/imagecopyresampled_basic.phpt index edf7ba6548..619e55af15 100644 --- a/ext/gd/tests/imagecopyresampled_basic.phpt +++ b/ext/gd/tests/imagecopyresampled_basic.phpt @@ -1,8 +1,8 @@ --TEST-- imagecopyresampled() --SKIPIF-- -<?php - if (!function_exists('imagecopyresampled')) die('skip imagecopyresampled() not available'); +<?php + if (!function_exists('imagecopyresampled')) die('skip imagecopyresampled() not available'); ?> --FILE-- <?php @@ -10,7 +10,7 @@ imagecopyresampled() /* Prototype : bool imagecopyresampled ( resource $dst_image , resource $src_image , int $dst_x , int $dst_y , int $src_x , int $src_y , int $dst_w , int $dst_h , int $src_w , int $src_h ) * Description: Copy and resize part of an image with resampling. * Source code: ext/standard/image.c - * Alias to functions: + * Alias to functions: */ echo "Simple test of imagecopyresampled() function\n"; @@ -50,14 +50,14 @@ imagepng($image_sml, $dest_sml); list($width, $height) = getimagesize($dest_sml); echo "Size of copy: width=". $width . " height=" . $height . "\n"; -imagedestroy($image_lge); +imagedestroy($image_lge); imagedestroy($image_sml); - -echo "Done\n"; + +echo "Done\n"; ?> --CLEAN-- -<?php +<?php $dest_lge = dirname(realpath(__FILE__)) . '/imagelarge.png'; $dest_sml = dirname(realpath(__FILE__)) . '/imagesmall.png'; @unlink($dest_lge); diff --git a/ext/gd/tests/imagecreatetruecolor_basic.phpt b/ext/gd/tests/imagecreatetruecolor_basic.phpt index e2a5a09fba..2da09cd18b 100644 --- a/ext/gd/tests/imagecreatetruecolor_basic.phpt +++ b/ext/gd/tests/imagecreatetruecolor_basic.phpt @@ -3,7 +3,7 @@ Testing imagecreatetruecolor() of GD library --CREDITS-- Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible"); ?> diff --git a/ext/gd/tests/imagecreatetruecolor_error1.phpt b/ext/gd/tests/imagecreatetruecolor_error1.phpt index 6acce13512..349ed8cad0 100644 --- a/ext/gd/tests/imagecreatetruecolor_error1.phpt +++ b/ext/gd/tests/imagecreatetruecolor_error1.phpt @@ -3,7 +3,7 @@ Testing imagecreatetruecolor(): error on non-long parameters --CREDITS-- Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible"); ?> diff --git a/ext/gd/tests/imagecreatetruecolor_error2.phpt b/ext/gd/tests/imagecreatetruecolor_error2.phpt index 7d96f8793f..3ab4cf1e1f 100644 --- a/ext/gd/tests/imagecreatetruecolor_error2.phpt +++ b/ext/gd/tests/imagecreatetruecolor_error2.phpt @@ -3,7 +3,7 @@ Testing imagecreatetruecolor(): error on out of bound parameters --CREDITS-- Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible"); ?> diff --git a/ext/gd/tests/imagecreatetruecolor_error3.phpt b/ext/gd/tests/imagecreatetruecolor_error3.phpt index 332cdef3a3..3982e8aceb 100644 --- a/ext/gd/tests/imagecreatetruecolor_error3.phpt +++ b/ext/gd/tests/imagecreatetruecolor_error3.phpt @@ -3,7 +3,7 @@ Testing imagecreatetruecolor(): error on wrong parameter count --CREDITS-- Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible"); ?> diff --git a/ext/gd/tests/imagecrop_auto-ext.phpt b/ext/gd/tests/imagecrop_auto-ext.phpt index f37b3ca8e2..cc88e5d657 100644 --- a/ext/gd/tests/imagecrop_auto-ext.phpt +++ b/ext/gd/tests/imagecrop_auto-ext.phpt @@ -1,36 +1,36 @@ ---TEST-- -Testing imagecropauto() ---SKIPIF-- -<?php -if ( ! extension_loaded('gd') || !function_exists('imagecrop')) die( 'skip GD imagecropauto not present; skipping test' ); +--TEST-- +Testing imagecropauto() +--SKIPIF-- +<?php +if ( ! extension_loaded('gd') || !function_exists('imagecrop')) die( 'skip GD imagecropauto not present; skipping test' ); if (GD_BUNDLED) die('skip requires external libgd'); -?> +?> --FILE-- <?php echo "TC IMG_CROP_DEFAULT\n"; -$im = imagecreatetruecolor(99, 99); +$im = imagecreatetruecolor(99, 99); imagefilledrectangle($im, 20, 20, 30, 30, 0xff); $im_crop = imagecropauto($im, IMG_CROP_DEFAULT); var_dump(imagesx($im_crop)); var_dump(imagesy($im_crop)); echo "Palette IMG_CROP_DEFAULT\n"; -$im = imagecreate(99, 99); +$im = imagecreate(99, 99); imagefilledrectangle($im, 20, 20, 30, 30, 0xff); $im_crop = imagecropauto($im, IMG_CROP_DEFAULT); var_dump(imagesx($im_crop)); var_dump(imagesy($im_crop)); echo "TC IMG_CROP_SIDES\n"; -$im = imagecreatetruecolor(99, 99); +$im = imagecreatetruecolor(99, 99); imagefilledrectangle($im, 20, 20, 30, 30, 0xff); $im_crop = imagecropauto($im, IMG_CROP_SIDES); var_dump(imagesx($im_crop)); var_dump(imagesy($im_crop)); echo "Palette IMG_CROP_SIDES\n"; -$im = imagecreate(99, 99); +$im = imagecreate(99, 99); imagefilledrectangle($im, 20, 20, 30, 30, 0xff); $im_crop = imagecropauto($im, IMG_CROP_SIDES); var_dump(imagesx($im_crop)); @@ -60,8 +60,8 @@ var_dump(imagesx($im_crop)); var_dump(imagesy($im_crop)); @unlink(__DIR__ . "/crop_threshold.png"); -?> ---EXPECT-- +?> +--EXPECT-- TC IMG_CROP_DEFAULT int(99) int(99) diff --git a/ext/gd/tests/imagecrop_auto.phpt b/ext/gd/tests/imagecrop_auto.phpt index 07f6b8ae4c..b12cc971ee 100644 --- a/ext/gd/tests/imagecrop_auto.phpt +++ b/ext/gd/tests/imagecrop_auto.phpt @@ -1,36 +1,36 @@ ---TEST-- -Testing imagecropauto() ---SKIPIF-- -<?php -if ( ! extension_loaded('gd') || !function_exists('imagecrop')) die( 'skip GD imagecropauto not present; skipping test' ); +--TEST-- +Testing imagecropauto() +--SKIPIF-- +<?php +if ( ! extension_loaded('gd') || !function_exists('imagecrop')) die( 'skip GD imagecropauto not present; skipping test' ); if (!GD_BUNDLED) die('skip requires bundled libgd'); -?> +?> --FILE-- <?php echo "TC IMG_CROP_DEFAULT\n"; -$im = imagecreatetruecolor(99, 99); +$im = imagecreatetruecolor(99, 99); imagefilledrectangle($im, 20, 20, 30, 30, 0xff); $im_crop = imagecropauto($im, IMG_CROP_DEFAULT); var_dump(imagesx($im_crop)); var_dump(imagesy($im_crop)); echo "Palette IMG_CROP_DEFAULT\n"; -$im = imagecreate(99, 99); +$im = imagecreate(99, 99); imagefilledrectangle($im, 20, 20, 30, 30, 0xff); $im_crop = imagecropauto($im, IMG_CROP_DEFAULT); var_dump(imagesx($im_crop)); var_dump(imagesy($im_crop)); echo "TC IMG_CROP_SIDES\n"; -$im = imagecreatetruecolor(99, 99); +$im = imagecreatetruecolor(99, 99); imagefilledrectangle($im, 20, 20, 30, 30, 0xff); $im_crop = imagecropauto($im, IMG_CROP_SIDES); var_dump(imagesx($im_crop)); var_dump(imagesy($im_crop)); echo "Palette IMG_CROP_SIDES\n"; -$im = imagecreate(99, 99); +$im = imagecreate(99, 99); imagefilledrectangle($im, 20, 20, 30, 30, 0xff); $im_crop = imagecropauto($im, IMG_CROP_SIDES); var_dump(imagesx($im_crop)); @@ -60,8 +60,8 @@ var_dump(imagesx($im_crop)); var_dump(imagesy($im_crop)); @unlink(__DIR__ . "/crop_threshold.png"); -?> ---EXPECT-- +?> +--EXPECT-- TC IMG_CROP_DEFAULT int(11) int(11) diff --git a/ext/gd/tests/imagedashedline_basic.phpt b/ext/gd/tests/imagedashedline_basic.phpt index 35525f57bc..d58825036c 100644 --- a/ext/gd/tests/imagedashedline_basic.phpt +++ b/ext/gd/tests/imagedashedline_basic.phpt @@ -1,8 +1,8 @@ --TEST-- imagedashedline() --SKIPIF-- -<?php - if (!function_exists('imagedashedline')) die('skip imagedashedline() not available'); +<?php + if (!function_exists('imagedashedline')) die('skip imagedashedline() not available'); ?> --FILE-- <?php @@ -11,7 +11,7 @@ imagedashedline() * Description: Draws a dashed line. * This function is deprecated. Use combination of imagesetstyle() and imageline() instead. * Source code: ext/standard/image.c - * Alias to functions: + * Alias to functions: */ @@ -29,8 +29,8 @@ $bg = imagecolorallocate($image, 0, 0, 0); $col_line = imagecolorallocate($image, 255, 0, 0); // draw a couple of vertical dashed lines -imagedashedline($image, 100, 20, 100, 230, $col_line ); -imagedashedline($image, 150, 20, 150, 230, $col_line ); +imagedashedline($image, 100, 20, 100, 230, $col_line ); +imagedashedline($image, 150, 20, 150, 230, $col_line ); // output the picture to a file imagepng($image, $dest); @@ -44,11 +44,11 @@ $color1 = imagecolorsforindex($image, $col1); $color2 = imagecolorsforindex($image, $col2); var_dump($color1, $color2); -imagedestroy($image); -echo "Done\n"; +imagedestroy($image); +echo "Done\n"; ?> --CLEAN-- -<?php +<?php $dest = dirname(realpath(__FILE__)) . '/imagedashedline.png'; @unlink($dest); ?> diff --git a/ext/gd/tests/imageellipse_basic.phpt b/ext/gd/tests/imageellipse_basic.phpt index f3b1e10bfe..9f0cf977bb 100644 --- a/ext/gd/tests/imageellipse_basic.phpt +++ b/ext/gd/tests/imageellipse_basic.phpt @@ -4,7 +4,7 @@ Testing imageellipse() of GD library Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imageellipse_error1.phpt b/ext/gd/tests/imageellipse_error1.phpt index aa8ad789d9..476b5daa75 100644 --- a/ext/gd/tests/imageellipse_error1.phpt +++ b/ext/gd/tests/imageellipse_error1.phpt @@ -4,7 +4,7 @@ Testing wrong param passing imageellipse() of GD library Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imageellipse_error2.phpt b/ext/gd/tests/imageellipse_error2.phpt index 3eb3681c0d..defa52c06f 100644 --- a/ext/gd/tests/imageellipse_error2.phpt +++ b/ext/gd/tests/imageellipse_error2.phpt @@ -4,7 +4,7 @@ Testing wrong param passing imageellipse() of GD library Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imageellipse_error3.phpt b/ext/gd/tests/imageellipse_error3.phpt index 692149dd16..b021fdb350 100644 --- a/ext/gd/tests/imageellipse_error3.phpt +++ b/ext/gd/tests/imageellipse_error3.phpt @@ -4,7 +4,7 @@ Testing wrong param passing imageellipse() of GD library Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imageellipse_error4.phpt b/ext/gd/tests/imageellipse_error4.phpt index e93334ba54..3af4398a88 100644 --- a/ext/gd/tests/imageellipse_error4.phpt +++ b/ext/gd/tests/imageellipse_error4.phpt @@ -4,7 +4,7 @@ Testing wrong param passing imageellipse() of GD library Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imageellipse_error5.phpt b/ext/gd/tests/imageellipse_error5.phpt index a86e25e461..62b54145a3 100644 --- a/ext/gd/tests/imageellipse_error5.phpt +++ b/ext/gd/tests/imageellipse_error5.phpt @@ -4,7 +4,7 @@ Testing wrong param passing imageellipse() of GD library Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imageellipse_error7.phpt b/ext/gd/tests/imageellipse_error7.phpt index 23f1eeeab7..612be4b8bb 100644 --- a/ext/gd/tests/imageellipse_error7.phpt +++ b/ext/gd/tests/imageellipse_error7.phpt @@ -1,20 +1,20 @@ ---TEST-- +--TEST-- Testing wrong param passing imageellipse() of GD library ---CREDITS-- +--CREDITS-- Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-20 ---SKIPIF-- -<?php -if (!extension_loaded("gd")) die("skip GD not present"); -?> ---FILE-- -<?php +--SKIPIF-- +<?php +if (!extension_loaded("gd")) die("skip GD not present"); +?> +--FILE-- +<?php // Create a resource -$image = tmpfile(); +$image = tmpfile(); // try to draw a white ellipse -imageellipse($image, 200, 150, 300, 200, 16777215); -?> ---EXPECTF-- +imageellipse($image, 200, 150, 300, 200, 16777215); +?> +--EXPECTF-- Warning: imageellipse(): supplied resource is not a valid Image resource in %s on line %d diff --git a/ext/gd/tests/imageellipse_error8.phpt b/ext/gd/tests/imageellipse_error8.phpt index d02b97eec3..5be5a12c39 100644 --- a/ext/gd/tests/imageellipse_error8.phpt +++ b/ext/gd/tests/imageellipse_error8.phpt @@ -4,7 +4,7 @@ Testing wrong param passing imageellipse() of GD library Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if ( ! extension_loaded("gd") ) die( 'skip GD not present; skipping test' ); ?> --FILE-- diff --git a/ext/gd/tests/imagefill_1.phpt b/ext/gd/tests/imagefill_1.phpt index 04e1cab55a..f356fe826d 100644 --- a/ext/gd/tests/imagefill_1.phpt +++ b/ext/gd/tests/imagefill_1.phpt @@ -1,7 +1,7 @@ --TEST-- imagefill() infinite loop with wrong color index --SKIPIF-- -<?php +<?php if (!extension_loaded('gd')) { die("skip gd extension not available."); } diff --git a/ext/gd/tests/imagefilledarc_basic.phpt b/ext/gd/tests/imagefilledarc_basic.phpt index 9969e6be95..23b9d3a969 100644 --- a/ext/gd/tests/imagefilledarc_basic.phpt +++ b/ext/gd/tests/imagefilledarc_basic.phpt @@ -4,7 +4,7 @@ Testing imagefilledarc() of GD library Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?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"); diff --git a/ext/gd/tests/imagefilledarc_error1.phpt b/ext/gd/tests/imagefilledarc_error1.phpt index 81d04358fb..bb14543eda 100644 --- a/ext/gd/tests/imagefilledarc_error1.phpt +++ b/ext/gd/tests/imagefilledarc_error1.phpt @@ -4,7 +4,7 @@ Testing wrong param passing imagefilledarc() of GD library Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagefilledarc_variation1.phpt b/ext/gd/tests/imagefilledarc_variation1.phpt index 7eb2350cb3..ef4a98ac79 100644 --- a/ext/gd/tests/imagefilledarc_variation1.phpt +++ b/ext/gd/tests/imagefilledarc_variation1.phpt @@ -4,7 +4,7 @@ Testing passing negative end angle to imagefilledarc() of GD library Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?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"); diff --git a/ext/gd/tests/imagefilledarc_variation2.phpt b/ext/gd/tests/imagefilledarc_variation2.phpt index 28cb517631..2965cda65a 100644 --- a/ext/gd/tests/imagefilledarc_variation2.phpt +++ b/ext/gd/tests/imagefilledarc_variation2.phpt @@ -4,7 +4,7 @@ Testing passing negative start angle to imagefilledarc() of GD library Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?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"); diff --git a/ext/gd/tests/imagefilledellipse_basic.phpt b/ext/gd/tests/imagefilledellipse_basic.phpt index 1dee961b13..ed78dde4d2 100644 --- a/ext/gd/tests/imagefilledellipse_basic.phpt +++ b/ext/gd/tests/imagefilledellipse_basic.phpt @@ -1,7 +1,7 @@ --TEST-- Testing imagefilledellipse() of GD library --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagefilledpolygon_basic.phpt b/ext/gd/tests/imagefilledpolygon_basic.phpt index b957cce698..cd226179ba 100644 --- a/ext/gd/tests/imagefilledpolygon_basic.phpt +++ b/ext/gd/tests/imagefilledpolygon_basic.phpt @@ -1,8 +1,8 @@ --TEST-- imagefilledpolygon() --SKIPIF-- -<?php - if (!function_exists('imagefilledpolygon')) die('skip imagefilledpolygon() not available'); +<?php + if (!function_exists('imagefilledpolygon')) die('skip imagefilledpolygon() not available'); ?> --FILE-- <?php @@ -10,7 +10,7 @@ imagefilledpolygon() /* Prototype : bool imagefilledpolygon ( resource $image , array $points , int $num_points , int $color ) * Description: Draws a filled polygon. * Source code: ext/standard/image.c - * Alias to functions: + * Alias to functions: */ echo "Simple test of imagefilledpolygon() function\n"; @@ -18,11 +18,11 @@ echo "Simple test of imagefilledpolygon() function\n"; $dest = dirname(realpath(__FILE__)) . '/imagefilledpolygon.png'; $points = array( - 40, 50, - 20, 240, - 60, 60, - 240, 20, - 50, 40, + 40, 50, + 20, 240, + 60, 60, + 240, 20, + 50, 40, 10, 10 ); @@ -56,13 +56,13 @@ $color2 = imagecolorsforindex($image_in, $col2); $color3 = imagecolorsforindex($image_in, $col3); var_dump($color1, $color2, $color3); -imagedestroy($image); +imagedestroy($image); imagedestroy($image_in); -echo "Done\n"; +echo "Done\n"; ?> --CLEAN-- -<?php +<?php $dest = dirname(realpath(__FILE__)) . '/imagefilledpolygon.png'; @unlink($dest); ?> diff --git a/ext/gd/tests/imagefilledpolygon_negative.phpt b/ext/gd/tests/imagefilledpolygon_negative.phpt index ced853067b..a572a195f5 100644 --- a/ext/gd/tests/imagefilledpolygon_negative.phpt +++ b/ext/gd/tests/imagefilledpolygon_negative.phpt @@ -1,8 +1,8 @@ --TEST-- imagefilledpolygon() with a negative num of points --SKIPIF-- -<?php - if (!function_exists('imagefilledpolygon')) die('skip imagefilledpolygon() not available'); +<?php + if (!function_exists('imagefilledpolygon')) die('skip imagefilledpolygon() not available'); ?> --FILE-- <?php diff --git a/ext/gd/tests/imagefilltoborder_basic.phpt b/ext/gd/tests/imagefilltoborder_basic.phpt index 843eed473d..e2dfbef2e0 100644 --- a/ext/gd/tests/imagefilltoborder_basic.phpt +++ b/ext/gd/tests/imagefilltoborder_basic.phpt @@ -1,16 +1,16 @@ ---TEST-- +--TEST-- Testing imagefilltoborder() of GD library ---CREDITS-- +--CREDITS-- Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 ---SKIPIF-- -<?php -if (!extension_loaded("gd")) die("skip GD not present"); -?> +--SKIPIF-- +<?php +if (!extension_loaded("gd")) die("skip GD not present"); +?> --FILE-- <?php // Create a image -$image = imagecreatetruecolor( 100, 100 ); +$image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle imagefilledrectangle( $image, 0, 0, 100, 100, imagecolorallocate( $image, 255, 255, 255 ) ); @@ -24,6 +24,6 @@ imagefilltoborder( $image, 50, 50, imagecolorallocate( $image, 0, 0, 0 ), imagec include_once __DIR__ . '/func.inc'; test_image_equals_file(__DIR__ . '/imagefilltoborder_basic.png', $image); -?> ---EXPECT-- +?> +--EXPECT-- The images are equal. diff --git a/ext/gd/tests/imagefilltoborder_error1.phpt b/ext/gd/tests/imagefilltoborder_error1.phpt index 9412da7394..6979a9b8cb 100644 --- a/ext/gd/tests/imagefilltoborder_error1.phpt +++ b/ext/gd/tests/imagefilltoborder_error1.phpt @@ -1,16 +1,16 @@ ---TEST-- +--TEST-- Testing wrong param passing imagefilltoborder() of GD library ---CREDITS-- +--CREDITS-- Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 ---SKIPIF-- -<?php -if (!extension_loaded("gd")) die("skip GD not present"); -?> +--SKIPIF-- +<?php +if (!extension_loaded("gd")) die("skip GD not present"); +?> --FILE-- <?php // Create a image -$image = imagecreatetruecolor( 100, 100 ); +$image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle imagefilledrectangle( $image, 0, 0, 100, 100, imagecolorallocate( $image, 255, 255, 255 ) ); @@ -21,6 +21,6 @@ imageellipse( $image, 50, 50, 50, 50, imagecolorallocate( $image, 0, 0, 0 ) ); // Try to fill border imagefilltoborder( 'wrong param', 50, 50, imagecolorallocate( $image, 0, 0, 0 ), imagecolorallocate( $image, 255, 0, 0 ) ); -?> +?> --EXPECTF-- Warning: imagefilltoborder() expects parameter 1 to be resource, %s given in %s on line %d diff --git a/ext/gd/tests/imagefilltoborder_error2.phpt b/ext/gd/tests/imagefilltoborder_error2.phpt index 2c70ce9f7c..e7efac5e0a 100644 --- a/ext/gd/tests/imagefilltoborder_error2.phpt +++ b/ext/gd/tests/imagefilltoborder_error2.phpt @@ -1,16 +1,16 @@ ---TEST-- +--TEST-- Testing wrong param passing imagefilltoborder() of GD library ---CREDITS-- +--CREDITS-- Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 ---SKIPIF-- -<?php -if (!extension_loaded("gd")) die("skip GD not present"); -?> +--SKIPIF-- +<?php +if (!extension_loaded("gd")) die("skip GD not present"); +?> --FILE-- <?php // Create a image -$image = imagecreatetruecolor( 100, 100 ); +$image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle imagefilledrectangle( $image, 0, 0, 100, 100, imagecolorallocate( $image, 255, 255, 255 ) ); @@ -21,6 +21,6 @@ imageellipse( $image, 50, 50, 50, 50, imagecolorallocate( $image, 0, 0, 0 ) ); // Try to fill border imagefilltoborder( $image, 'wrong param', 50, imagecolorallocate( $image, 0, 0, 0 ), imagecolorallocate( $image, 255, 0, 0 ) ); -?> +?> --EXPECTF-- Warning: imagefilltoborder() expects parameter 2 to be int, %s given in %s on line %d diff --git a/ext/gd/tests/imagefilltoborder_error3.phpt b/ext/gd/tests/imagefilltoborder_error3.phpt index 74f01183a5..e5caf07595 100644 --- a/ext/gd/tests/imagefilltoborder_error3.phpt +++ b/ext/gd/tests/imagefilltoborder_error3.phpt @@ -1,16 +1,16 @@ ---TEST-- +--TEST-- Testing wrong param passing imagefilltoborder() of GD library ---CREDITS-- +--CREDITS-- Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 ---SKIPIF-- -<?php -if (!extension_loaded("gd")) die("skip GD not present"); -?> +--SKIPIF-- +<?php +if (!extension_loaded("gd")) die("skip GD not present"); +?> --FILE-- <?php // Create a image -$image = imagecreatetruecolor( 100, 100 ); +$image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle imagefilledrectangle( $image, 0, 0, 100, 100, imagecolorallocate( $image, 255, 255, 255 ) ); @@ -21,6 +21,6 @@ imageellipse( $image, 50, 50, 50, 50, imagecolorallocate( $image, 0, 0, 0 ) ); // Try to fill border imagefilltoborder( $image, 50, 'wrong param', imagecolorallocate( $image, 0, 0, 0 ), imagecolorallocate( $image, 255, 0, 0 ) ); -?> +?> --EXPECTF-- Warning: imagefilltoborder() expects parameter 3 to be int, %s given in %s on line %d diff --git a/ext/gd/tests/imagefilltoborder_error4.phpt b/ext/gd/tests/imagefilltoborder_error4.phpt index 3eaa719cd9..08806818a1 100644 --- a/ext/gd/tests/imagefilltoborder_error4.phpt +++ b/ext/gd/tests/imagefilltoborder_error4.phpt @@ -1,16 +1,16 @@ ---TEST-- +--TEST-- Testing wrong param passing imagefilltoborder() of GD library ---CREDITS-- +--CREDITS-- Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 ---SKIPIF-- -<?php -if (!extension_loaded("gd")) die("skip GD not present"); -?> +--SKIPIF-- +<?php +if (!extension_loaded("gd")) die("skip GD not present"); +?> --FILE-- <?php // Create a image -$image = imagecreatetruecolor( 100, 100 ); +$image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle imagefilledrectangle( $image, 0, 0, 100, 100, imagecolorallocate( $image, 255, 255, 255 ) ); @@ -21,6 +21,6 @@ imageellipse( $image, 50, 50, 50, 50, imagecolorallocate( $image, 0, 0, 0 ) ); // Try to fill border imagefilltoborder( $image, 50, 50, 'wrong param', imagecolorallocate( $image, 255, 0, 0 ) ); -?> +?> --EXPECTF-- Warning: imagefilltoborder() expects parameter 4 to be int, %s given in %s on line %d diff --git a/ext/gd/tests/imagefilltoborder_error5.phpt b/ext/gd/tests/imagefilltoborder_error5.phpt index b9eb07982d..c56d66207d 100644 --- a/ext/gd/tests/imagefilltoborder_error5.phpt +++ b/ext/gd/tests/imagefilltoborder_error5.phpt @@ -1,16 +1,16 @@ ---TEST-- +--TEST-- Testing wrong param passing imagefilltoborder() of GD library ---CREDITS-- +--CREDITS-- Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 ---SKIPIF-- -<?php -if (!extension_loaded("gd")) die("skip GD not present"); -?> +--SKIPIF-- +<?php +if (!extension_loaded("gd")) die("skip GD not present"); +?> --FILE-- <?php // Create a image -$image = imagecreatetruecolor( 100, 100 ); +$image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle imagefilledrectangle( $image, 0, 0, 100, 100, imagecolorallocate( $image, 255, 255, 255 ) ); @@ -21,6 +21,6 @@ imageellipse( $image, 50, 50, 50, 50, imagecolorallocate( $image, 0, 0, 0 ) ); // Try to fill border imagefilltoborder( $image, 50, 50, imagecolorallocate( $image, 0, 0, 0 ), 'wrong param' ); -?> +?> --EXPECTF-- Warning: imagefilltoborder() expects parameter 5 to be int, %s given in %s on line %d diff --git a/ext/gd/tests/imagefilltoborder_error6.phpt b/ext/gd/tests/imagefilltoborder_error6.phpt index b5ce53b0d6..f1a7fb02bb 100644 --- a/ext/gd/tests/imagefilltoborder_error6.phpt +++ b/ext/gd/tests/imagefilltoborder_error6.phpt @@ -1,16 +1,16 @@ ---TEST-- +--TEST-- Testing wrong param passing imagefilltoborder() of GD library ---CREDITS-- +--CREDITS-- Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 ---SKIPIF-- -<?php -if (!extension_loaded("gd")) die("skip GD not present"); -?> +--SKIPIF-- +<?php +if (!extension_loaded("gd")) die("skip GD not present"); +?> --FILE-- <?php // Create a image -$image = imagecreatetruecolor( 100, 100 ); +$image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle imagefilledrectangle( $image, 0, 0, 100, 100, imagecolorallocate( $image, 255, 255, 255 ) ); @@ -22,7 +22,7 @@ imageellipse( $image, 50, 50, 50, 50, imagecolorallocate( $image, 0, 0, 0 ) ); $image_foo = tmpfile(); imagefilltoborder( $image_foo, 50, 50, imagecolorallocate( $image, 0, 0, 0 ), imagecolorallocate( $image, 255, 0, 0 ) ); -?> +?> --EXPECTF-- Warning: imagefilltoborder(): supplied resource is not a valid Image resource in %s on line %d diff --git a/ext/gd/tests/imagefilltoborder_error7.phpt b/ext/gd/tests/imagefilltoborder_error7.phpt index f3313e11f4..e1b45a342a 100644 --- a/ext/gd/tests/imagefilltoborder_error7.phpt +++ b/ext/gd/tests/imagefilltoborder_error7.phpt @@ -1,16 +1,16 @@ ---TEST-- +--TEST-- Testing wrong param passing imagefilltoborder() of GD library ---CREDITS-- +--CREDITS-- Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 ---SKIPIF-- -<?php -if ( ! extension_loaded("gd")) die("skip GD not present; skipping test"); -?> +--SKIPIF-- +<?php +if ( ! extension_loaded("gd")) die("skip GD not present; skipping test"); +?> --FILE-- <?php // Create a image -$image = imagecreatetruecolor( 100, 100 ); +$image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle imagefilledrectangle( $image, 0, 0, 100, 100, imagecolorallocate( $image, 255, 255, 255 ) ); @@ -21,6 +21,6 @@ imageellipse( $image, 50, 50, 50, 50, imagecolorallocate( $image, 0, 0, 0 ) ); // Try to fill border imagefilltoborder( $image, 50, 50 ); -?> +?> --EXPECTF-- Warning: imagefilltoborder() expects exactly 5 parameters, %d given in %s on line %d diff --git a/ext/gd/tests/imagefilter.phpt b/ext/gd/tests/imagefilter.phpt index 8b17fb80b1..04a2395b8b 100644 --- a/ext/gd/tests/imagefilter.phpt +++ b/ext/gd/tests/imagefilter.phpt @@ -21,7 +21,7 @@ $no_arg_filters = array( $SAVE_DIR = dirname(__FILE__); $SOURCE_IMG = $SAVE_DIR . "/test.png"; - + foreach ($no_arg_filters as $filt) { $im = imagecreatefrompng($SOURCE_IMG); if (imagefilter($im, constant($filt))) { @@ -34,7 +34,7 @@ $SOURCE_IMG = $SAVE_DIR . "/test.png"; } $im = imagecreatefrompng($SOURCE_IMG); - + if (imagefilter($im, IMG_FILTER_SMOOTH, -1924.124)) { imagepng($im, $SAVE_DIR . "/IMG_FILTER_SMOOTH.png"); echo "IMG_FILTER_SMOOTH success\n"; @@ -42,9 +42,9 @@ $SOURCE_IMG = $SAVE_DIR . "/test.png"; } else { echo "IMG_FILTER_SMOOTH failed\n"; } - + $im = imagecreatefrompng($SOURCE_IMG); - + if (imagefilter($im, IMG_FILTER_COLORIZE, -127.12, -127.98, 127)) { imagepng($im, $SAVE_DIR . "/IMG_FILTER_COLORIZE.png"); echo "IMG_FILTER_COLORIZE success\n"; @@ -52,9 +52,9 @@ $SOURCE_IMG = $SAVE_DIR . "/test.png"; } else { echo "IMG_FILTER_COLORIZE failed\n"; } - + $im = imagecreatefrompng($SOURCE_IMG); - + if (imagefilter($im, IMG_FILTER_CONTRAST, -90)) { imagepng($im, $SAVE_DIR . "/IMG_FILTER_CONTRAST.png"); echo "IMG_FILTER_CONTRAST success\n"; @@ -64,7 +64,7 @@ $SOURCE_IMG = $SAVE_DIR . "/test.png"; } $im = imagecreatefrompng($SOURCE_IMG); - + if (imagefilter($im, IMG_FILTER_BRIGHTNESS, 98)) { imagepng($im, $SAVE_DIR . "/IMG_FILTER_BRIGHTNESS.png"); echo "IMG_FILTER_BRIGHTNESS success\n"; @@ -74,7 +74,7 @@ $SOURCE_IMG = $SAVE_DIR . "/test.png"; } $im = imagecreatefrompng($SOURCE_IMG); - + if (imagefilter($im, IMG_FILTER_PIXELATE, 5, true)) { imagepng($im, $SAVE_DIR . "/IMG_FILTER_PIXELATE.png"); echo "IMG_FILTER_PIXELATE success\n"; diff --git a/ext/gd/tests/imagefilter_error1.phpt b/ext/gd/tests/imagefilter_error1.phpt index fb96ae32b4..41637994b4 100644 --- a/ext/gd/tests/imagefilter_error1.phpt +++ b/ext/gd/tests/imagefilter_error1.phpt @@ -4,7 +4,7 @@ Testing wrong parameter passing in imagefilter() of GD library Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagefilter_error10.phpt b/ext/gd/tests/imagefilter_error10.phpt index 8b41211629..0cea9aa3c1 100644 --- a/ext/gd/tests/imagefilter_error10.phpt +++ b/ext/gd/tests/imagefilter_error10.phpt @@ -4,7 +4,7 @@ Testing wrong parameter resource of EMBOSS in imagefilter() of GD library Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagefilter_error11.phpt b/ext/gd/tests/imagefilter_error11.phpt index 9b1cf4d92b..2f162045b8 100644 --- a/ext/gd/tests/imagefilter_error11.phpt +++ b/ext/gd/tests/imagefilter_error11.phpt @@ -4,7 +4,7 @@ Testing wrong parameter resource passing of EDGEDETECT in imagefilter() of GD li Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagefilter_error12.phpt b/ext/gd/tests/imagefilter_error12.phpt index 33fee28e63..29664518a0 100644 --- a/ext/gd/tests/imagefilter_error12.phpt +++ b/ext/gd/tests/imagefilter_error12.phpt @@ -4,7 +4,7 @@ Testing wrong parameter resource of COLORIZE in imagefilter() of GD library Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagefilter_error13.phpt b/ext/gd/tests/imagefilter_error13.phpt index bcba260b9a..fb17ccc97e 100644 --- a/ext/gd/tests/imagefilter_error13.phpt +++ b/ext/gd/tests/imagefilter_error13.phpt @@ -4,7 +4,7 @@ Testing wrong parameter value of COLORIZE in imagefilter() of GD library Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagefilter_error14.phpt b/ext/gd/tests/imagefilter_error14.phpt index 6da2d8385e..310b848671 100644 --- a/ext/gd/tests/imagefilter_error14.phpt +++ b/ext/gd/tests/imagefilter_error14.phpt @@ -4,7 +4,7 @@ Testing wrong parameter type of COLORIZE in imagefilter() of GD library Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagefilter_error15.phpt b/ext/gd/tests/imagefilter_error15.phpt index 87a412e4cd..9c76bf24ab 100644 --- a/ext/gd/tests/imagefilter_error15.phpt +++ b/ext/gd/tests/imagefilter_error15.phpt @@ -4,7 +4,7 @@ Testing wrong parameter resource of CONTRAST in imagefilter() of GD library Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagefilter_error16.phpt b/ext/gd/tests/imagefilter_error16.phpt index d0351f9f74..f7173c689e 100644 --- a/ext/gd/tests/imagefilter_error16.phpt +++ b/ext/gd/tests/imagefilter_error16.phpt @@ -4,7 +4,7 @@ Testing wrong parameter type of CONTRAST in imagefilter() of GD library Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagefilter_error17.phpt b/ext/gd/tests/imagefilter_error17.phpt index adafc3e5e8..9a3ba39439 100644 --- a/ext/gd/tests/imagefilter_error17.phpt +++ b/ext/gd/tests/imagefilter_error17.phpt @@ -4,7 +4,7 @@ Testing wrong parameter resource of GRAYSCALE in imagefilter() of GD library Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagefilter_error18.phpt b/ext/gd/tests/imagefilter_error18.phpt index b636bfc07a..d96d02426f 100644 --- a/ext/gd/tests/imagefilter_error18.phpt +++ b/ext/gd/tests/imagefilter_error18.phpt @@ -4,7 +4,7 @@ Testing wrong parameter resource of NEGATE in imagefilter() of GD library Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagefilter_error19.phpt b/ext/gd/tests/imagefilter_error19.phpt index aa25994457..a811044869 100644 --- a/ext/gd/tests/imagefilter_error19.phpt +++ b/ext/gd/tests/imagefilter_error19.phpt @@ -4,7 +4,7 @@ Testing wrong parameter type of BRIGHTNESS in imagefilter() of GD library Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagefilter_error2.phpt b/ext/gd/tests/imagefilter_error2.phpt index d4cca5c8d7..17a47f2005 100644 --- a/ext/gd/tests/imagefilter_error2.phpt +++ b/ext/gd/tests/imagefilter_error2.phpt @@ -4,7 +4,7 @@ Testing wrong parameter passing in imagefilter() of GD library Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagefilter_error20.phpt b/ext/gd/tests/imagefilter_error20.phpt index f3db724acb..f1a330dbed 100644 --- a/ext/gd/tests/imagefilter_error20.phpt +++ b/ext/gd/tests/imagefilter_error20.phpt @@ -4,7 +4,7 @@ Testing wrong parameter resource of BRIGHTNESS in imagefilter() of GD library Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagefilter_error3.phpt b/ext/gd/tests/imagefilter_error3.phpt index 844f12a824..e1c2fe7b36 100644 --- a/ext/gd/tests/imagefilter_error3.phpt +++ b/ext/gd/tests/imagefilter_error3.phpt @@ -4,7 +4,7 @@ Testing wrong parameter passing of PIXELATE in imagefilter() of GD library Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagefilter_error4.phpt b/ext/gd/tests/imagefilter_error4.phpt index babb37e0ac..f60ce11b42 100644 --- a/ext/gd/tests/imagefilter_error4.phpt +++ b/ext/gd/tests/imagefilter_error4.phpt @@ -4,7 +4,7 @@ Testing wrong parameter resource of PIXELATE in imagefilter() of GD library Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagefilter_error5.phpt b/ext/gd/tests/imagefilter_error5.phpt index 6ed6ae66b8..7965271a54 100644 --- a/ext/gd/tests/imagefilter_error5.phpt +++ b/ext/gd/tests/imagefilter_error5.phpt @@ -4,7 +4,7 @@ Testing wrong parameter passing of SMOOTH in imagefilter() of GD library Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagefilter_error6.phpt b/ext/gd/tests/imagefilter_error6.phpt index 05dd187a2d..1ace03cba3 100644 --- a/ext/gd/tests/imagefilter_error6.phpt +++ b/ext/gd/tests/imagefilter_error6.phpt @@ -4,7 +4,7 @@ Testing wrong parameter resource of SMOOTH in imagefilter() of GD library Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagefilter_error7.phpt b/ext/gd/tests/imagefilter_error7.phpt index 6c08e5acf3..4e095801e8 100644 --- a/ext/gd/tests/imagefilter_error7.phpt +++ b/ext/gd/tests/imagefilter_error7.phpt @@ -4,7 +4,7 @@ Testing wrong parameter resource of MEAN_REMOVAL in imagefilter() of GD library Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagefilter_error8.phpt b/ext/gd/tests/imagefilter_error8.phpt index 57c3168f7e..5086e6421d 100644 --- a/ext/gd/tests/imagefilter_error8.phpt +++ b/ext/gd/tests/imagefilter_error8.phpt @@ -4,7 +4,7 @@ Testing wrong parameter resource of SELECTIVE_BLUR in imagefilter() of GD librar Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagefilter_error9.phpt b/ext/gd/tests/imagefilter_error9.phpt index a74ea643cf..268a65f0f7 100644 --- a/ext/gd/tests/imagefilter_error9.phpt +++ b/ext/gd/tests/imagefilter_error9.phpt @@ -4,7 +4,7 @@ Testing wrong parameter resource of GAUSSIAN_BLUR in imagefilter() of GD library Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imageflip.phpt b/ext/gd/tests/imageflip.phpt index f4660940a2..84885c4260 100644 --- a/ext/gd/tests/imageflip.phpt +++ b/ext/gd/tests/imageflip.phpt @@ -1,13 +1,13 @@ ---TEST-- +--TEST-- Testing imageflip() of GD library ---SKIPIF-- -<?php -if ( ! extension_loaded('gd') || !function_exists('imageflip')) die( 'skip GD not present; skipping test' ); -?> +--SKIPIF-- +<?php +if ( ! extension_loaded('gd') || !function_exists('imageflip')) die( 'skip GD not present; skipping test' ); +?> --FILE-- <?php -$im = imagecreatetruecolor( 99, 99 ); +$im = imagecreatetruecolor( 99, 99 ); imagesetpixel($im, 0, 0, 0xFF); imagesetpixel($im, 0, 98, 0x00FF00); @@ -22,8 +22,8 @@ var_dump(dechex(imagecolorat($im, 0, 0))); var_dump(dechex(imagecolorat($im, 0, 98))); var_dump(dechex(imagecolorat($im, 98, 0))); var_dump(dechex(imagecolorat($im, 98, 98))); -?> ---EXPECT-- +?> +--EXPECT-- string(2) "ff" string(4) "ff00" string(6) "ff0000" diff --git a/ext/gd/tests/imagefontheight_basic.phpt b/ext/gd/tests/imagefontheight_basic.phpt index bfcd0bb27c..ddb47c7cbd 100644 --- a/ext/gd/tests/imagefontheight_basic.phpt +++ b/ext/gd/tests/imagefontheight_basic.phpt @@ -4,7 +4,7 @@ Testing imagefontheight() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagefontheight_error1.phpt b/ext/gd/tests/imagefontheight_error1.phpt index e324772c5f..dbe20cece1 100644 --- a/ext/gd/tests/imagefontheight_error1.phpt +++ b/ext/gd/tests/imagefontheight_error1.phpt @@ -4,7 +4,7 @@ Testing error on string parameter for imagefontheight() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagefontwidth_basic.phpt b/ext/gd/tests/imagefontwidth_basic.phpt index 0a9df52095..2e3a5eb3ca 100644 --- a/ext/gd/tests/imagefontwidth_basic.phpt +++ b/ext/gd/tests/imagefontwidth_basic.phpt @@ -4,7 +4,7 @@ Testing imagefontwidth() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagefontwidth_error1.phpt b/ext/gd/tests/imagefontwidth_error1.phpt index 46178a22f2..9e1d59fe4e 100644 --- a/ext/gd/tests/imagefontwidth_error1.phpt +++ b/ext/gd/tests/imagefontwidth_error1.phpt @@ -4,7 +4,7 @@ Testing error on string parameter for imagefontwidth() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagefttext.phpt b/ext/gd/tests/imagefttext.phpt index 16e0495ef0..2a516cb6c5 100644 --- a/ext/gd/tests/imagefttext.phpt +++ b/ext/gd/tests/imagefttext.phpt @@ -1,7 +1,7 @@ --TEST-- imagefttext() function test --SKIPIF-- -<?php +<?php if (!extension_loaded('gd')) { die("skip gd extension not available."); } diff --git a/ext/gd/tests/imagegammacorrect_basic.phpt b/ext/gd/tests/imagegammacorrect_basic.phpt index c315c4688e..0e3203e985 100644 --- a/ext/gd/tests/imagegammacorrect_basic.phpt +++ b/ext/gd/tests/imagegammacorrect_basic.phpt @@ -4,7 +4,7 @@ Testing imagegammacorrect() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?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"); diff --git a/ext/gd/tests/imagegammacorrect_error1.phpt b/ext/gd/tests/imagegammacorrect_error1.phpt index fdcdec8bec..2640495457 100644 --- a/ext/gd/tests/imagegammacorrect_error1.phpt +++ b/ext/gd/tests/imagegammacorrect_error1.phpt @@ -4,7 +4,7 @@ Testing error with non-resource paramenter of imagegammacorrect() of GD library, Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagegammacorrect_error2.phpt b/ext/gd/tests/imagegammacorrect_error2.phpt index 604d7da796..57c8a7503a 100644 --- a/ext/gd/tests/imagegammacorrect_error2.phpt +++ b/ext/gd/tests/imagegammacorrect_error2.phpt @@ -4,7 +4,7 @@ Testing error with non-Image resource paramenter of imagegammacorrect() of GD li Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagegammacorrect_error3.phpt b/ext/gd/tests/imagegammacorrect_error3.phpt index 6dcecbe04b..5f9d7b22de 100644 --- a/ext/gd/tests/imagegammacorrect_error3.phpt +++ b/ext/gd/tests/imagegammacorrect_error3.phpt @@ -4,7 +4,7 @@ Testing error with non-double first paramenter of imagegammacorrect() of GD libr Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagegammacorrect_error4.phpt b/ext/gd/tests/imagegammacorrect_error4.phpt index e7ff6b4528..e5f0bd7365 100644 --- a/ext/gd/tests/imagegammacorrect_error4.phpt +++ b/ext/gd/tests/imagegammacorrect_error4.phpt @@ -4,7 +4,7 @@ Testing error with non-double second paramenter of imagegammacorrect() of GD lib Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagegammacorrect_variation1.phpt b/ext/gd/tests/imagegammacorrect_variation1.phpt index 73327c1eff..8cc978a6ff 100644 --- a/ext/gd/tests/imagegammacorrect_variation1.phpt +++ b/ext/gd/tests/imagegammacorrect_variation1.phpt @@ -4,7 +4,7 @@ Testing imagegammacorrect() of GD library with non TrueColor image Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?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"); diff --git a/ext/gd/tests/imagegammacorrect_variation2.phpt b/ext/gd/tests/imagegammacorrect_variation2.phpt index d314df6c4c..6a66147ce9 100644 --- a/ext/gd/tests/imagegammacorrect_variation2.phpt +++ b/ext/gd/tests/imagegammacorrect_variation2.phpt @@ -26,9 +26,9 @@ function test_gamma($in, $out, $constructor) draw_cell($im, $i, $j); } } - + imagegammacorrect($im, $in, $out); - + $filename = __DIR__ . DIRECTORY_SEPARATOR . "imagegammacorrect_variation2_{$in}_{$out}.png"; $kind = $constructor === 'imagecreate' ? 'palette' : 'truecolor'; diff --git a/ext/gd/tests/imageinterlace_basic.phpt b/ext/gd/tests/imageinterlace_basic.phpt index 657b256d67..62d99bcf91 100644 --- a/ext/gd/tests/imageinterlace_basic.phpt +++ b/ext/gd/tests/imageinterlace_basic.phpt @@ -4,7 +4,7 @@ Testing imageinterlace() of GD library Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imageinterlace_error1.phpt b/ext/gd/tests/imageinterlace_error1.phpt index 5c871e7bba..2dd438a5e7 100644 --- a/ext/gd/tests/imageinterlace_error1.phpt +++ b/ext/gd/tests/imageinterlace_error1.phpt @@ -4,7 +4,7 @@ Testing passing no parameters to imageinterlace() of GD library Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imageinterlace_error2.phpt b/ext/gd/tests/imageinterlace_error2.phpt index 808c88a312..e20f3ae901 100644 --- a/ext/gd/tests/imageinterlace_error2.phpt +++ b/ext/gd/tests/imageinterlace_error2.phpt @@ -4,7 +4,7 @@ Testing resource that is not a image to imageinterlace() of GD library Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imageinterlace_variation1.phpt b/ext/gd/tests/imageinterlace_variation1.phpt index 2c224ef41f..d8eb7972fa 100644 --- a/ext/gd/tests/imageinterlace_variation1.phpt +++ b/ext/gd/tests/imageinterlace_variation1.phpt @@ -4,7 +4,7 @@ Testing setting the interlace bit on with imageinterlace() of GD library Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imageinterlace_variation2.phpt b/ext/gd/tests/imageinterlace_variation2.phpt index b4735dcfb9..f1ee51502d 100644 --- a/ext/gd/tests/imageinterlace_variation2.phpt +++ b/ext/gd/tests/imageinterlace_variation2.phpt @@ -4,7 +4,7 @@ Testing setting the interlace bit off with imageinterlace() of GD library Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imageistruecolor_basic.phpt b/ext/gd/tests/imageistruecolor_basic.phpt index a78aaa46ef..d43052db7d 100644 --- a/ext/gd/tests/imageistruecolor_basic.phpt +++ b/ext/gd/tests/imageistruecolor_basic.phpt @@ -3,7 +3,7 @@ Testing imageistruecolor() of GD library --CREDITS-- Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible"); ?> diff --git a/ext/gd/tests/imageistruecolor_error1.phpt b/ext/gd/tests/imageistruecolor_error1.phpt index 06453b7d31..8b3033c39b 100644 --- a/ext/gd/tests/imageistruecolor_error1.phpt +++ b/ext/gd/tests/imageistruecolor_error1.phpt @@ -3,7 +3,7 @@ Testing imageistruecolor(): wrong parameters --CREDITS-- Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible"); ?> diff --git a/ext/gd/tests/imagelayereffect_basic.phpt b/ext/gd/tests/imagelayereffect_basic.phpt index 2c948fd0c5..5a9c380758 100644 --- a/ext/gd/tests/imagelayereffect_basic.phpt +++ b/ext/gd/tests/imagelayereffect_basic.phpt @@ -4,7 +4,7 @@ Testing imagelayereffect() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); if (!GD_BUNDLED) die('skip function only available in bundled, external GD detected'); ?> diff --git a/ext/gd/tests/imagelayereffect_error1.phpt b/ext/gd/tests/imagelayereffect_error1.phpt index 21f37a8a1e..1265b84ad1 100644 --- a/ext/gd/tests/imagelayereffect_error1.phpt +++ b/ext/gd/tests/imagelayereffect_error1.phpt @@ -4,7 +4,7 @@ Testing imagelayereffect() with invalid resource of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); if (!GD_BUNDLED) die('skip function only available in bundled, external GD detected'); ?> diff --git a/ext/gd/tests/imagelayereffect_error2.phpt b/ext/gd/tests/imagelayereffect_error2.phpt index 83210f789f..bf535ffd24 100644 --- a/ext/gd/tests/imagelayereffect_error2.phpt +++ b/ext/gd/tests/imagelayereffect_error2.phpt @@ -4,7 +4,7 @@ Testing imagelayereffect() wth invalid effect of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); if (!GD_BUNDLED) die('skip function only available in bundled, external GD detected'); ?> diff --git a/ext/gd/tests/imagelayereffect_error3.phpt b/ext/gd/tests/imagelayereffect_error3.phpt index d4deff1076..63d1e0e951 100644 --- a/ext/gd/tests/imagelayereffect_error3.phpt +++ b/ext/gd/tests/imagelayereffect_error3.phpt @@ -4,7 +4,7 @@ Testing imagelayereffect() with invalid resource of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); if (!GD_BUNDLED) die('skip function only available in bundled, external GD detected'); ?> diff --git a/ext/gd/tests/imageloadfont_error2.phpt b/ext/gd/tests/imageloadfont_error2.phpt index 459cb71f5f..262009f2cf 100644 --- a/ext/gd/tests/imageloadfont_error2.phpt +++ b/ext/gd/tests/imageloadfont_error2.phpt @@ -3,7 +3,7 @@ Testing that imageloadfont() breaks on invalid file passed as first argument --CREDITS-- Austin Drouare <austin.drouare [at] gmail [dot] com> #testfest #tek11 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imageloadfont_invalid.phpt b/ext/gd/tests/imageloadfont_invalid.phpt index 871d1510f0..5246a0713d 100644 --- a/ext/gd/tests/imageloadfont_invalid.phpt +++ b/ext/gd/tests/imageloadfont_invalid.phpt @@ -1,8 +1,8 @@ --TEST-- imageloadfont() function crashes --SKIPIF-- -<?php - if (!extension_loaded('gd')) die("skip gd extension not available\n"); +<?php + if (!extension_loaded('gd')) die("skip gd extension not available\n"); ?> --FILE-- <?php diff --git a/ext/gd/tests/imagepolygon_basic.phpt b/ext/gd/tests/imagepolygon_basic.phpt index 5c79cdf5be..19e54fa901 100644 --- a/ext/gd/tests/imagepolygon_basic.phpt +++ b/ext/gd/tests/imagepolygon_basic.phpt @@ -1,8 +1,8 @@ --TEST-- imageploygon() --SKIPIF-- -<?php - if (!function_exists('imagepolygon')) die('skip imagepolygon() not available'); +<?php + if (!function_exists('imagepolygon')) die('skip imagepolygon() not available'); require_once('skipif_imagetype.inc'); ?> --FILE-- @@ -11,7 +11,7 @@ imageploygon() /* Prototype : bool imagepolygon ( resource $image , array $points , int $num_points , int $color ) * Description: Draws a polygon. * Source code: ext/standard/image.c - * Alias to functions: + * Alias to functions: */ @@ -45,16 +45,16 @@ $col2 = imagecolorat($image, 100, 100); $color1 = imagecolorsforindex($image, $col1); $color2 = imagecolorsforindex($image, $col2); var_dump($color1, $color2); - + imagedestroy($image); -echo "Done\n"; +echo "Done\n"; ?> --CLEAN-- <?php $dest = dirname(realpath(__FILE__)) . '/imagepolygon.png'; @unlink($dest); -?> +?> --EXPECT-- Simple test of imagepolygon() function array(4) { diff --git a/ext/gd/tests/imagepolygon_negative.phpt b/ext/gd/tests/imagepolygon_negative.phpt index bb9010c92f..d122a3bbaa 100644 --- a/ext/gd/tests/imagepolygon_negative.phpt +++ b/ext/gd/tests/imagepolygon_negative.phpt @@ -1,8 +1,8 @@ --TEST-- imagepolygon() with a negative num of points --SKIPIF-- -<?php - if (!function_exists('imagepolygon')) die('skip imagepolygon() not available'); +<?php + if (!function_exists('imagepolygon')) die('skip imagepolygon() not available'); ?> --FILE-- <?php diff --git a/ext/gd/tests/imagerectangle_basic.phpt b/ext/gd/tests/imagerectangle_basic.phpt index d23cbdfe79..01544429f6 100644 --- a/ext/gd/tests/imagerectangle_basic.phpt +++ b/ext/gd/tests/imagerectangle_basic.phpt @@ -1,22 +1,22 @@ ---TEST-- +--TEST-- Testing imagerectangle() of GD library ---CREDITS-- +--CREDITS-- Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 ---SKIPIF-- -<?php -if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); -?> +--SKIPIF-- +<?php +if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); +?> --FILE-- <?php // Create a image -$image = imagecreatetruecolor( 100, 100 ); +$image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle imagerectangle( $image, 0, 0, 50, 50, imagecolorallocate($image, 255, 255, 255) ); include_once __DIR__ . '/func.inc'; test_image_equals_file(__DIR__ . '/imagerectangle_basic.png', $image); -?> ---EXPECT-- +?> +--EXPECT-- The images are equal. diff --git a/ext/gd/tests/imagerectangle_error1.phpt b/ext/gd/tests/imagerectangle_error1.phpt index 3b9e8d3f0c..4e8c1b4d1d 100644 --- a/ext/gd/tests/imagerectangle_error1.phpt +++ b/ext/gd/tests/imagerectangle_error1.phpt @@ -1,19 +1,19 @@ ---TEST-- +--TEST-- Testing wrong param passing imagerectangle() of GD library ---CREDITS-- +--CREDITS-- Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 ---SKIPIF-- -<?php -if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); -?> +--SKIPIF-- +<?php +if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); +?> --FILE-- <?php // Create a image -$image = imagecreatetruecolor( 100, 100 ); +$image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle imagerectangle( 'wrong param', 0, 0, 50, 50, imagecolorallocate($image, 255, 255, 255) ); -?> +?> --EXPECTF-- Warning: imagerectangle() expects parameter 1 to be resource, %s given in %s on line %d diff --git a/ext/gd/tests/imagerectangle_error2.phpt b/ext/gd/tests/imagerectangle_error2.phpt index 63525d2cb7..4f20dd81bb 100644 --- a/ext/gd/tests/imagerectangle_error2.phpt +++ b/ext/gd/tests/imagerectangle_error2.phpt @@ -1,19 +1,19 @@ ---TEST-- +--TEST-- Testing wrong param passing imagerectangle() of GD library ---CREDITS-- +--CREDITS-- Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 ---SKIPIF-- -<?php -if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); -?> +--SKIPIF-- +<?php +if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); +?> --FILE-- <?php // Create a resource -$image = tmpfile(); +$image = tmpfile(); // Draw a rectangle imagerectangle( $image, 0, 0, 50, 50, 2 ); -?> ---EXPECTF-- +?> +--EXPECTF-- Warning: imagerectangle(): supplied resource is not a valid Image resource in %s on line %d
\ No newline at end of file diff --git a/ext/gd/tests/imagerectangle_error3.phpt b/ext/gd/tests/imagerectangle_error3.phpt index 93a2acb339..dfcc66c69e 100644 --- a/ext/gd/tests/imagerectangle_error3.phpt +++ b/ext/gd/tests/imagerectangle_error3.phpt @@ -1,19 +1,19 @@ ---TEST-- +--TEST-- Testing wrong param passing imagerectangle() of GD library ---CREDITS-- +--CREDITS-- Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 ---SKIPIF-- -<?php -if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); -?> +--SKIPIF-- +<?php +if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); +?> --FILE-- <?php // Create a image -$image = imagecreatetruecolor( 100, 100 ); +$image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle imagerectangle( $image, 'wrong param', 0, 50, 50, imagecolorallocate($image, 255, 255, 255) ); -?> +?> --EXPECTF-- Warning: imagerectangle() expects parameter 2 to be int, %s given in %s on line %d diff --git a/ext/gd/tests/imagerectangle_error4.phpt b/ext/gd/tests/imagerectangle_error4.phpt index b9253545fc..8ee437dd33 100644 --- a/ext/gd/tests/imagerectangle_error4.phpt +++ b/ext/gd/tests/imagerectangle_error4.phpt @@ -1,19 +1,19 @@ ---TEST-- +--TEST-- Testing wrong param passing imagerectangle() of GD library ---CREDITS-- +--CREDITS-- Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 ---SKIPIF-- -<?php -if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); -?> +--SKIPIF-- +<?php +if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); +?> --FILE-- <?php // Create a image -$image = imagecreatetruecolor( 100, 100 ); +$image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle imagerectangle( $image, 0, 'wrong param', 50, 50, imagecolorallocate($image, 255, 255, 255) ); -?> +?> --EXPECTF-- Warning: imagerectangle() expects parameter 3 to be int, %s given in %s on line %d diff --git a/ext/gd/tests/imagerectangle_error5.phpt b/ext/gd/tests/imagerectangle_error5.phpt index 6be6b5301d..9ccca07ae7 100644 --- a/ext/gd/tests/imagerectangle_error5.phpt +++ b/ext/gd/tests/imagerectangle_error5.phpt @@ -1,19 +1,19 @@ ---TEST-- +--TEST-- Testing wrong param passing imagerectangle() of GD library ---CREDITS-- +--CREDITS-- Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 ---SKIPIF-- -<?php -if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); -?> +--SKIPIF-- +<?php +if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); +?> --FILE-- <?php // Create a image -$image = imagecreatetruecolor( 100, 100 ); +$image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle imagerectangle( $image, 0, 0, 'wrong param', 50, imagecolorallocate($image, 255, 255, 255) ); -?> +?> --EXPECTF-- Warning: imagerectangle() expects parameter 4 to be int, %s given in %s on line %d diff --git a/ext/gd/tests/imagerectangle_error6.phpt b/ext/gd/tests/imagerectangle_error6.phpt index 2b89543c31..0b35ec8f71 100644 --- a/ext/gd/tests/imagerectangle_error6.phpt +++ b/ext/gd/tests/imagerectangle_error6.phpt @@ -1,19 +1,19 @@ ---TEST-- +--TEST-- Testing wrong param passing imagerectangle() of GD library ---CREDITS-- +--CREDITS-- Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 ---SKIPIF-- -<?php -if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); -?> +--SKIPIF-- +<?php +if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); +?> --FILE-- <?php // Create a image -$image = imagecreatetruecolor( 100, 100 ); +$image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle imagerectangle( $image, 0, 0, 50, 'wrong param', imagecolorallocate($image, 255, 255, 255) ); -?> +?> --EXPECTF-- Warning: imagerectangle() expects parameter 5 to be int, %s given in %s on line %d diff --git a/ext/gd/tests/imagerectangle_error7.phpt b/ext/gd/tests/imagerectangle_error7.phpt index dfec56439f..e1187ee2d6 100644 --- a/ext/gd/tests/imagerectangle_error7.phpt +++ b/ext/gd/tests/imagerectangle_error7.phpt @@ -1,19 +1,19 @@ ---TEST-- +--TEST-- Testing wrong param passing imagerectangle() of GD library ---CREDITS-- +--CREDITS-- Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 ---SKIPIF-- -<?php -if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); -?> +--SKIPIF-- +<?php +if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); +?> --FILE-- <?php // Create a image -$image = imagecreatetruecolor( 100, 100 ); +$image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle imagerectangle( $image, 0, 0, 50, 50, 'wrong param' ); -?> +?> --EXPECTF-- Warning: imagerectangle() expects parameter 6 to be int, %s given in %s on line %d diff --git a/ext/gd/tests/imagerectangle_error8.phpt b/ext/gd/tests/imagerectangle_error8.phpt index cb0746e492..63e293c217 100644 --- a/ext/gd/tests/imagerectangle_error8.phpt +++ b/ext/gd/tests/imagerectangle_error8.phpt @@ -1,19 +1,19 @@ ---TEST-- +--TEST-- Testing wrong param passing imagerectangle() of GD library ---CREDITS-- +--CREDITS-- Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 ---SKIPIF-- -<?php -if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); -?> +--SKIPIF-- +<?php +if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); +?> --FILE-- <?php // Create a image -$image = imagecreatetruecolor( 100, 100 ); +$image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle imagerectangle( $image, 0, 0, 50, 50 ); -?> +?> --EXPECTF-- Warning: imagerectangle() expects exactly 6 parameters, %d given in %s on line %d diff --git a/ext/gd/tests/imagesetbrush_basic.phpt b/ext/gd/tests/imagesetbrush_basic.phpt index e1a9c6a80c..0afe6fc1d0 100644 --- a/ext/gd/tests/imagesetbrush_basic.phpt +++ b/ext/gd/tests/imagesetbrush_basic.phpt @@ -13,16 +13,16 @@ if (!extension_loaded('gd')) { <?php // Create the brush image $img = imagecreate(10, 10); - + // Create the main image, 100x100 $mainimg = imagecreatetruecolor(100, 100); - + $white = imagecolorallocate($img, 255, 0, 0); imagefilledrectangle($img, 0, 0, 299, 99, $white); // Set the brush imagesetbrush($mainimg, $img); - + // Draw a couple of brushes, each overlaying each imageline($mainimg, 50, 50, 50, 60, IMG_COLOR_BRUSHED); diff --git a/ext/gd/tests/imagesetthickness_basic.phpt b/ext/gd/tests/imagesetthickness_basic.phpt index 3c91a886df..376d18f790 100644 --- a/ext/gd/tests/imagesetthickness_basic.phpt +++ b/ext/gd/tests/imagesetthickness_basic.phpt @@ -3,7 +3,7 @@ Testing imagetruecolortopalette() of GD library --CREDITS-- Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible"); ?> diff --git a/ext/gd/tests/imagesetthickness_error1.phpt b/ext/gd/tests/imagesetthickness_error1.phpt index 0aed3a1f2f..112f9df863 100644 --- a/ext/gd/tests/imagesetthickness_error1.phpt +++ b/ext/gd/tests/imagesetthickness_error1.phpt @@ -3,7 +3,7 @@ Testing imagetruecolortopalette(): wrong types for first parameter --CREDITS-- Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagesetthickness_error2.phpt b/ext/gd/tests/imagesetthickness_error2.phpt index f829cbebc5..5052472f7e 100644 --- a/ext/gd/tests/imagesetthickness_error2.phpt +++ b/ext/gd/tests/imagesetthickness_error2.phpt @@ -3,7 +3,7 @@ Testing imagetruecolortopalette(): wrong types for second parameter --CREDITS-- Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible"); ?> diff --git a/ext/gd/tests/imagestring_basic.phpt b/ext/gd/tests/imagestring_basic.phpt index 311683f7af..1265fed6e6 100644 --- a/ext/gd/tests/imagestring_basic.phpt +++ b/ext/gd/tests/imagestring_basic.phpt @@ -4,7 +4,7 @@ Testing imagestring() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagestring_error1.phpt b/ext/gd/tests/imagestring_error1.phpt index b31f74ebfa..96055bd9df 100644 --- a/ext/gd/tests/imagestring_error1.phpt +++ b/ext/gd/tests/imagestring_error1.phpt @@ -4,7 +4,7 @@ Testing error on non-resource parameter 1 of imagestring() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagestring_error2.phpt b/ext/gd/tests/imagestring_error2.phpt index d6146f7089..e4b22651c6 100644 --- a/ext/gd/tests/imagestring_error2.phpt +++ b/ext/gd/tests/imagestring_error2.phpt @@ -4,7 +4,7 @@ Testing error on non-image resource parameter 1 of imagestring() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagestring_error3.phpt b/ext/gd/tests/imagestring_error3.phpt index 783e89e19a..9f5a9ff2cf 100644 --- a/ext/gd/tests/imagestring_error3.phpt +++ b/ext/gd/tests/imagestring_error3.phpt @@ -4,7 +4,7 @@ Testing error on non-long parameter 2 of imagestring() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagestring_error4.phpt b/ext/gd/tests/imagestring_error4.phpt index 3db02d9723..443177e588 100644 --- a/ext/gd/tests/imagestring_error4.phpt +++ b/ext/gd/tests/imagestring_error4.phpt @@ -4,7 +4,7 @@ Testing error on non-long parameter 3 of imagestring() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagestring_error5.phpt b/ext/gd/tests/imagestring_error5.phpt index 05d674e6aa..50c6ff3999 100644 --- a/ext/gd/tests/imagestring_error5.phpt +++ b/ext/gd/tests/imagestring_error5.phpt @@ -4,7 +4,7 @@ Testing error on non-long parameter 4 of imagestring() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagestring_error6.phpt b/ext/gd/tests/imagestring_error6.phpt index 29bc79d4f6..9306e5bf15 100644 --- a/ext/gd/tests/imagestring_error6.phpt +++ b/ext/gd/tests/imagestring_error6.phpt @@ -4,7 +4,7 @@ Testing error on non-string parameter 5 of imagestring() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagestring_error7.phpt b/ext/gd/tests/imagestring_error7.phpt index 8d9e017e1b..5a3c126ed0 100644 --- a/ext/gd/tests/imagestring_error7.phpt +++ b/ext/gd/tests/imagestring_error7.phpt @@ -4,7 +4,7 @@ Testing error on non-long parameter 6 of imagestring() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagestringup_basic.phpt b/ext/gd/tests/imagestringup_basic.phpt index 015d375ede..4a53da464f 100644 --- a/ext/gd/tests/imagestringup_basic.phpt +++ b/ext/gd/tests/imagestringup_basic.phpt @@ -4,7 +4,7 @@ Testing imagestringup() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagestringup_error1.phpt b/ext/gd/tests/imagestringup_error1.phpt index 14477273ba..12f802139b 100644 --- a/ext/gd/tests/imagestringup_error1.phpt +++ b/ext/gd/tests/imagestringup_error1.phpt @@ -4,7 +4,7 @@ Testing error on non-resource parameter 1 of imagestringup() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagestringup_error2.phpt b/ext/gd/tests/imagestringup_error2.phpt index d1d5aa26ac..871dd54fde 100644 --- a/ext/gd/tests/imagestringup_error2.phpt +++ b/ext/gd/tests/imagestringup_error2.phpt @@ -4,7 +4,7 @@ Testing error on non-image resource parameter 1 of imagestringup() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagestringup_error3.phpt b/ext/gd/tests/imagestringup_error3.phpt index d436749829..dbe2b9aabc 100644 --- a/ext/gd/tests/imagestringup_error3.phpt +++ b/ext/gd/tests/imagestringup_error3.phpt @@ -4,7 +4,7 @@ Testing error on non-long parameter 2 of imagestringup() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagestringup_error4.phpt b/ext/gd/tests/imagestringup_error4.phpt index 7d8b2fd9ce..9ecd3d236c 100644 --- a/ext/gd/tests/imagestringup_error4.phpt +++ b/ext/gd/tests/imagestringup_error4.phpt @@ -4,7 +4,7 @@ Testing error on non-long parameter 3 of imagestringup() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagestringup_error6.phpt b/ext/gd/tests/imagestringup_error6.phpt index ac6fe4a88a..8683c0b5b0 100644 --- a/ext/gd/tests/imagestringup_error6.phpt +++ b/ext/gd/tests/imagestringup_error6.phpt @@ -4,7 +4,7 @@ Testing error on non-string parameter 5 of imagestringup() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagestringup_error7.phpt b/ext/gd/tests/imagestringup_error7.phpt index 6afa7cb3a7..1caef65828 100644 --- a/ext/gd/tests/imagestringup_error7.phpt +++ b/ext/gd/tests/imagestringup_error7.phpt @@ -4,7 +4,7 @@ Testing error on non-long parameter 6 of imagestringup() of GD library Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- diff --git a/ext/gd/tests/imagetruecolortopalette_basic.phpt b/ext/gd/tests/imagetruecolortopalette_basic.phpt index 9bc922a15b..18aa04a35d 100644 --- a/ext/gd/tests/imagetruecolortopalette_basic.phpt +++ b/ext/gd/tests/imagetruecolortopalette_basic.phpt @@ -3,7 +3,7 @@ Testing imagetruecolortopalette() of GD library --CREDITS-- Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- -<?php +<?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"); diff --git a/ext/gd/tests/imagetruecolortopalette_error1.phpt b/ext/gd/tests/imagetruecolortopalette_error1.phpt index ecafa158b6..2c3dd0d429 100644 --- a/ext/gd/tests/imagetruecolortopalette_error1.phpt +++ b/ext/gd/tests/imagetruecolortopalette_error1.phpt @@ -3,7 +3,7 @@ Testing imagetruecolortopalette(): wrong parameters for parameter 1 --CREDITS-- Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible"); ?> diff --git a/ext/gd/tests/imagetruecolortopalette_error2.phpt b/ext/gd/tests/imagetruecolortopalette_error2.phpt index 9a38187421..6486a929f2 100644 --- a/ext/gd/tests/imagetruecolortopalette_error2.phpt +++ b/ext/gd/tests/imagetruecolortopalette_error2.phpt @@ -3,7 +3,7 @@ Testing imagetruecolortopalette(): wrong parameters for parameter 2 --CREDITS-- Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible"); ?> diff --git a/ext/gd/tests/imagetruecolortopalette_error3.phpt b/ext/gd/tests/imagetruecolortopalette_error3.phpt index 41d5978274..d89bbcb31b 100644 --- a/ext/gd/tests/imagetruecolortopalette_error3.phpt +++ b/ext/gd/tests/imagetruecolortopalette_error3.phpt @@ -3,7 +3,7 @@ Testing imagetruecolortopalette(): wrong parameters for parameter 3 --CREDITS-- Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible"); ?> diff --git a/ext/gd/tests/imagetruecolortopalette_error4.phpt b/ext/gd/tests/imagetruecolortopalette_error4.phpt index f0e18b86be..2db042e89f 100644 --- a/ext/gd/tests/imagetruecolortopalette_error4.phpt +++ b/ext/gd/tests/imagetruecolortopalette_error4.phpt @@ -3,7 +3,7 @@ Testing imagetruecolortopalette(): out of range parameter 3 --CREDITS-- Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- -<?php +<?php if (!extension_loaded("gd")) die("skip GD not present"); if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible"); ?> diff --git a/ext/gd/tests/jpeg2wbmp_error1.phpt b/ext/gd/tests/jpeg2wbmp_error1.phpt index 2368e7549f..fcdef0bcb1 100644 --- a/ext/gd/tests/jpeg2wbmp_error1.phpt +++ b/ext/gd/tests/jpeg2wbmp_error1.phpt @@ -4,7 +4,7 @@ Test jpeg2wbmp() function : wrong threshold value param Levi Fukumori <levi [at] fukumori [dot] com [dot] br> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if(!extension_loaded('gd')) { die('skip gd extension is not loaded'); } diff --git a/ext/gd/tests/jpeg2wbmp_error2-mb.phpt b/ext/gd/tests/jpeg2wbmp_error2-mb.phpt index b414cb35aa..4eeac126a4 100644 --- a/ext/gd/tests/jpeg2wbmp_error2-mb.phpt +++ b/ext/gd/tests/jpeg2wbmp_error2-mb.phpt @@ -4,7 +4,7 @@ Test jpeg2wbmp() function : wrong origin filename param Levi Fukumori <levi [at] fukumori [dot] com [dot] br> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if(!extension_loaded('gd')) { die('skip gd extension is not loaded'); } diff --git a/ext/gd/tests/jpeg2wbmp_error2.phpt b/ext/gd/tests/jpeg2wbmp_error2.phpt index 22e2301d99..405eb83129 100644 --- a/ext/gd/tests/jpeg2wbmp_error2.phpt +++ b/ext/gd/tests/jpeg2wbmp_error2.phpt @@ -4,7 +4,7 @@ Test jpeg2wbmp() function : wrong origin filename param Levi Fukumori <levi [at] fukumori [dot] com [dot] br> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if(!extension_loaded('gd')) { die('skip gd extension is not loaded'); } diff --git a/ext/gd/tests/jpeg2wbmp_error3.phpt b/ext/gd/tests/jpeg2wbmp_error3.phpt index e15c94765f..2662b7a86b 100644 --- a/ext/gd/tests/jpeg2wbmp_error3.phpt +++ b/ext/gd/tests/jpeg2wbmp_error3.phpt @@ -4,7 +4,7 @@ Test jpeg2wbmp() function : wrong destination filename param Levi Fukumori <levi [at] fukumori [dot] com [dot] br> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if(!extension_loaded('gd')) { die('skip gd extension is not loaded'); } diff --git a/ext/gd/tests/png2wbmp_error1-mb.phpt b/ext/gd/tests/png2wbmp_error1-mb.phpt index a16e1a67c6..8c779d36d9 100644 --- a/ext/gd/tests/png2wbmp_error1-mb.phpt +++ b/ext/gd/tests/png2wbmp_error1-mb.phpt @@ -4,7 +4,7 @@ Test png2wbmp() function : wrong threshold value param Levi Fukumori <levi [at] fukumori [dot] com [dot] br> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if(!extension_loaded('gd')) { die('skip gd extension is not loaded'); } diff --git a/ext/gd/tests/png2wbmp_error1.phpt b/ext/gd/tests/png2wbmp_error1.phpt index e3496a45c9..543013b4bc 100644 --- a/ext/gd/tests/png2wbmp_error1.phpt +++ b/ext/gd/tests/png2wbmp_error1.phpt @@ -4,7 +4,7 @@ Test png2wbmp() function : wrong threshold value param Levi Fukumori <levi [at] fukumori [dot] com [dot] br> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if(!extension_loaded('gd')) { die('skip gd extension is not loaded'); } diff --git a/ext/gd/tests/png2wbmp_error2.phpt b/ext/gd/tests/png2wbmp_error2.phpt index 71912b6198..a674e0d6cc 100644 --- a/ext/gd/tests/png2wbmp_error2.phpt +++ b/ext/gd/tests/png2wbmp_error2.phpt @@ -4,7 +4,7 @@ Test png2wbmp() function : wrong origin filename param Levi Fukumori <levi [at] fukumori [dot] com [dot] br> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if(!extension_loaded('gd')) { die('skip gd extension is not loaded'); } diff --git a/ext/gd/tests/png2wbmp_error3.phpt b/ext/gd/tests/png2wbmp_error3.phpt index 53ffb54319..3cab3ccb98 100644 --- a/ext/gd/tests/png2wbmp_error3.phpt +++ b/ext/gd/tests/png2wbmp_error3.phpt @@ -4,7 +4,7 @@ Test png2wbmp() function : wrong destination filename param Levi Fukumori <levi [at] fukumori [dot] com [dot] br> #testfest PHPSP on 2009-06-20 --SKIPIF-- -<?php +<?php if(!extension_loaded('gd')) { die('skip gd extension is not loaded'); } diff --git a/ext/gd/tests/xbm2png.phpt b/ext/gd/tests/xbm2png.phpt index 6edebc0b8d..7eaabc410b 100644 --- a/ext/gd/tests/xbm2png.phpt +++ b/ext/gd/tests/xbm2png.phpt @@ -1,7 +1,7 @@ --TEST-- xbm --> png conversion test --SKIPIF-- -<?php +<?php if (!extension_loaded('gd')) { die("skip gd extension not available."); } @@ -19,7 +19,7 @@ xbm --> png conversion test echo "XBM to PNG conversion: "; echo imagepng(imagecreatefromxbm($cwd . "/conv_test.xbm"), $cwd . "/test_xbm.png") ? 'ok' : 'failed'; echo "\n"; - + @unlink($cwd . "/test_xbm.png"); ?> --EXPECT-- diff --git a/ext/gettext/tests/dcngettext.phpt b/ext/gettext/tests/dcngettext.phpt index 2b8e2b196d..4bf493507b 100644 --- a/ext/gettext/tests/dcngettext.phpt +++ b/ext/gettext/tests/dcngettext.phpt @@ -1,8 +1,8 @@ --TEST-- dcngettext() tests --SKIPIF-- -<?php -if (!extension_loaded("gettext")) die("skip"); +<?php +if (!extension_loaded("gettext")) die("skip"); if (!function_exists("dcngettext")) die("skip dcngettext() doesn't exist"); ?> --FILE-- @@ -18,7 +18,7 @@ var_dump(dcngettext("","","",0,0)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: dcngettext() expects exactly 5 parameters, 4 given in %s on line %d bool(false) string(1) "1" diff --git a/ext/gettext/tests/gettext_basic-enus.phpt b/ext/gettext/tests/gettext_basic-enus.phpt index 4691d77f83..207739b3f8 100644 --- a/ext/gettext/tests/gettext_basic-enus.phpt +++ b/ext/gettext/tests/gettext_basic-enus.phpt @@ -1,7 +1,7 @@ --TEST-- Gettext basic test with en_US locale that should be on nearly every system --SKIPIF-- -<?php +<?php if (!extension_loaded("gettext")) { die("skip\n"); } @@ -10,7 +10,7 @@ Gettext basic test with en_US locale that should be on nearly every system } ?> --FILE-- -<?php +<?php chdir(dirname(__FILE__)); setlocale(LC_ALL, 'en_US.UTF-8'); diff --git a/ext/gettext/tests/gettext_basic.phpt b/ext/gettext/tests/gettext_basic.phpt index b61cbf234a..a93fa8bbfe 100644 --- a/ext/gettext/tests/gettext_basic.phpt +++ b/ext/gettext/tests/gettext_basic.phpt @@ -1,7 +1,7 @@ --TEST-- Gettext basic test --SKIPIF-- -<?php +<?php if (!extension_loaded("gettext")) { die("skip\n"); } diff --git a/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt b/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt index 6d0048026d..66be43289a 100644 --- a/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt +++ b/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt @@ -1,9 +1,9 @@ --TEST-- test if bind_textdomain_codeset() returns correct value --SKIPIF-- -<?php +<?php if (!extension_loaded("gettext")) { - die("skip"); + die("skip"); } ?> --FILE-- @@ -13,7 +13,7 @@ test if bind_textdomain_codeset() returns correct value echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- bool(false) string(5) "UTF-8" Done diff --git a/ext/gettext/tests/gettext_bind_textdomain_codeset-wrongparams.phpt b/ext/gettext/tests/gettext_bind_textdomain_codeset-wrongparams.phpt index eb50c5d6e5..0361f45e91 100644 --- a/ext/gettext/tests/gettext_bind_textdomain_codeset-wrongparams.phpt +++ b/ext/gettext/tests/gettext_bind_textdomain_codeset-wrongparams.phpt @@ -1,9 +1,9 @@ --TEST-- test if bind_textdomain_codeset() fails on wrong param count --SKIPIF-- -<?php +<?php if (!extension_loaded("gettext")) { - die("skip"); + die("skip"); } ?> --FILE-- @@ -13,7 +13,7 @@ test if bind_textdomain_codeset() fails on wrong param count echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: bind_textdomain_codeset() expects exactly 2 parameters, 1 given in %s on line %d Warning: bind_textdomain_codeset() expects exactly 2 parameters, 3 given in %s on line %d diff --git a/ext/gettext/tests/gettext_dgettext_error_wrongparams.phpt b/ext/gettext/tests/gettext_dgettext_error_wrongparams.phpt index 783935826c..b28072b7ea 100644 --- a/ext/gettext/tests/gettext_dgettext_error_wrongparams.phpt +++ b/ext/gettext/tests/gettext_dgettext_error_wrongparams.phpt @@ -1,7 +1,7 @@ --TEST-- Check how dgettext() with wrong parameter types and wrong parameter cou types and wrong parameter count behaves. --SKIPIF-- -<?php +<?php if (!extension_loaded("gettext")) { die("skip extension gettext not loaded\n"); } @@ -11,7 +11,7 @@ Check how dgettext() with wrong parameter types and wrong parameter cou types an ?> --FILE-- -<?php +<?php chdir(dirname(__FILE__)); setlocale(LC_ALL, 'en_US.UTF-8'); dgettext ('foo'); diff --git a/ext/gettext/tests/gettext_gettext_error_wrongparams.phpt b/ext/gettext/tests/gettext_gettext_error_wrongparams.phpt index a90109053c..418cdff5e2 100644 --- a/ext/gettext/tests/gettext_gettext_error_wrongparams.phpt +++ b/ext/gettext/tests/gettext_gettext_error_wrongparams.phpt @@ -1,13 +1,13 @@ --TEST-- Check how gettext() with wrong parameters behaves. --SKIPIF-- -<?php +<?php if (!extension_loaded("gettext")) { die("skip extension gettext not loaded\n"); } ?> --FILE-- -<?php +<?php gettext (array()); ?> --EXPECTF-- diff --git a/ext/gettext/tests/gettext_ngettext-wrongparams.phpt b/ext/gettext/tests/gettext_ngettext-wrongparams.phpt index dfff6a6dac..aac6c8b7f6 100644 --- a/ext/gettext/tests/gettext_ngettext-wrongparams.phpt +++ b/ext/gettext/tests/gettext_ngettext-wrongparams.phpt @@ -1,7 +1,7 @@ --TEST-- Check how ngettext() with wrong parameters behaves. --SKIPIF-- -<?php +<?php if (!extension_loaded("gettext")) { die("SKIP extension gettext not loaded\n"); } diff --git a/ext/gettext/tests/gettext_ngettext.phpt b/ext/gettext/tests/gettext_ngettext.phpt index 01019a06a1..8de4534265 100644 --- a/ext/gettext/tests/gettext_ngettext.phpt +++ b/ext/gettext/tests/gettext_ngettext.phpt @@ -1,7 +1,7 @@ --TEST-- Test ngettext() functionality --SKIPIF-- -<?php +<?php if (!extension_loaded("gettext")) { die("SKIP extension gettext not loaded\n"); } diff --git a/ext/gettext/tests/gettext_phpinfo.phpt b/ext/gettext/tests/gettext_phpinfo.phpt index 6a38943d10..cbfb916c2d 100644 --- a/ext/gettext/tests/gettext_phpinfo.phpt +++ b/ext/gettext/tests/gettext_phpinfo.phpt @@ -1,7 +1,7 @@ --TEST-- Test phpinfo() displays gettext support --SKIPIF-- -<?php +<?php if (!extension_loaded("gettext")) { die("SKIP extension gettext not loaded\n"); } diff --git a/ext/gettext/tests/gettext_textdomain-retval.phpt b/ext/gettext/tests/gettext_textdomain-retval.phpt index 3e82f6711a..35f23b0d53 100644 --- a/ext/gettext/tests/gettext_textdomain-retval.phpt +++ b/ext/gettext/tests/gettext_textdomain-retval.phpt @@ -1,7 +1,7 @@ --TEST-- Check if textdomain() returns the new domain --SKIPIF-- -<?php +<?php if (!extension_loaded("gettext")) { die("skip\n"); } diff --git a/ext/gettext/tests/gettext_textdomain-wrongparams.phpt b/ext/gettext/tests/gettext_textdomain-wrongparams.phpt index 599e48ef35..9d6c8ec515 100644 --- a/ext/gettext/tests/gettext_textdomain-wrongparams.phpt +++ b/ext/gettext/tests/gettext_textdomain-wrongparams.phpt @@ -1,7 +1,7 @@ --TEST-- Check how textdomain() with wrong parameters behaves. --SKIPIF-- -<?php +<?php if (!extension_loaded("gettext")) { die("skip\n"); } diff --git a/ext/gmp/tests/002.phpt b/ext/gmp/tests/002.phpt index ac2a7a5494..0fbc864ec6 100644 --- a/ext/gmp/tests/002.phpt +++ b/ext/gmp/tests/002.phpt @@ -3,9 +3,9 @@ GMP functionality test - factorial --SKIPIF-- <?php if (!extension_loaded("gmp")) print "skip"; ?> --FILE-- -<?php +<?php function fact($x) { - if($x <= 1) + if($x <= 1) return 1; else return gmp_mul($x,fact($x-1)); diff --git a/ext/gmp/tests/bug32773.phpt b/ext/gmp/tests/bug32773.phpt index 6823fa1a1b..efa293bbf2 100644 --- a/ext/gmp/tests/bug32773.phpt +++ b/ext/gmp/tests/bug32773.phpt @@ -6,10 +6,10 @@ Bug #32773 (binary GMP functions returns unexpected value, when second parameter <?php echo '10 + 0 = ', gmp_strval(gmp_add(10, 0)), "\n"; echo '10 + "0" = ', gmp_strval(gmp_add(10, '0')), "\n"; - + echo gmp_strval(gmp_div(10, 0))."\n"; echo gmp_strval(gmp_div_qr(10, 0))."\n"; - + ?> --EXPECTF-- 10 + 0 = 10 diff --git a/ext/gmp/tests/bug52906.phpt b/ext/gmp/tests/bug52906.phpt index 2bcd6a4e57..e00080d7ab 100644 --- a/ext/gmp/tests/bug52906.phpt +++ b/ext/gmp/tests/bug52906.phpt @@ -24,7 +24,7 @@ foreach($vals as $data) { } echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- 7%3=1 7%3=1 2%7=2 diff --git a/ext/gmp/tests/cast.phpt b/ext/gmp/tests/cast.phpt index f3d93af08c..fe7e9a4664 100644 --- a/ext/gmp/tests/cast.phpt +++ b/ext/gmp/tests/cast.phpt @@ -13,7 +13,7 @@ var_dump((float) $n); var_dump((bool) $n); ?> ---EXPECTF-- +--EXPECTF-- 42 string(2) "42" int(42) diff --git a/ext/gmp/tests/clone.phpt b/ext/gmp/tests/clone.phpt index 54e23a78ac..d4326d522a 100644 --- a/ext/gmp/tests/clone.phpt +++ b/ext/gmp/tests/clone.phpt @@ -11,7 +11,7 @@ gmp_clrbit($a, 0); var_dump($a, $b); // $b should be unaffected ?> ---EXPECT-- +--EXPECT-- object(GMP)#1 (1) { ["num"]=> string(1) "2" diff --git a/ext/gmp/tests/gmp_abs.phpt b/ext/gmp/tests/gmp_abs.phpt index bb35891f2a..811ab3d5ee 100644 --- a/ext/gmp/tests/gmp_abs.phpt +++ b/ext/gmp/tests/gmp_abs.phpt @@ -21,7 +21,7 @@ var_dump(gmp_abs(array())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: gmp_abs(): Unable to convert variable to GMP - string is not an integer in %s on line %d string(1) "0" string(1) "0" diff --git a/ext/gmp/tests/gmp_and.phpt b/ext/gmp/tests/gmp_and.phpt index 9bc401031b..2fb27c3e70 100644 --- a/ext/gmp/tests/gmp_and.phpt +++ b/ext/gmp/tests/gmp_and.phpt @@ -25,7 +25,7 @@ var_dump(gmp_and(array(), array())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(6) "106502" string(5) "40994" string(3) "515" diff --git a/ext/gmp/tests/gmp_cmp.phpt b/ext/gmp/tests/gmp_cmp.phpt index 83e7910d1e..2e48d3b83b 100644 --- a/ext/gmp/tests/gmp_cmp.phpt +++ b/ext/gmp/tests/gmp_cmp.phpt @@ -24,7 +24,7 @@ var_dump(gmp_cmp()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(2) int(0) int(-1) diff --git a/ext/gmp/tests/gmp_com.phpt b/ext/gmp/tests/gmp_com.phpt index 1e0c1b4694..ae6ec59200 100644 --- a/ext/gmp/tests/gmp_com.phpt +++ b/ext/gmp/tests/gmp_com.phpt @@ -23,7 +23,7 @@ var_dump(gmp_strval(gmp_com())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(2) "-1" string(2) "-1" diff --git a/ext/gmp/tests/gmp_div_q.phpt b/ext/gmp/tests/gmp_div_q.phpt index 3b75a48e18..afc64c3547 100644 --- a/ext/gmp/tests/gmp_div_q.phpt +++ b/ext/gmp/tests/gmp_div_q.phpt @@ -26,7 +26,7 @@ var_dump(gmp_div_q(array(), array())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: gmp_div_q() expects at least 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/gmp/tests/gmp_div_qr.phpt b/ext/gmp/tests/gmp_div_qr.phpt index 90099249db..936fbc6ef1 100644 --- a/ext/gmp/tests/gmp_div_qr.phpt +++ b/ext/gmp/tests/gmp_div_qr.phpt @@ -28,7 +28,7 @@ var_dump(gmp_div_qr(array(), array())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: gmp_div_qr() expects at least 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/gmp/tests/gmp_div_r.phpt b/ext/gmp/tests/gmp_div_r.phpt index c1874c86f9..bab243e465 100644 --- a/ext/gmp/tests/gmp_div_r.phpt +++ b/ext/gmp/tests/gmp_div_r.phpt @@ -26,7 +26,7 @@ var_dump(gmp_div_r(array(), array())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: gmp_div_r() expects at least 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/gmp/tests/gmp_divexact.phpt b/ext/gmp/tests/gmp_divexact.phpt index a42c1b6b4e..53f0c677ab 100644 --- a/ext/gmp/tests/gmp_divexact.phpt +++ b/ext/gmp/tests/gmp_divexact.phpt @@ -1,8 +1,8 @@ --TEST-- gmp_divexact() tests --SKIPIF-- -<?php -if (!extension_loaded("gmp")) die ("skip"); +<?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"); } @@ -38,7 +38,7 @@ var_dump(gmp_strval($r)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: gmp_divexact() expects exactly 2 parameters, 3 given in %s on line %d NULL diff --git a/ext/gmp/tests/gmp_fact.phpt b/ext/gmp/tests/gmp_fact.phpt index 5cb8089b49..032f735435 100644 --- a/ext/gmp/tests/gmp_fact.phpt +++ b/ext/gmp/tests/gmp_fact.phpt @@ -28,7 +28,7 @@ var_dump(gmp_strval(gmp_fact(array()))); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(1) "1" string(1) "1" string(1) "1" diff --git a/ext/gmp/tests/gmp_gcd.phpt b/ext/gmp/tests/gmp_gcd.phpt index 275f0bca35..cf4eac9e92 100644 --- a/ext/gmp/tests/gmp_gcd.phpt +++ b/ext/gmp/tests/gmp_gcd.phpt @@ -27,7 +27,7 @@ var_dump(gmp_gcd(array(),$n,1)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(1) "3" string(5) "12387" string(3) "224" diff --git a/ext/gmp/tests/gmp_gcdext.phpt b/ext/gmp/tests/gmp_gcdext.phpt index 57fb05822f..4adecf25d2 100644 --- a/ext/gmp/tests/gmp_gcdext.phpt +++ b/ext/gmp/tests/gmp_gcdext.phpt @@ -37,7 +37,7 @@ var_dump(gmp_gcdext()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(1) "3" string(1) "3" string(1) "1" diff --git a/ext/gmp/tests/gmp_hamdist.phpt b/ext/gmp/tests/gmp_hamdist.phpt index c21e03ccb2..60ef89f84d 100644 --- a/ext/gmp/tests/gmp_hamdist.phpt +++ b/ext/gmp/tests/gmp_hamdist.phpt @@ -24,7 +24,7 @@ var_dump(gmp_hamdist()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(13) int(-1) int(36) diff --git a/ext/gmp/tests/gmp_init.phpt b/ext/gmp/tests/gmp_init.phpt index 29640ba704..a35f12345c 100644 --- a/ext/gmp/tests/gmp_init.phpt +++ b/ext/gmp/tests/gmp_init.phpt @@ -17,7 +17,7 @@ var_dump(gmp_strval(gmp_init("993247326237679187178",3))); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- object(GMP)#%d (1) { ["num"]=> string(8) "98765678" diff --git a/ext/gmp/tests/gmp_intval.phpt b/ext/gmp/tests/gmp_intval.phpt index 088dd08fd8..f30b391573 100644 --- a/ext/gmp/tests/gmp_intval.phpt +++ b/ext/gmp/tests/gmp_intval.phpt @@ -24,7 +24,7 @@ var_dump(gmp_intval($g)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: gmp_intval() expects exactly 1 parameter, 2 given in %s on line %d NULL int(0) diff --git a/ext/gmp/tests/gmp_invert.phpt b/ext/gmp/tests/gmp_invert.phpt index 81a90fe16a..8c1d7c577c 100644 --- a/ext/gmp/tests/gmp_invert.phpt +++ b/ext/gmp/tests/gmp_invert.phpt @@ -27,7 +27,7 @@ var_dump(gmp_invert(array(), array())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(7) "2293131" string(1) "0" string(4) "5827" diff --git a/ext/gmp/tests/gmp_jacobi.phpt b/ext/gmp/tests/gmp_jacobi.phpt index 04ddba4f08..da92b87401 100644 --- a/ext/gmp/tests/gmp_jacobi.phpt +++ b/ext/gmp/tests/gmp_jacobi.phpt @@ -30,7 +30,7 @@ var_dump(gmp_jacobi()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(1) "0" string(2) "-1" string(1) "0" diff --git a/ext/gmp/tests/gmp_legendre.phpt b/ext/gmp/tests/gmp_legendre.phpt index 6dde34e1e7..71191e133d 100644 --- a/ext/gmp/tests/gmp_legendre.phpt +++ b/ext/gmp/tests/gmp_legendre.phpt @@ -30,7 +30,7 @@ var_dump(gmp_legendre()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(1) "0" string(2) "-1" string(1) "0" diff --git a/ext/gmp/tests/gmp_mod.phpt b/ext/gmp/tests/gmp_mod.phpt index 12e7cad2b3..4f216965c9 100644 --- a/ext/gmp/tests/gmp_mod.phpt +++ b/ext/gmp/tests/gmp_mod.phpt @@ -21,7 +21,7 @@ var_dump(gmp_mod($a, $b)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: gmp_mod() expects exactly 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/gmp/tests/gmp_neg.phpt b/ext/gmp/tests/gmp_neg.phpt index 8ca3471cb8..c457fa6574 100644 --- a/ext/gmp/tests/gmp_neg.phpt +++ b/ext/gmp/tests/gmp_neg.phpt @@ -23,7 +23,7 @@ var_dump(gmp_neg(array())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(0) int(-1) int(1) diff --git a/ext/gmp/tests/gmp_nextprime.phpt b/ext/gmp/tests/gmp_nextprime.phpt index da89221c0a..87a295f62c 100644 --- a/ext/gmp/tests/gmp_nextprime.phpt +++ b/ext/gmp/tests/gmp_nextprime.phpt @@ -22,10 +22,10 @@ $n = gmp_nextprime(""); var_dump(gmp_strval($n)); $n = gmp_nextprime(new stdclass()); var_dump(gmp_strval($n)); - + echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(1) "2" string(1) "2" string(1) "2" diff --git a/ext/gmp/tests/gmp_or.phpt b/ext/gmp/tests/gmp_or.phpt index 035f070bd7..ef486df8e9 100644 --- a/ext/gmp/tests/gmp_or.phpt +++ b/ext/gmp/tests/gmp_or.phpt @@ -25,7 +25,7 @@ var_dump(gmp_or(array(), array())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(7) "2226831" string(6) "517363" string(10) "2342341163" diff --git a/ext/gmp/tests/gmp_perfect_square.phpt b/ext/gmp/tests/gmp_perfect_square.phpt index aa596ba9cd..0f519c7b79 100644 --- a/ext/gmp/tests/gmp_perfect_square.phpt +++ b/ext/gmp/tests/gmp_perfect_square.phpt @@ -26,7 +26,7 @@ var_dump(gmp_perfect_square(array())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(false) diff --git a/ext/gmp/tests/gmp_popcount.phpt b/ext/gmp/tests/gmp_popcount.phpt index 4b45a04481..26a7b5af8d 100644 --- a/ext/gmp/tests/gmp_popcount.phpt +++ b/ext/gmp/tests/gmp_popcount.phpt @@ -17,7 +17,7 @@ var_dump(gmp_popcount()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(-1) int(0) int(10) diff --git a/ext/gmp/tests/gmp_pow.phpt b/ext/gmp/tests/gmp_pow.phpt index b1b7b7d57e..5424d410a0 100644 --- a/ext/gmp/tests/gmp_pow.phpt +++ b/ext/gmp/tests/gmp_pow.phpt @@ -30,7 +30,7 @@ var_dump(gmp_pow(array(),10)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(4) "1024" string(4) "1024" string(5) "-2048" diff --git a/ext/gmp/tests/gmp_pown.phpt b/ext/gmp/tests/gmp_pown.phpt index f5857b6995..b732aa331f 100644 --- a/ext/gmp/tests/gmp_pown.phpt +++ b/ext/gmp/tests/gmp_pown.phpt @@ -38,7 +38,7 @@ var_dump(gmp_powm(10, $n, 10)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(1) "0" string(1) "5" string(1) "5" diff --git a/ext/gmp/tests/gmp_prob_prime.phpt b/ext/gmp/tests/gmp_prob_prime.phpt index f8f3e6921c..99735bd7c0 100644 --- a/ext/gmp/tests/gmp_prob_prime.phpt +++ b/ext/gmp/tests/gmp_prob_prime.phpt @@ -33,7 +33,7 @@ var_dump(gmp_prob_prime(array())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(0) int(2) int(2) diff --git a/ext/gmp/tests/gmp_random.phpt b/ext/gmp/tests/gmp_random.phpt index 5533224b2c..ab2b11b3f7 100644 --- a/ext/gmp/tests/gmp_random.phpt +++ b/ext/gmp/tests/gmp_random.phpt @@ -19,7 +19,7 @@ var_dump(gmp_random("test")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Deprecated: Function gmp_random() is deprecated in %s on line %d string(%d) "%d" diff --git a/ext/gmp/tests/gmp_remroot.phpt b/ext/gmp/tests/gmp_remroot.phpt index 331f447aa2..acd8f84925 100644 --- a/ext/gmp/tests/gmp_remroot.phpt +++ b/ext/gmp/tests/gmp_remroot.phpt @@ -20,7 +20,7 @@ var_dump(gmp_rootrem(100, 0)); var_dump(gmp_rootrem(100, -3)); ?> ---EXPECTF-- +--EXPECTF-- Warning: gmp_rootrem() expects exactly 2 parameters, 0 given in %s on line %d NULL array(2) { diff --git a/ext/gmp/tests/gmp_root.phpt b/ext/gmp/tests/gmp_root.phpt index 70faf27051..654e2ffeb6 100644 --- a/ext/gmp/tests/gmp_root.phpt +++ b/ext/gmp/tests/gmp_root.phpt @@ -20,7 +20,7 @@ var_dump(gmp_root(100, 0)); var_dump(gmp_root(100, -3)); ?> ---EXPECTF-- +--EXPECTF-- Warning: gmp_root() expects exactly 2 parameters, 0 given in %s on line %d NULL object(GMP)#%d (1) { diff --git a/ext/gmp/tests/gmp_scan0.phpt b/ext/gmp/tests/gmp_scan0.phpt index 2a87a968a2..fb70cf8b25 100644 --- a/ext/gmp/tests/gmp_scan0.phpt +++ b/ext/gmp/tests/gmp_scan0.phpt @@ -20,7 +20,7 @@ var_dump(gmp_scan0()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: gmp_scan0(): Starting index must be greater than or equal to zero in %s on line %d bool(false) int(2) diff --git a/ext/gmp/tests/gmp_scan1.phpt b/ext/gmp/tests/gmp_scan1.phpt index 7ebce9be7d..a89a9195b0 100644 --- a/ext/gmp/tests/gmp_scan1.phpt +++ b/ext/gmp/tests/gmp_scan1.phpt @@ -20,7 +20,7 @@ var_dump(gmp_scan1()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: gmp_scan1(): Starting index must be greater than or equal to zero in %s on line %d bool(false) int(1) diff --git a/ext/gmp/tests/gmp_sign.phpt b/ext/gmp/tests/gmp_sign.phpt index 1efdc28c6f..7ac03013d4 100644 --- a/ext/gmp/tests/gmp_sign.phpt +++ b/ext/gmp/tests/gmp_sign.phpt @@ -19,7 +19,7 @@ var_dump(gmp_sign()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(-1) int(1) int(0) diff --git a/ext/gmp/tests/gmp_sqrt.phpt b/ext/gmp/tests/gmp_sqrt.phpt index d90f538213..e824de3706 100644 --- a/ext/gmp/tests/gmp_sqrt.phpt +++ b/ext/gmp/tests/gmp_sqrt.phpt @@ -24,7 +24,7 @@ var_dump(gmp_sqrt(array())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: gmp_sqrt(): Number has to be greater than or equal to 0 in %s on line %d string(1) "0" diff --git a/ext/gmp/tests/gmp_sqrtrem.phpt b/ext/gmp/tests/gmp_sqrtrem.phpt index d30bb2b295..595a1dc45a 100644 --- a/ext/gmp/tests/gmp_sqrtrem.phpt +++ b/ext/gmp/tests/gmp_sqrtrem.phpt @@ -55,7 +55,7 @@ var_dump(gmp_sqrtrem()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: gmp_sqrtrem(): Number has to be greater than or equal to 0 in %s on line %d bool(false) string(1) "0" diff --git a/ext/gmp/tests/gmp_strval.phpt b/ext/gmp/tests/gmp_strval.phpt index 4df78bdf7a..cfa7335667 100644 --- a/ext/gmp/tests/gmp_strval.phpt +++ b/ext/gmp/tests/gmp_strval.phpt @@ -33,7 +33,7 @@ var_dump(gmp_strval(new stdclass)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: gmp_strval() expects at least 1 parameter, 0 given in %s on line %d NULL diff --git a/ext/gmp/tests/gmp_sub.phpt b/ext/gmp/tests/gmp_sub.phpt index e1d9df67db..fabc0c0ebb 100644 --- a/ext/gmp/tests/gmp_sub.phpt +++ b/ext/gmp/tests/gmp_sub.phpt @@ -22,7 +22,7 @@ var_dump(gmp_strval($g)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: gmp_sub() expects exactly 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/gmp/tests/gmp_testbit.phpt b/ext/gmp/tests/gmp_testbit.phpt index ab40abed7f..bdabe3d841 100644 --- a/ext/gmp/tests/gmp_testbit.phpt +++ b/ext/gmp/tests/gmp_testbit.phpt @@ -39,7 +39,7 @@ var_dump(gmp_strval($n)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: gmp_testbit() expects exactly 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/gmp/tests/gmp_xor.phpt b/ext/gmp/tests/gmp_xor.phpt index 2b0d29a620..9bf31f02f4 100644 --- a/ext/gmp/tests/gmp_xor.phpt +++ b/ext/gmp/tests/gmp_xor.phpt @@ -25,7 +25,7 @@ var_dump(gmp_xor(array(), array())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(7) "2120329" string(6) "476369" string(10) "2342340648" diff --git a/ext/gmp/tests/serialize.phpt b/ext/gmp/tests/serialize.phpt index e9b9bb549f..dedd150725 100644 --- a/ext/gmp/tests/serialize.phpt +++ b/ext/gmp/tests/serialize.phpt @@ -22,7 +22,7 @@ try { } catch (Exception $e) { var_dump($e->getMessage()); } ?> ---EXPECTF-- +--EXPECTF-- object(GMP)#%d (1) { ["num"]=> string(2) "42" diff --git a/ext/hash/tests/hash_algos.phpt b/ext/hash/tests/hash_algos.phpt index be8b3fde4c..efbb714788 100644 --- a/ext/hash/tests/hash_algos.phpt +++ b/ext/hash/tests/hash_algos.phpt @@ -6,7 +6,7 @@ Hash: hash_algos() function : basic functionality /* Prototype : array hash_algos (void) * Description: Return a list of registered hashing algorithms * Source code: ext/hash/hash.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing hash_algos() : basic functionality ***\n"; diff --git a/ext/hash/tests/hash_copy_001.phpt b/ext/hash/tests/hash_copy_001.phpt index 3811771dfc..95aaf14c05 100644 --- a/ext/hash/tests/hash_copy_001.phpt +++ b/ext/hash/tests/hash_copy_001.phpt @@ -28,7 +28,7 @@ foreach ($algos as $algo) { echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(3) "md2" string(32) "d5ac4ffd08f6a57b9bd402b8068392ff" string(32) "d5ac4ffd08f6a57b9bd402b8068392ff" diff --git a/ext/hash/tests/hash_copy_002.phpt b/ext/hash/tests/hash_copy_002.phpt index 81f8020452..0528bb5a98 100644 --- a/ext/hash/tests/hash_copy_002.phpt +++ b/ext/hash/tests/hash_copy_002.phpt @@ -10,7 +10,7 @@ var_dump(hash_copy($r, $r)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: hash_copy() expects exactly 1 parameter, 0 given in %s on line %d NULL object(HashContext)#%d (0) { diff --git a/ext/hash/tests/hash_error.phpt b/ext/hash/tests/hash_error.phpt index ca5d03abb8..5c9bbd8aa2 100644 --- a/ext/hash/tests/hash_error.phpt +++ b/ext/hash/tests/hash_error.phpt @@ -6,7 +6,7 @@ Hash: hash() function : error conditions /* Prototype : string hash ( string $algo , string $data [, bool $raw_output ] ) * Description: Generate a hash value (message digest) * Source code: ext/hash/hash.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing hash() : error conditions ***\n"; @@ -15,7 +15,7 @@ var_dump(hash()); var_dump(hash('adler32')); echo "\n-- Testing hash() function with more than expected no. of arguments --\n"; -$extra_arg= 10; +$extra_arg= 10; var_dump(hash('adler32', '', false, $extra_arg)); echo "\n-- Testing hash() function with invalid hash algorithm --\n"; diff --git a/ext/hash/tests/hash_file_basic.phpt b/ext/hash/tests/hash_file_basic.phpt index 0ee48c6d10..f196211b17 100644 --- a/ext/hash/tests/hash_file_basic.phpt +++ b/ext/hash/tests/hash_file_basic.phpt @@ -7,7 +7,7 @@ Felix De Vliegher <felix.devliegher@gmail.com> /* Prototype : string hash_file(string algo, string filename[, bool raw_output = false]) * Description: Generate a hash of a given file * Source code: ext/hash/hash.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing hash_file() : basic functionality ***\n"; diff --git a/ext/hash/tests/hash_file_basic1.phpt b/ext/hash/tests/hash_file_basic1.phpt index 474410c782..05c23c02f8 100644 --- a/ext/hash/tests/hash_file_basic1.phpt +++ b/ext/hash/tests/hash_file_basic1.phpt @@ -6,7 +6,7 @@ Hash: hash_file() function : basic functionality /* Prototype : string hash_file ( string algo, string filename [, bool raw_output] ) * Description: Generate a hash value using the contents of a given file * Source code: ext/hash/hash.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing hash_file() : basic functionality ***\n"; @@ -16,9 +16,9 @@ $file = dirname(__FILE__) . "hash_file.txt"; if (($fp = fopen( $file, "w+")) == FALSE) { echo "Cannot create file ($file)"; exit; -} +} -/* Writing into file */ +/* Writing into file */ $content = "This is a sample string used to test the hash_file function with various hashing algorithms"; if (is_writable($file)) { if (fwrite($fp, $content) === FALSE) { diff --git a/ext/hash/tests/hash_file_error.phpt b/ext/hash/tests/hash_file_error.phpt index e41d951366..b7ef23a2ba 100644 --- a/ext/hash/tests/hash_file_error.phpt +++ b/ext/hash/tests/hash_file_error.phpt @@ -7,7 +7,7 @@ Felix De Vliegher <felix.devliegher@gmail.com> /* Prototype : string hash_file(string algo, string filename[, bool raw_output = false]) * Description: Generate a hash of a given file * Source code: ext/hash/hash.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing hash_file() : error conditions ***\n"; diff --git a/ext/hash/tests/hash_hmac_basic.phpt b/ext/hash/tests/hash_hmac_basic.phpt index f4606be989..755c1441ce 100644 --- a/ext/hash/tests/hash_hmac_basic.phpt +++ b/ext/hash/tests/hash_hmac_basic.phpt @@ -6,7 +6,7 @@ Hash: hash_file() function : basic functionality /* Prototype : string hash_hmac ( string $algo , string $data , string $key [, bool $raw_output ] ) * Description: Generate a keyed hash value using the HMAC method * Source code: ext/hash/hash.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing hash_hmac() : basic functionality ***\n"; diff --git a/ext/hash/tests/hash_hmac_file_basic.phpt b/ext/hash/tests/hash_hmac_file_basic.phpt index c4d38b4689..7cd9460f32 100644 --- a/ext/hash/tests/hash_hmac_file_basic.phpt +++ b/ext/hash/tests/hash_hmac_file_basic.phpt @@ -7,7 +7,7 @@ Hash: hash_hmac_file() function : basic functionality /* Prototype : string hash_hmac_file ( string algo, string filename, string key [, bool raw_output] ) * Description: Generate a keyed hash value using the HMAC method and the contents of a given file * Source code: ext/hash/hash.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing hash_hmac_file() : basic functionality ***\n"; @@ -17,9 +17,9 @@ $file = dirname(__FILE__) . "hash_hmac_file.txt"; if (($fp = fopen( $file, "w+")) == FALSE) { echo "Cannot create file ($file)"; exit; -} +} -/* Writing into file */ +/* Writing into file */ $content = "This is a sample string used to test the hash_hmac_file function with various hashing algorithms"; if (is_writable($file)) { if (fwrite($fp, $content) === FALSE) { diff --git a/ext/hash/tests/hash_hmac_file_error.phpt b/ext/hash/tests/hash_hmac_file_error.phpt index 504e264599..6d383b479d 100644 --- a/ext/hash/tests/hash_hmac_file_error.phpt +++ b/ext/hash/tests/hash_hmac_file_error.phpt @@ -6,7 +6,7 @@ Hash: hash_hmac_file() function : basic functionality /* Prototype : string hash_hmac_file ( string algo, string filename, string key [, bool raw_output] ) * Description: Generate a keyed hash value using the HMAC method and the contents of a given file * Source code: ext/hash/hash.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing hash() : error conditions ***\n"; @@ -20,7 +20,7 @@ var_dump(hash_hmac_file('crc32')); var_dump(hash_hmac_file('crc32', $file)); echo "\n-- Testing hash_hmac_file() function with more than expected no. of arguments --\n"; -$extra_arg = 10; +$extra_arg = 10; hash_hmac_file('crc32', $file, $key, TRUE, $extra_arg); echo "\n-- Testing hash_hmac_file() function with invalid hash algorithm --\n"; diff --git a/ext/hash/tests/joaat.phpt b/ext/hash/tests/joaat.phpt index a8a5566aba..819b598851 100644 --- a/ext/hash/tests/joaat.phpt +++ b/ext/hash/tests/joaat.phpt @@ -15,7 +15,7 @@ $pass = true; foreach ($tests as $test) { ++$i; - + $result = hash("joaat", $test[0]); if ($result != $test[1]) { echo "Iteration " . $i . " failed - expected '" . $test[1] . "', got '" . $result . "' for '" . $test[1] . "'\n"; diff --git a/ext/hash/tests/mhash_002.phpt b/ext/hash/tests/mhash_002.phpt index 7d8a71a0a4..2318470919 100644 --- a/ext/hash/tests/mhash_002.phpt +++ b/ext/hash/tests/mhash_002.phpt @@ -27,7 +27,7 @@ $supported_hash_al = array( $hc = mhash_count() + 1; -$known_hash_al = array(); +$known_hash_al = array(); for ($i=0; $i < $hc; $i++) { $known_hash_al[mhash_get_hash_name($i)] = $i; } @@ -38,7 +38,7 @@ foreach ($supported_hash_al as $name => $len) { echo "$name = $len\n"; } else { echo "$name ? $len\n"; - } + } } ?> --EXPECTREGEX-- diff --git a/ext/iconv/tests/bug37176.phpt b/ext/iconv/tests/bug37176.phpt index 70242fe091..c562ceac85 100644 --- a/ext/iconv/tests/bug37176.phpt +++ b/ext/iconv/tests/bug37176.phpt @@ -1,8 +1,8 @@ --TEST-- Bug #37176 (iconv_strpos() fails to find a string) --SKIPIF-- -<?php -include('skipif.inc'); +<?php +include('skipif.inc'); $test = @iconv_strpos("abbttt","ttt",0,"UTF-8"); if ($test === false) { diff --git a/ext/iconv/tests/bug37773.phpt b/ext/iconv/tests/bug37773.phpt index d21e6fd0f8..f9a1d3470e 100644 --- a/ext/iconv/tests/bug37773.phpt +++ b/ext/iconv/tests/bug37773.phpt @@ -1,8 +1,8 @@ --TEST-- Bug #37773 (iconv_substr() gives "Unknown error" when string length = 1") --SKIPIF-- -<?php -include('skipif.inc'); +<?php +include('skipif.inc'); $test = @iconv_strpos("abbttt","ttt",0,"UTF-8"); if ($test === false) { diff --git a/ext/iconv/tests/bug52211.phpt b/ext/iconv/tests/bug52211.phpt index c851cbad6a..f4fe747cde 100644 --- a/ext/iconv/tests/bug52211.phpt +++ b/ext/iconv/tests/bug52211.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #52211 (iconv() returns part of string on error) --SKIPIF-- -<?php +<?php include('skipif.inc'); ?> --FILE-- diff --git a/ext/iconv/tests/iconv002.phpt b/ext/iconv/tests/iconv002.phpt index 034b3761fa..d49e5eccc2 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/iconv/tests/iconv003.phpt b/ext/iconv/tests/iconv003.phpt index 9642cf1e79..690c1569f9 100644 --- a/ext/iconv/tests/iconv003.phpt +++ b/ext/iconv/tests/iconv003.phpt @@ -4,7 +4,7 @@ iconv() test 3 <?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?> --FILE-- <?php -for ($i = 0; $i < 3; ++$i) { +for ($i = 0; $i < 3; ++$i) { if (@iconv('blah', 'blah', 'blah') != '') { die("failed\n"); } diff --git a/ext/iconv/tests/iconv_encoding_basic.phpt b/ext/iconv/tests/iconv_encoding_basic.phpt index 094a050e5a..6b0d4f11b4 100644 --- a/ext/iconv/tests/iconv_encoding_basic.phpt +++ b/ext/iconv/tests/iconv_encoding_basic.phpt @@ -13,7 +13,7 @@ iconv.output_encoding=ISO-8859-1 --FILE-- <?php /* Prototype : mixed iconv_get_encoding([string type]) - * Description: Get internal encoding and output encoding for ob_iconv_handler() + * Description: Get internal encoding and output encoding for ob_iconv_handler() * Prototype : bool iconv_set_encoding(string type, string charset) * Description: Sets internal encoding and output encoding for ob_iconv_handler() * Source code: ext/iconv/iconv.c diff --git a/ext/iconv/tests/iconv_get_encoding_error.phpt b/ext/iconv/tests/iconv_get_encoding_error.phpt index b0c3e0724d..d7126c482e 100644 --- a/ext/iconv/tests/iconv_get_encoding_error.phpt +++ b/ext/iconv/tests/iconv_get_encoding_error.phpt @@ -8,7 +8,7 @@ function_exists('iconv_get_encoding') or die("skip iconv_get_encoding() is not a --FILE-- <?php /* Prototype : mixed iconv_get_encoding([string type]) - * Description: Get internal encoding and output encoding for ob_iconv_handler() + * Description: Get internal encoding and output encoding for ob_iconv_handler() * Source code: ext/iconv/iconv.c */ @@ -63,7 +63,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -72,7 +72,7 @@ $inputs = array( /*18*/ "Nothing", 'Nothing', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt b/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt index 7cc32c7e70..5973ca0640 100644 --- a/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt +++ b/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt @@ -81,7 +81,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -90,7 +90,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt b/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt index a0e40aaa0c..f325f2816f 100644 --- a/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt +++ b/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt @@ -82,7 +82,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -91,7 +91,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt b/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt index da481e7514..1a0f7fc0c3 100644 --- a/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt +++ b/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt @@ -85,7 +85,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -94,7 +94,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/iconv/tests/iconv_mime_decode_variation1.phpt b/ext/iconv/tests/iconv_mime_decode_variation1.phpt index 4d91d68add..f76593bda2 100644 --- a/ext/iconv/tests/iconv_mime_decode_variation1.phpt +++ b/ext/iconv/tests/iconv_mime_decode_variation1.phpt @@ -69,7 +69,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -78,7 +78,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/iconv/tests/iconv_mime_decode_variation2.phpt b/ext/iconv/tests/iconv_mime_decode_variation2.phpt index b0426558ed..3e67d8aa28 100644 --- a/ext/iconv/tests/iconv_mime_decode_variation2.phpt +++ b/ext/iconv/tests/iconv_mime_decode_variation2.phpt @@ -70,7 +70,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -79,7 +79,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/iconv/tests/iconv_mime_decode_variation3.phpt b/ext/iconv/tests/iconv_mime_decode_variation3.phpt index c077aa10fa..cb20eea7d1 100644 --- a/ext/iconv/tests/iconv_mime_decode_variation3.phpt +++ b/ext/iconv/tests/iconv_mime_decode_variation3.phpt @@ -72,7 +72,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -81,7 +81,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/iconv/tests/iconv_set_encoding_error.phpt b/ext/iconv/tests/iconv_set_encoding_error.phpt index 4ba840067d..0fc8450065 100644 --- a/ext/iconv/tests/iconv_set_encoding_error.phpt +++ b/ext/iconv/tests/iconv_set_encoding_error.phpt @@ -63,7 +63,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -72,7 +72,7 @@ $inputs = array( /*18*/ "Nothing", 'Nothing', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/iconv/tests/iconv_set_encoding_variation.phpt b/ext/iconv/tests/iconv_set_encoding_variation.phpt index 4e097569fd..a75e10b346 100644 --- a/ext/iconv/tests/iconv_set_encoding_variation.phpt +++ b/ext/iconv/tests/iconv_set_encoding_variation.phpt @@ -65,7 +65,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -74,7 +74,7 @@ $inputs = array( /*18*/ "Nothing", 'Nothing', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/iconv/tests/iconv_strlen_variation1.phpt b/ext/iconv/tests/iconv_strlen_variation1.phpt index e3e25aa0dc..877963738d 100644 --- a/ext/iconv/tests/iconv_strlen_variation1.phpt +++ b/ext/iconv/tests/iconv_strlen_variation1.phpt @@ -45,14 +45,14 @@ $fp = fopen(__FILE__, "r"); $inputs = array( // int data -/*1*/ +/*1*/ 'int 0' => 0, 'int 1' => 1, 'int 12345' => 12345, 'int -12345' => -12345, // float data -/*5*/ +/*5*/ 'float 10.5' => 10.5, 'float -10.5' => -10.5, 'float 12.3456789000e10' => 12.3456789000e10, @@ -60,39 +60,39 @@ $inputs = array( 'float .5' => .5, // null data -/*10*/ +/*10*/ 'uppercase NULL' => NULL, 'lowercase null' => null, - + // boolean data -/*12*/ +/*12*/ 'lowercase true' => true, 'lowercase false' =>false, 'uppercase TRUE' =>TRUE, 'uppercase FALSE' =>FALSE, - + // empty data -/*16*/ +/*16*/ 'empty string DQ' => "", 'empty string SQ' => '', - + // string data -/*18*/ +/*18*/ 'string DQ' => "string", 'string SQ' => 'string', 'mixed case string' => "sTrInG", 'heredoc' => $heredoc, - + // object data -/*21*/ +/*21*/ 'instance of class' => new classA(), - + // undefined data -/*22*/ +/*22*/ 'undefined var' => @$undefined_var, // unset data -/*23*/ +/*23*/ 'unset var' => @$unset_var, // resource variable diff --git a/ext/iconv/tests/iconv_strlen_variation2.phpt b/ext/iconv/tests/iconv_strlen_variation2.phpt index 85dd0483a6..daa0cc46e3 100644 --- a/ext/iconv/tests/iconv_strlen_variation2.phpt +++ b/ext/iconv/tests/iconv_strlen_variation2.phpt @@ -67,7 +67,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -76,7 +76,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/iconv/tests/iconv_strpos_variation1.phpt b/ext/iconv/tests/iconv_strpos_variation1.phpt index 38dc353383..e367a0ac7d 100644 --- a/ext/iconv/tests/iconv_strpos_variation1.phpt +++ b/ext/iconv/tests/iconv_strpos_variation1.phpt @@ -68,7 +68,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -77,7 +77,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/iconv/tests/iconv_strpos_variation2.phpt b/ext/iconv/tests/iconv_strpos_variation2.phpt index e702ca9869..308b723c96 100644 --- a/ext/iconv/tests/iconv_strpos_variation2.phpt +++ b/ext/iconv/tests/iconv_strpos_variation2.phpt @@ -68,7 +68,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -77,7 +77,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/iconv/tests/iconv_strpos_variation3.phpt b/ext/iconv/tests/iconv_strpos_variation3.phpt index 3983da6f84..7f5281b34f 100644 --- a/ext/iconv/tests/iconv_strpos_variation3.phpt +++ b/ext/iconv/tests/iconv_strpos_variation3.phpt @@ -71,7 +71,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data "", '', @@ -80,7 +80,7 @@ $inputs = array( "string", 'string', $heredoc, - + // object data new classA(), diff --git a/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt b/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt index d2dd8a7495..88f043086a 100644 --- a/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt +++ b/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt @@ -71,7 +71,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data "", '', @@ -80,7 +80,7 @@ $inputs = array( "string", 'string', $heredoc, - + // object data new classA(), diff --git a/ext/iconv/tests/iconv_strpos_variation4.phpt b/ext/iconv/tests/iconv_strpos_variation4.phpt index 539305541a..b992ad6e00 100644 --- a/ext/iconv/tests/iconv_strpos_variation4.phpt +++ b/ext/iconv/tests/iconv_strpos_variation4.phpt @@ -70,7 +70,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -79,7 +79,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/iconv/tests/iconv_strrpos_variation1.phpt b/ext/iconv/tests/iconv_strrpos_variation1.phpt index e4ed011339..7637724652 100644 --- a/ext/iconv/tests/iconv_strrpos_variation1.phpt +++ b/ext/iconv/tests/iconv_strrpos_variation1.phpt @@ -67,7 +67,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -76,7 +76,7 @@ $inputs = array( /*18*/ "hello, world", 'hello, world', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/iconv/tests/iconv_strrpos_variation2.phpt b/ext/iconv/tests/iconv_strrpos_variation2.phpt index a0001f5269..5a669205c0 100644 --- a/ext/iconv/tests/iconv_strrpos_variation2.phpt +++ b/ext/iconv/tests/iconv_strrpos_variation2.phpt @@ -67,7 +67,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -76,7 +76,7 @@ $inputs = array( /*18*/ "world", 'world', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/iconv/tests/iconv_strrpos_variation3.phpt b/ext/iconv/tests/iconv_strrpos_variation3.phpt index 373e905173..1da6f82aa4 100644 --- a/ext/iconv/tests/iconv_strrpos_variation3.phpt +++ b/ext/iconv/tests/iconv_strrpos_variation3.phpt @@ -68,7 +68,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -77,7 +77,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/imap/tests/bug31142_1.phpt b/ext/imap/tests/bug31142_1.phpt index efb92b7b45..8bbcc5545d 100644 --- a/ext/imap/tests/bug31142_1.phpt +++ b/ext/imap/tests/bug31142_1.phpt @@ -1,9 +1,9 @@ ---TEST-- +--TEST-- Bug #31142 test #1 (imap_mail_compose() generates incorrect output) --SKIPIF-- <?php - if (!extension_loaded("imap")) { - die("skip imap extension not available"); + if (!extension_loaded("imap")) { + die("skip imap extension not available"); } ?> --FILE-- @@ -55,5 +55,5 @@ Content-Description: description3 contents.data3 - + --%s-- diff --git a/ext/imap/tests/bug31142_2.phpt b/ext/imap/tests/bug31142_2.phpt index 2a81760a7b..c9eed598b3 100644 --- a/ext/imap/tests/bug31142_2.phpt +++ b/ext/imap/tests/bug31142_2.phpt @@ -1,9 +1,9 @@ ---TEST-- +--TEST-- Bug #31142 test #2 (imap_mail_compose() generates incorrect output) --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/imap/tests/bug32589.phpt b/ext/imap/tests/bug32589.phpt index c5030e8970..52a73c6f23 100644 --- a/ext/imap/tests/bug32589.phpt +++ b/ext/imap/tests/bug32589.phpt @@ -1,9 +1,9 @@ ---TEST-- +--TEST-- Bug #32589 (crash inside imap_mail_compose() function) --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/imap/tests/bug35669.phpt b/ext/imap/tests/bug35669.phpt index 1cc4e702b9..1f8ca5d7c3 100644 --- a/ext/imap/tests/bug35669.phpt +++ b/ext/imap/tests/bug35669.phpt @@ -1,9 +1,9 @@ ---TEST-- +--TEST-- Bug #35669 (imap_mail_compose() crashes with multipart-multiboundary-email) --SKIPIF-- <?php - if (!extension_loaded("imap")) { - die("skip imap extension not available"); + if (!extension_loaded("imap")) { + die("skip imap extension not available"); } ?> --FILE-- @@ -11,15 +11,15 @@ Bug #35669 (imap_mail_compose() crashes with multipart-multiboundary-email) $envelope["from"] = 'Santa <somewhere@northpole.gov>'; $envelope["to"] = 'The bad smurf <bad@smurf.com>'; $envelope['date'] = 'Wed, 04 Jan 2006 19:24:43 -0500'; - + $multipart["type"] = TYPEMULTIPART; $multipart["subtype"] = "MIXED"; $body[] = $multipart; //add multipart stuff - + $textpart["type"] = TYPEMULTIPART; $textpart["subtype"] = "ALTERNATIVE"; $body[] = $textpart; //add body part - + $plain["type"] = TYPETEXT; $plain["subtype"] = "PLAIN"; $plain["charset"] = "iso-8859-1"; @@ -27,9 +27,9 @@ Bug #35669 (imap_mail_compose() crashes with multipart-multiboundary-email) $plain["description"] = "Plaintype part of message"; $plain['disposition'] = "inline"; $plain["contents.data"] = 'See mom, it will crash'; - + $body[] = $plain; //next add plain text part - + $html["type"] = TYPETEXT; $html["subtype"] = "HTML"; $html["charset"] = "iso-8859-1"; @@ -37,9 +37,9 @@ Bug #35669 (imap_mail_compose() crashes with multipart-multiboundary-email) $html["description"] = "HTML part of message"; $html['disposition'] = "inline"; $html["contents.data"] = 'See mom, it will <b>crash</b>'; - + $body[] = $html; - + echo imap_mail_compose($envelope, $body); ?> --EXPECTF-- diff --git a/ext/imap/tests/bug40854.phpt b/ext/imap/tests/bug40854.phpt index 3df81ea29d..0ff231401a 100644 --- a/ext/imap/tests/bug40854.phpt +++ b/ext/imap/tests/bug40854.phpt @@ -1,9 +1,9 @@ ---TEST-- +--TEST-- Bug #40854 (imap_mail_compose() creates an invalid terminator for multipart e-mails) --SKIPIF-- <?php - if (!extension_loaded("imap")) { - die("skip imap extension not available"); + if (!extension_loaded("imap")) { + die("skip imap extension not available"); } ?> --FILE-- @@ -53,5 +53,5 @@ Content-Description: description3 contents.data3 - + --%s--
\ No newline at end of file diff --git a/ext/imap/tests/bug44098.phpt b/ext/imap/tests/bug44098.phpt index f758c117b6..c424f05f54 100644 --- a/ext/imap/tests/bug44098.phpt +++ b/ext/imap/tests/bug44098.phpt @@ -2,8 +2,8 @@ Bug #44098 (imap_utf8() returns only capital letters) --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/imap/tests/bug45705_1.phpt b/ext/imap/tests/bug45705_1.phpt index eedaed0817..f699451407 100644 --- a/ext/imap/tests/bug45705_1.phpt +++ b/ext/imap/tests/bug45705_1.phpt @@ -2,8 +2,8 @@ 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-- diff --git a/ext/imap/tests/bug45705_2.phpt b/ext/imap/tests/bug45705_2.phpt index 797d473178..b8c1c295ae 100644 --- a/ext/imap/tests/bug45705_2.phpt +++ b/ext/imap/tests/bug45705_2.phpt @@ -2,8 +2,8 @@ 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-- diff --git a/ext/imap/tests/bug46918.phpt b/ext/imap/tests/bug46918.phpt index 71fac50433..41993c4292 100644 --- a/ext/imap/tests/bug46918.phpt +++ b/ext/imap/tests/bug46918.phpt @@ -2,8 +2,8 @@ Bug #46918 (imap_rfc822_parse_adrlist host part not filled in correctly) --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/imap/tests/bug53377.phpt b/ext/imap/tests/bug53377.phpt index 1a2173a09b..dfe2d032ab 100644 --- a/ext/imap/tests/bug53377.phpt +++ b/ext/imap/tests/bug53377.phpt @@ -2,8 +2,8 @@ Bug #53377 (imap_mime_header_decode() doesn't ignore \t during long MIME header unfolding) --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/imap/tests/imap_alerts_error.phpt b/ext/imap/tests/imap_alerts_error.phpt index ee13b13503..33892c77ee 100644 --- a/ext/imap/tests/imap_alerts_error.phpt +++ b/ext/imap/tests/imap_alerts_error.phpt @@ -9,7 +9,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); /* Prototype : array imap_alerts(void) * Description: Returns an array of all IMAP alerts that have been generated since the last page load or since the last imap_alerts() call, whichever came last. The alert stack is cleared after imap_alerts() is called. * Source code: ext/imap/php_imap.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing imap_alerts() : error conditions ***\n"; diff --git a/ext/imap/tests/imap_append_basic.phpt b/ext/imap/tests/imap_append_basic.phpt index 60847ce716..e64812d004 100644 --- a/ext/imap/tests/imap_append_basic.phpt +++ b/ext/imap/tests/imap_append_basic.phpt @@ -1,7 +1,7 @@ --TEST-- Test imap_append() function : basic functionality --SKIPIF-- -<?php +<?php require_once(dirname(__FILE__).'/skipif.inc'); ?> --FILE-- @@ -22,7 +22,7 @@ if (!is_resource($imap_stream)) { } $mb_details = imap_mailboxmsginfo($imap_stream); -echo "Add a couple of msgs to new mailbox " . $mb_details->Mailbox . "\n"; +echo "Add a couple of msgs to new mailbox " . $mb_details->Mailbox . "\n"; var_dump(imap_append($imap_stream, $mb_details->Mailbox , "From: webmaster@something.com\r\n" . "To: info@something.com\r\n" @@ -30,15 +30,15 @@ var_dump(imap_append($imap_stream, $mb_details->Mailbox . "\r\n" . "this is a test message, please ignore\r\n" )); - + var_dump(imap_append($imap_stream, $mb_details->Mailbox , "From: webmaster@something.com\r\n" . "To: info@something.com\r\n" . "Subject: Another test\r\n" . "\r\n" . "this is another test message, please ignore it too!!\r\n" - )); - + )); + $check = imap_check($imap_stream); echo "Msg Count after append : ". $check->Nmsgs . "\n"; @@ -49,7 +49,7 @@ imap_close($imap_stream); ?> ===Done=== --CLEAN-- -<?php +<?php require_once('clean.inc'); ?> --EXPECTF-- diff --git a/ext/imap/tests/imap_base64_basic.phpt b/ext/imap/tests/imap_base64_basic.phpt index f5cc6039f3..c1f4bf09b3 100644 --- a/ext/imap/tests/imap_base64_basic.phpt +++ b/ext/imap/tests/imap_base64_basic.phpt @@ -35,7 +35,7 @@ if (imap_base64($base64) == $hex) { echo "TEST PASSED\n"; } else { echo "TEST FAILED"; -} +} ?> ===Done=== diff --git a/ext/imap/tests/imap_binary_basic.phpt b/ext/imap/tests/imap_binary_basic.phpt index d0f17aebde..314776f3a3 100644 --- a/ext/imap/tests/imap_binary_basic.phpt +++ b/ext/imap/tests/imap_binary_basic.phpt @@ -18,7 +18,7 @@ $str = 'This is an example string to be base 64 encoded'; $base64 = imap_binary($str); var_dump(bin2hex($base64)); -echo "Encode a string which results in more than 60 charters of output\n"; +echo "Encode a string which results in more than 60 charters of output\n"; $str = 'This is a long string with results in more than 60 characters of output'; $base64 = imap_binary($str); var_dump(bin2hex($base64)); diff --git a/ext/imap/tests/imap_body_basic.phpt b/ext/imap/tests/imap_body_basic.phpt index 640738b250..ba1d77764b 100644 --- a/ext/imap/tests/imap_body_basic.phpt +++ b/ext/imap/tests/imap_body_basic.phpt @@ -22,8 +22,8 @@ if (!is_resource($imap_stream)) { } $check = imap_check($imap_stream); -echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n"; - +echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n"; + // show body for msg 1 var_dump(imap_body($imap_stream, 1)); @@ -34,7 +34,7 @@ imap_close($imap_stream); ?> ===Done=== --CLEAN-- -<?php +<?php require_once('clean.inc'); ?> --EXPECTF-- diff --git a/ext/imap/tests/imap_bodystruct_basic.phpt b/ext/imap/tests/imap_bodystruct_basic.phpt index cc643a6b51..69e7328077 100644 --- a/ext/imap/tests/imap_bodystruct_basic.phpt +++ b/ext/imap/tests/imap_bodystruct_basic.phpt @@ -1,7 +1,7 @@ --TEST-- Test imap_bodystruct() function : basic functionality --SKIPIF-- -<?php +<?php require_once(dirname(__FILE__).'/skipif.inc'); ?> --FILE-- @@ -20,10 +20,10 @@ if (!is_resource($imap_stream)) { exit("TEST FAILED: Unable to create test mailbox\n"); } -echo "\nGet and validate structure of body part 1\n"; +echo "\nGet and validate structure of body part 1\n"; + +$m = imap_bodystruct($imap_stream, 1, "1"); -$m = imap_bodystruct($imap_stream, 1, "1"); - $mandatoryFields = array( 'ifsubtype', 'ifdescription', @@ -33,9 +33,9 @@ $mandatoryFields = array( 'ifparameters', ); -foreach($mandatoryFields as $mf) +foreach($mandatoryFields as $mf) { - if(isValid($m->$mf)) + if(isValid($m->$mf)) { echo "$mf is 0 or 1\n"; } @@ -45,32 +45,32 @@ foreach($mandatoryFields as $mf) } } -if(is_array($m->parameters)) +if(is_array($m->parameters)) { echo "parameters is an array\n"; } echo "\nTry to get part 4!\n"; -var_dump(imap_bodystruct($imap_stream, 1, "4")); +var_dump(imap_bodystruct($imap_stream, 1, "4")); imap_close($imap_stream); -function isValid($param) +function isValid($param) { - if(($param == 0) || ($param == 1)) + if(($param == 0) || ($param == 1)) { $result=true; } else { $result=false; - } + } return $result; } ?> ===Done=== --CLEAN-- -<?php +<?php require_once('clean.inc'); ?> --EXPECTF-- diff --git a/ext/imap/tests/imap_clearflag_full_basic.phpt b/ext/imap/tests/imap_clearflag_full_basic.phpt index 4269688e14..243cba98cd 100644 --- a/ext/imap/tests/imap_clearflag_full_basic.phpt +++ b/ext/imap/tests/imap_clearflag_full_basic.phpt @@ -1,7 +1,7 @@ --TEST-- Test imap_clearflag_full() function : basic functionality --SKIPIF-- -<?php +<?php require_once(dirname(__FILE__).'/skipif.inc'); ?> --FILE-- @@ -24,7 +24,7 @@ if (!is_resource($imap_stream)) { $check = imap_check($imap_stream); echo "Initial msg count in new_mailbox : ". $check->Nmsgs . "\n"; -echo "Set some flags\n"; +echo "Set some flags\n"; var_dump(imap_setflag_full($imap_stream, "1,3", "\\Seen \\Answered")); var_dump(imap_setflag_full($imap_stream, "2,4", "\\Answered")); var_dump(imap_setflag_full($imap_stream, "5,7", "\\Flagged \\Deleted")); @@ -49,7 +49,7 @@ imap_close($imap_stream); ?> ===Done=== --CLEAN-- -<?php +<?php require_once('clean.inc'); ?> --EXPECTF-- diff --git a/ext/imap/tests/imap_close_variation1.phpt b/ext/imap/tests/imap_close_variation1.phpt index 47035f938d..8206e0ac1f 100644 --- a/ext/imap/tests/imap_close_variation1.phpt +++ b/ext/imap/tests/imap_close_variation1.phpt @@ -59,7 +59,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -69,7 +69,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/imap/tests/imap_close_variation2.phpt b/ext/imap/tests/imap_close_variation2.phpt index febf063ad4..412a835a1a 100644 --- a/ext/imap/tests/imap_close_variation2.phpt +++ b/ext/imap/tests/imap_close_variation2.phpt @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', diff --git a/ext/imap/tests/imap_createmailbox_basic.phpt b/ext/imap/tests/imap_createmailbox_basic.phpt index 431d59f97d..8102110317 100644 --- a/ext/imap/tests/imap_createmailbox_basic.phpt +++ b/ext/imap/tests/imap_createmailbox_basic.phpt @@ -1,7 +1,7 @@ --TEST-- Test imap_createmailbox() function : basic functionality --SKIPIF-- -<?php +<?php require_once(dirname(__FILE__).'/skipif.inc'); ?> --FILE-- @@ -25,8 +25,8 @@ echo "Newname will be '$newname'\n"; $newbox = imap_utf7_encode($server.$newname); if (imap_createmailbox($imap_stream, $newbox)) { - echo "Add a couple of msgs to '$newname' mailbox\n"; - populate_mailbox($imap_stream, $newbox, 2); + echo "Add a couple of msgs to '$newname' mailbox\n"; + populate_mailbox($imap_stream, $newbox, 2); $status = imap_status($imap_stream, $newbox, SA_ALL); if ($status) { @@ -36,7 +36,7 @@ if (imap_createmailbox($imap_stream, $newbox)) { echo "Unseen: " . $status->unseen . "\n"; echo "UIDnext: " . $status->uidnext . "\n"; echo "UIDvalidity: " . $status->uidvalidity . "\n"; - + } else { echo "imap_status on new mailbox failed: " . imap_last_error() . "\n"; } diff --git a/ext/imap/tests/imap_errors_basic.phpt b/ext/imap/tests/imap_errors_basic.phpt index 91be3286aa..2c00781860 100644 --- a/ext/imap/tests/imap_errors_basic.phpt +++ b/ext/imap/tests/imap_errors_basic.phpt @@ -1,7 +1,7 @@ --TEST-- Test imap_errors() function : basic functionality --SKIPIF-- -<?php +<?php require_once(dirname(__FILE__).'/skipif.inc'); ?> --FILE-- @@ -19,13 +19,13 @@ echo "Issue open with invalid password with normal default number of retries, i. $mbox = imap_open($default_mailbox, $username, $password, OP_READONLY, 3); echo "List any errors\n"; -var_dump(imap_errors()); +var_dump(imap_errors()); echo "\n\nIssue open with invalid password with retries == 1\n"; $mbox = imap_open($default_mailbox, $username, $password, OP_READONLY, 1); echo "List any errors\n"; -var_dump(imap_errors()); +var_dump(imap_errors()); ?> ===Done=== --EXPECTF-- diff --git a/ext/imap/tests/imap_fetch_overview_variation1.phpt b/ext/imap/tests/imap_fetch_overview_variation1.phpt index 38fbccd7ec..17ebe97034 100644 --- a/ext/imap/tests/imap_fetch_overview_variation1.phpt +++ b/ext/imap/tests/imap_fetch_overview_variation1.phpt @@ -63,7 +63,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -73,7 +73,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/imap/tests/imap_fetch_overview_variation2.phpt b/ext/imap/tests/imap_fetch_overview_variation2.phpt index a1b9d71b54..33bcdb72ae 100644 --- a/ext/imap/tests/imap_fetch_overview_variation2.phpt +++ b/ext/imap/tests/imap_fetch_overview_variation2.phpt @@ -67,7 +67,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -77,7 +77,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/imap/tests/imap_fetch_overview_variation3.phpt b/ext/imap/tests/imap_fetch_overview_variation3.phpt index d33b44addb..17778d1dda 100644 --- a/ext/imap/tests/imap_fetch_overview_variation3.phpt +++ b/ext/imap/tests/imap_fetch_overview_variation3.phpt @@ -28,8 +28,8 @@ $msg_uid = imap_uid($stream_id, $msg_no); $options = array ('1', true, - 1.000000000000001, - 0.00001e5, + 1.000000000000001, + 0.00001e5, PHP_INT_MAX, -PHP_INT_MAX ); diff --git a/ext/imap/tests/imap_fetch_overview_variation6.phpt b/ext/imap/tests/imap_fetch_overview_variation6.phpt index bdf05579de..0c6ff4f622 100644 --- a/ext/imap/tests/imap_fetch_overview_variation6.phpt +++ b/ext/imap/tests/imap_fetch_overview_variation6.phpt @@ -47,17 +47,17 @@ function create_multipart_message($imap_stream, $mailbox) { $part1["type"] = TYPEMULTIPART; $part1["subtype"] = "mixed"; - + $part2["type"] = TYPETEXT; $part2["subtype"] = "plain"; $part2["description"] = "imap_mail_compose() function"; $part2["contents.data"] = "message 1:xxxxxxxxxxxxxxxxxxxxxxxxxx"; - + $part3["type"] = TYPETEXT; $part3["subtype"] = "plain"; $part3["description"] = "Example"; $part3["contents.data"] = "message 2:yyyyyyyyyyyyyyyyyyyyyyyyyy"; - + $file_handle = fopen(__FILE__, 'r+'); $file_size = 1; @@ -69,12 +69,12 @@ function create_multipart_message($imap_stream, $mailbox) { $part4['disposition'] = array ('filename' => 'Test'); $part4['type.parameters'] = array('name' => 'Test'); $part4["contents.data"] = base64_encode(fread($file_handle, 1)); - + $body[1] = $part1; $body[2] = $part2; $body[3] = $part3; $body[4] = $part4; - + $msg = imap_mail_compose($envelope, $body); if (imap_append($imap_stream, $mailbox, $msg) === false) { diff --git a/ext/imap/tests/imap_fetchbody_basic.phpt b/ext/imap/tests/imap_fetchbody_basic.phpt index c821f2046e..787e599a88 100644 --- a/ext/imap/tests/imap_fetchbody_basic.phpt +++ b/ext/imap/tests/imap_fetchbody_basic.phpt @@ -34,14 +34,14 @@ foreach ($options as $key => $option) { $msg_uid = imap_uid($stream_id, $msg_no); var_dump( imap_fetchbody($stream_id, $msg_uid, $section, $option) ); break; - + case 'FT_PEEK'; var_dump( imap_fetchbody($stream_id, $msg_no, $section, $option) ); $overview = imap_fetch_overview($stream_id, 1); echo "Seen Flag: "; var_dump( $overview[0]->seen ); break; - + case 'FT_INTERNAL'; var_dump( imap_fetchbody($stream_id, $msg_no, $section, $option) ); break; diff --git a/ext/imap/tests/imap_fetchbody_variation1.phpt b/ext/imap/tests/imap_fetchbody_variation1.phpt index e455265f37..a522cb1b8d 100644 --- a/ext/imap/tests/imap_fetchbody_variation1.phpt +++ b/ext/imap/tests/imap_fetchbody_variation1.phpt @@ -64,7 +64,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -74,7 +74,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/imap/tests/imap_fetchbody_variation2.phpt b/ext/imap/tests/imap_fetchbody_variation2.phpt index 7744ee8ec0..85ac283615 100644 --- a/ext/imap/tests/imap_fetchbody_variation2.phpt +++ b/ext/imap/tests/imap_fetchbody_variation2.phpt @@ -66,7 +66,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -76,7 +76,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/imap/tests/imap_fetchbody_variation3.phpt b/ext/imap/tests/imap_fetchbody_variation3.phpt index 19656a1df3..14b165f8ff 100644 --- a/ext/imap/tests/imap_fetchbody_variation3.phpt +++ b/ext/imap/tests/imap_fetchbody_variation3.phpt @@ -66,7 +66,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -76,7 +76,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/imap/tests/imap_fetchbody_variation4.phpt b/ext/imap/tests/imap_fetchbody_variation4.phpt index d8126bce0e..d34a79c57e 100644 --- a/ext/imap/tests/imap_fetchbody_variation4.phpt +++ b/ext/imap/tests/imap_fetchbody_variation4.phpt @@ -27,8 +27,8 @@ $msg_uid = imap_uid($stream_id, $msg_no); $section = 1; //Note: the first four values are valid as they will all be cast to 1L. -$options = array ('1', true, - 1.000000000000001, 0.00001e5, +$options = array ('1', true, + 1.000000000000001, 0.00001e5, PHP_INT_MAX, -PHP_INT_MAX); // iterate over each element of $options array to test whether FT_UID is set diff --git a/ext/imap/tests/imap_fetchheader_variation1.phpt b/ext/imap/tests/imap_fetchheader_variation1.phpt index 113cde8c34..2df6aed40f 100644 --- a/ext/imap/tests/imap_fetchheader_variation1.phpt +++ b/ext/imap/tests/imap_fetchheader_variation1.phpt @@ -69,7 +69,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -78,14 +78,14 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // array data /*21*/ array(), $index_array, $assoc_array, array('foo', $index_array, $assoc_array), - - + + // object data /*25*/ new classA(), diff --git a/ext/imap/tests/imap_fetchheader_variation2.phpt b/ext/imap/tests/imap_fetchheader_variation2.phpt index 9f3e64812d..0542bfb4bb 100644 --- a/ext/imap/tests/imap_fetchheader_variation2.phpt +++ b/ext/imap/tests/imap_fetchheader_variation2.phpt @@ -69,7 +69,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -78,14 +78,14 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // array data /*21*/ array(), $index_array, $assoc_array, array('foo', $index_array, $assoc_array), - - + + // object data /*25*/ new classA(), diff --git a/ext/imap/tests/imap_fetchheader_variation3.phpt b/ext/imap/tests/imap_fetchheader_variation3.phpt index feba766e68..a965a652c5 100644 --- a/ext/imap/tests/imap_fetchheader_variation3.phpt +++ b/ext/imap/tests/imap_fetchheader_variation3.phpt @@ -26,8 +26,8 @@ $stream_id = setup_test_mailbox('', 1); // set up temporary mailbox with one sim $msg_no = 1; $msg_uid = imap_uid($stream_id, $msg_no); -$options = array ('1', true, - 1.000000000000001, 0.00001e5, +$options = array ('1', true, + 1.000000000000001, 0.00001e5, PHP_INT_MAX, -PHP_INT_MAX); // iterate over each element of $options array to test whether FT_UID is set diff --git a/ext/imap/tests/imap_fetchheader_variation5.phpt b/ext/imap/tests/imap_fetchheader_variation5.phpt index 0554ef0102..d88edfd039 100644 --- a/ext/imap/tests/imap_fetchheader_variation5.phpt +++ b/ext/imap/tests/imap_fetchheader_variation5.phpt @@ -24,7 +24,7 @@ $stream_id = setup_test_mailbox('', 3, $mailbox, 'notSimple'); // set up temp ma $sequences = array (0, 4, // out of range '1,3', '1:3', // message sequences instead of numbers - ); + ); foreach($sequences as $msg_no) { echo "\n-- \$msg_no is $msg_no --\n"; diff --git a/ext/imap/tests/imap_getsubscribed_basic.phpt b/ext/imap/tests/imap_getsubscribed_basic.phpt index ba8a42daa8..05cbcaf558 100644 --- a/ext/imap/tests/imap_getsubscribed_basic.phpt +++ b/ext/imap/tests/imap_getsubscribed_basic.phpt @@ -39,7 +39,7 @@ var_dump($z[0]); imap_close($stream_id); ?> --CLEAN-- -<?php +<?php require_once('clean.inc'); ?> --EXPECTF-- diff --git a/ext/imap/tests/imap_headerinfo_basic.phpt b/ext/imap/tests/imap_headerinfo_basic.phpt index b772476afc..0f245a4b1e 100644 --- a/ext/imap/tests/imap_headerinfo_basic.phpt +++ b/ext/imap/tests/imap_headerinfo_basic.phpt @@ -16,7 +16,7 @@ $z = imap_headerinfo($stream_id, 1); $fields = array ('toaddress','to','fromaddress','from', 'reply_toaddress','reply_to', - 'senderaddress', 'sender', + 'senderaddress', 'sender', 'subject','Subject', 'Recent','Unseen','Flagged','Answered','Deleted','Draft', 'Msgno','MailDate','Size','udate'); @@ -84,7 +84,7 @@ imap_close($stream_id); ?> --CLEAN-- -<?php +<?php require_once('clean.inc'); ?> --EXPECTF-- diff --git a/ext/imap/tests/imap_headerinfo_error.phpt b/ext/imap/tests/imap_headerinfo_error.phpt index b526096fe1..cf9340b92e 100644 --- a/ext/imap/tests/imap_headerinfo_error.phpt +++ b/ext/imap/tests/imap_headerinfo_error.phpt @@ -18,7 +18,7 @@ imap_headerinfo(false); require_once(dirname(__FILE__).'/imap_include.inc'); $stream_id = imap_open($default_mailbox, $username, $password) or die("Cannot connect to mailbox $default_mailbox: " . imap_last_error()); - + imap_headerinfo($stream_id); imap_close($stream_id); diff --git a/ext/imap/tests/imap_lsub_basic.phpt b/ext/imap/tests/imap_lsub_basic.phpt index 153ca2a1bf..d0f3b04592 100644 --- a/ext/imap/tests/imap_lsub_basic.phpt +++ b/ext/imap/tests/imap_lsub_basic.phpt @@ -39,7 +39,7 @@ var_dump($z[0]); imap_close($stream_id); ?> --CLEAN-- -<?php +<?php require_once('clean.inc'); ?> --EXPECTF-- diff --git a/ext/imap/tests/imap_mail_copy.phpt b/ext/imap/tests/imap_mail_copy.phpt index 47c5e61bb0..a1bac4f0b9 100644 --- a/ext/imap/tests/imap_mail_copy.phpt +++ b/ext/imap/tests/imap_mail_copy.phpt @@ -24,7 +24,7 @@ require_once(dirname(__FILE__).'/imap_include.inc'); echo "Test with IMAP server\n"; $stream_id = imap_open($default_mailbox, $username, $password) or die("Cannot connect to mailbox $default_mailbox: " . imap_last_error()); - + var_dump(imap_mail_copy($stream_id)); var_dump(imap_mail_copy($stream_id,-1)); var_dump(imap_mail_copy($stream_id, '')); diff --git a/ext/imap/tests/imap_mail_copy_basic.phpt b/ext/imap/tests/imap_mail_copy_basic.phpt index a7b9421e31..be463161b4 100644 --- a/ext/imap/tests/imap_mail_copy_basic.phpt +++ b/ext/imap/tests/imap_mail_copy_basic.phpt @@ -25,7 +25,7 @@ if (!is_resource($imap_stream)) { } $check = imap_check($imap_stream); -echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n"; +echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n"; var_dump(imap_mail_copy($imap_stream, '1', 'INBOX.'.$mailbox_prefix)); @@ -33,7 +33,7 @@ imap_close($imap_stream); ?> ===Done=== --CLEAN-- -<?php +<?php require_once('clean.inc'); ?> --EXPECTF-- diff --git a/ext/imap/tests/imap_mail_move.phpt b/ext/imap/tests/imap_mail_move.phpt index 67ddea713a..bca8cba003 100644 --- a/ext/imap/tests/imap_mail_move.phpt +++ b/ext/imap/tests/imap_mail_move.phpt @@ -24,7 +24,7 @@ require_once(dirname(__FILE__).'/imap_include.inc'); echo "Test with IMAP server\n"; $stream_id = imap_open($default_mailbox, $username, $password) or die("Cannot connect to mailbox $default_mailbox: " . imap_last_error()); - + var_dump(imap_mail_move($stream_id)); var_dump(imap_mail_move($stream_id,-1)); var_dump(imap_mail_move($stream_id, '')); diff --git a/ext/imap/tests/imap_mail_move_basic.phpt b/ext/imap/tests/imap_mail_move_basic.phpt index a543582565..9cc041b56f 100644 --- a/ext/imap/tests/imap_mail_move_basic.phpt +++ b/ext/imap/tests/imap_mail_move_basic.phpt @@ -25,7 +25,7 @@ if (!is_resource($imap_stream)) { } $check = imap_check($imap_stream); -echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n"; +echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n"; var_dump(imap_mail_move($imap_stream, '1', 'INBOX.'.$mailbox_prefix)); @@ -33,7 +33,7 @@ imap_close($imap_stream); ?> ===Done=== --CLEAN-- -<?php +<?php require_once('clean.inc'); ?> --EXPECTF-- diff --git a/ext/imap/tests/imap_mutf7_to_utf8.phpt b/ext/imap/tests/imap_mutf7_to_utf8.phpt index 7a1a54aec5..e2c745ecd0 100644 --- a/ext/imap/tests/imap_mutf7_to_utf8.phpt +++ b/ext/imap/tests/imap_mutf7_to_utf8.phpt @@ -13,7 +13,7 @@ var_dump(imap_mutf7_to_utf8("t&AOQ-st")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(0) "" string(1) "1" diff --git a/ext/imap/tests/imap_renamemailbox_basic.phpt b/ext/imap/tests/imap_renamemailbox_basic.phpt index b445f1d3e4..49d45ae71f 100644 --- a/ext/imap/tests/imap_renamemailbox_basic.phpt +++ b/ext/imap/tests/imap_renamemailbox_basic.phpt @@ -17,7 +17,7 @@ imap_renamemailbox(false); require_once(dirname(__FILE__).'/imap_include.inc'); - + $stream_id = setup_test_mailbox('', 1); if (!is_resource($stream_id)) { @@ -43,7 +43,7 @@ var_dump(imap_renamemailbox($stream_id, $newbox.'.test', $newbox.'.testd')); imap_close($stream_id); ?> --CLEAN-- -<?php +<?php require_once('clean.inc'); ?> --EXPECTF-- diff --git a/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt b/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt index e4253925d2..dabe7ce6ed 100644 --- a/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt +++ b/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt @@ -16,7 +16,7 @@ $z = imap_headerinfo($stream_id, 1); $fields = array ('toaddress','to','fromaddress','from', 'reply_toaddress','reply_to', - 'senderaddress', 'sender', + 'senderaddress', 'sender', 'subject','Subject', 'MailDate','Size','udate'); @@ -84,7 +84,7 @@ imap_close($stream_id); ?> --CLEAN-- -<?php +<?php require_once('clean.inc'); ?> --EXPECTF-- diff --git a/ext/imap/tests/imap_savebody_basic.phpt b/ext/imap/tests/imap_savebody_basic.phpt index 91e6ce03e9..774a246447 100644 --- a/ext/imap/tests/imap_savebody_basic.phpt +++ b/ext/imap/tests/imap_savebody_basic.phpt @@ -37,7 +37,7 @@ echo "Size: ".filesize($file)."\n"; imap_close($stream_id); ?> --CLEAN-- -<?php +<?php @unlink(dirname(__FILE__).'/tmpsavebody.txt'); require_once('clean.inc'); ?> diff --git a/ext/imap/tests/imap_undelete_basic.phpt b/ext/imap/tests/imap_undelete_basic.phpt index 4b48b1b09a..c843a57440 100644 --- a/ext/imap/tests/imap_undelete_basic.phpt +++ b/ext/imap/tests/imap_undelete_basic.phpt @@ -20,7 +20,7 @@ imap_close($stream_id); ?> --CLEAN-- -<?php +<?php require_once('clean.inc'); ?> --EXPECTF-- diff --git a/ext/imap/tests/imap_undelete_error.phpt b/ext/imap/tests/imap_undelete_error.phpt index c82801e15a..4a19c71ad0 100644 --- a/ext/imap/tests/imap_undelete_error.phpt +++ b/ext/imap/tests/imap_undelete_error.phpt @@ -18,7 +18,7 @@ imap_undelete(false); require_once(dirname(__FILE__).'/imap_include.inc'); $stream_id = imap_open($default_mailbox, $username, $password) or die("Cannot connect to mailbox $default_mailbox: " . imap_last_error()); - + imap_undelete($stream_id); imap_close($stream_id); diff --git a/ext/imap/tests/imap_utf8.phpt b/ext/imap/tests/imap_utf8.phpt index f701f82f27..a8901555d5 100644 --- a/ext/imap/tests/imap_utf8.phpt +++ b/ext/imap/tests/imap_utf8.phpt @@ -12,7 +12,7 @@ var_dump(imap_utf8("test")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(0) "" string(1) "1" diff --git a/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt b/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt index 54b43efaec..bea268a457 100644 --- a/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt +++ b/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt @@ -13,7 +13,7 @@ var_dump(imap_utf8_to_mutf7("täst")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(0) "" string(1) "1" diff --git a/ext/interbase/tests/002.phpt b/ext/interbase/tests/002.phpt index 37b0a4f344..6c7d780588 100644 --- a/ext/interbase/tests/002.phpt +++ b/ext/interbase/tests/002.phpt @@ -6,7 +6,7 @@ InterBase: connect, close and pconnect <?php require("interbase.inc"); - + ibase_connect($test_base); out_table("test1"); ibase_close(); diff --git a/ext/interbase/tests/003.phpt b/ext/interbase/tests/003.phpt index 8ee86d3e9e..70fa5f0d30 100644 --- a/ext/interbase/tests/003.phpt +++ b/ext/interbase/tests/003.phpt @@ -7,7 +7,7 @@ InterBase: misc sql types (may take a while) require("interbase.inc"); ibase_connect($test_base); - + ibase_query( "create table test3 ( iter integer not null, @@ -129,7 +129,7 @@ InterBase: misc sql types (may take a while) $q = ibase_query('SELECT 1 AS id, 2 AS id, 3 AS id, 4 AS id, 5 AS id, 6 AS id, 7 AS id, 8 AS id, 9 AS id, 10 AS id, 11 AS id, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22 FROM rdb$database'); var_dump(ibase_fetch_assoc($q)); - + ibase_close(); echo "end of test\n"; ?> diff --git a/ext/interbase/tests/004.phpt b/ext/interbase/tests/004.phpt index 54a6b7b9b5..4e63ce205f 100644 --- a/ext/interbase/tests/004.phpt +++ b/ext/interbase/tests/004.phpt @@ -6,7 +6,7 @@ InterBase: BLOB test <?php require("interbase.inc"); - + $link = ibase_connect($test_base); ibase_query( @@ -38,7 +38,7 @@ InterBase: BLOB test $row = ibase_fetch_object($q); $bl_h = ibase_blob_open($row->V_BLOB); - $blob = ''; + $blob = ''; while($piece = ibase_blob_get($bl_h, 1 + rand() % 1024)) $blob .= $piece; if($blob != $blob_str) @@ -47,7 +47,7 @@ InterBase: BLOB test $bl_h = ibase_blob_open($link,$row->V_BLOB); - $blob = ''; + $blob = ''; while($piece = ibase_blob_get($bl_h, 100 * 1024)) $blob .= $piece; if($blob != $blob_str) @@ -108,7 +108,7 @@ InterBase: BLOB test $row = ibase_fetch_object($q); ibase_commit(); ibase_close(); - + $link = ibase_connect($test_base); ibase_blob_echo($link, $row->V_BLOB); ibase_free_result($q); diff --git a/ext/interbase/tests/006.phpt b/ext/interbase/tests/006.phpt index a32807eec0..cf360045ed 100644 --- a/ext/interbase/tests/006.phpt +++ b/ext/interbase/tests/006.phpt @@ -6,9 +6,9 @@ InterBase: binding (may take a while) <?php require("interbase.inc"); - + ibase_connect($test_base); - + ibase_query( "create table test6 ( iter integer, @@ -171,7 +171,7 @@ InterBase: binding (may take a while) echo "VARCHAR fail\n"; } ibase_free_result($sel); - + } /*for iter*/ echo "prepare and exec insert\n"; diff --git a/ext/interbase/tests/007.phpt b/ext/interbase/tests/007.phpt index 92e7c73984..8afe6e6ca3 100644 --- a/ext/interbase/tests/007.phpt +++ b/ext/interbase/tests/007.phpt @@ -6,9 +6,9 @@ InterBase: array handling <?php require("interbase.inc"); - + ibase_connect($test_base); - + ibase_query( "create table test7 ( iter integer, @@ -29,7 +29,7 @@ InterBase: array handling ini_set('ibase.timestampformat',"%m/%d/%Y %H:%M:%S"); echo "insert\n"; - + for ($i = 1; $i <= 10; ++$i) { for ($j = 1; $j <= 10; ++$j) { for ($k = 1; $k <= 10; ++$k) { @@ -37,7 +37,7 @@ InterBase: array handling } } } - + for($iter = 0; $iter < 3; $iter++) { /* prepare data */ @@ -62,7 +62,7 @@ InterBase: array handling $v_smallint[$i] = rand_number(5) % 32767; $v_varchar[$i] = rand_str(1000); } - + ibase_query("insert into test7 (iter,v_multi,v_char,v_date,v_decimal,v_double,v_float, v_integer,v_numeric,v_smallint,v_varchar) @@ -73,7 +73,7 @@ InterBase: array handling $row = ibase_fetch_object($sel,IBASE_FETCH_ARRAYS); for ($i = 1; $i <= 10; ++$i) { - + if(strncmp($row->V_CHAR[$i],$v_char[$i],strlen($v_char[$i])) != 0) { echo " CHAR[$i] fail:\n"; echo " in: ".$v_char[$i]."\n"; @@ -124,7 +124,7 @@ InterBase: array handling }/* for($iter) */ echo "select\n"; - + $sel = ibase_query("SELECT v_multi[5,5,5],v_multi[10,10,10] FROM test7 WHERE iter = 0"); print_r(ibase_fetch_row($sel)); ibase_free_result($sel); diff --git a/ext/interbase/tests/008.phpt b/ext/interbase/tests/008.phpt index 6728b9d7d3..c7b01dc2ed 100644 --- a/ext/interbase/tests/008.phpt +++ b/ext/interbase/tests/008.phpt @@ -1,9 +1,9 @@ --TEST-- InterBase: event handling --SKIPIF-- -<?php +<?php if (PHP_OS == "WINNT") echo "skip"; -include("skipif.inc"); +include("skipif.inc"); ?> --FILE-- <?php diff --git a/ext/interbase/tests/bug45373.phpt b/ext/interbase/tests/bug45373.phpt index b83bf214e2..57ac126d07 100644 --- a/ext/interbase/tests/bug45373.phpt +++ b/ext/interbase/tests/bug45373.phpt @@ -6,7 +6,7 @@ Bug #45373 (php crash on query with errors in params) <?php require("interbase.inc"); - + $db = ibase_connect($test_base); @@ -16,11 +16,11 @@ Bug #45373 (php crash on query with errors in params) $r = ibase_execute($q, 1, 'test table not created with isql'); var_dump(ibase_fetch_assoc($r)); ibase_free_result($r); - + $r = ibase_execute($q, 1, 'test table not created with isql', 1); var_dump(ibase_fetch_assoc($r)); ibase_free_result($r); - + $r = ibase_execute($q, 1); var_dump(ibase_fetch_assoc($r)); diff --git a/ext/intl/tests/badargs.phpt b/ext/intl/tests/badargs.phpt index d6ce48317b..c3d7a331c2 100644 --- a/ext/intl/tests/badargs.phpt +++ b/ext/intl/tests/badargs.phpt @@ -13,7 +13,7 @@ foreach($funcs as $func) { if($rfunc->getNumberOfRequiredParameters() == 0) { continue; } - + try { $res = $func($arg); } catch (Exception $e) { diff --git a/ext/intl/tests/bug61487.phpt b/ext/intl/tests/bug61487.phpt index 2270b25cce..b303e00710 100644 --- a/ext/intl/tests/bug61487.phpt +++ b/ext/intl/tests/bug61487.phpt @@ -1,7 +1,7 @@ --TEST-- grapheme() str[i]pos limits --SKIPIF-- -<?php if( !extension_loaded( 'intl' ) ) die('skip'); +<?php if( !extension_loaded( 'intl' ) ) die('skip'); if (PHP_INT_SIZE != 8) die('skip 64-bit only'); ?> --FILE-- diff --git a/ext/intl/tests/bug62915.phpt b/ext/intl/tests/bug62915.phpt index e541d72d63..2277cde9d5 100644 --- a/ext/intl/tests/bug62915.phpt +++ b/ext/intl/tests/bug62915.phpt @@ -9,7 +9,7 @@ if (!extension_loaded('intl')) class foo extends IntlTimeZone { public $foo = 'test'; - + public function __construct() { } } diff --git a/ext/intl/tests/bug71020.phpt b/ext/intl/tests/bug71020.phpt index 368d967efd..9f9b8eede3 100644 --- a/ext/intl/tests/bug71020.phpt +++ b/ext/intl/tests/bug71020.phpt @@ -4,7 +4,7 @@ Bug #71020 (Use after free in Collator::sortWithSortKeys) <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?> --FILE-- <?php - + $var_3=new Collator("Whatever"); for($x=0;$x<0xbb;$x++) $myarray[substr(md5(microtime()),rand(0,26),9) . strval($x)]= substr(md5(microtime()),rand(0,26),9) . strval($x); diff --git a/ext/intl/tests/calendar_fieldDifference_basic.phpt b/ext/intl/tests/calendar_fieldDifference_basic.phpt index 3432420df4..0287e259c1 100644 --- a/ext/intl/tests/calendar_fieldDifference_basic.phpt +++ b/ext/intl/tests/calendar_fieldDifference_basic.phpt @@ -19,7 +19,7 @@ var_dump( IntlCalendar::FIELD_SECOND), $intlcal->get(IntlCalendar::FIELD_HOUR_OF_DAY)); - + $intlcal->setTime(strtotime('2012-02-29 05:06:07 +0000') * 1000); var_dump( intlcal_field_difference( diff --git a/ext/intl/tests/calendar_setTime_basic.phpt b/ext/intl/tests/calendar_setTime_basic.phpt index f7f213c0d8..c4d57be4b9 100644 --- a/ext/intl/tests/calendar_setTime_basic.phpt +++ b/ext/intl/tests/calendar_setTime_basic.phpt @@ -19,7 +19,7 @@ $intlcal->setTime($time * 1000); var_dump( (float)$time*1000, $intlcal->getTime()); - + $intlcal = IntlCalendar::createInstance('UTC'); intlcal_set_time($intlcal,$time * 1000); var_dump(intlcal_get_time($intlcal)); diff --git a/ext/intl/tests/calendar_set_variation1.phpt b/ext/intl/tests/calendar_set_variation1.phpt index 8ea016ed61..20dfa53eb6 100644 --- a/ext/intl/tests/calendar_set_variation1.phpt +++ b/ext/intl/tests/calendar_set_variation1.phpt @@ -16,7 +16,7 @@ $intlcal->clear(); var_dump($intlcal->set(2012, 1, 29)); var_dump($intlcal->getTime(), strtotime('2012-02-29 00:00:00 +0000') * 1000.); - + //two minutes to midnight! var_dump($intlcal->set(2012, 1, 29, 23, 58)); var_dump($intlcal->getTime(), diff --git a/ext/intl/tests/collator_asort.phpt b/ext/intl/tests/collator_asort.phpt index 94fb6ef7a4..0b3d0ee795 100644 --- a/ext/intl/tests/collator_asort.phpt +++ b/ext/intl/tests/collator_asort.phpt @@ -35,7 +35,7 @@ function sort_arrays( $locale, $test_arrays, $sort_flag = Collator::SORT_REGULAR $md5 = md5( $res_dump ); global $test_num; - + $res_str .= "\n\n". "Test $test_num.$md5:" . $res_dump; diff --git a/ext/intl/tests/collator_asort_variant2.phpt b/ext/intl/tests/collator_asort_variant2.phpt index 0a7c914d89..08725095b5 100644 --- a/ext/intl/tests/collator_asort_variant2.phpt +++ b/ext/intl/tests/collator_asort_variant2.phpt @@ -35,7 +35,7 @@ function sort_arrays( $locale, $test_arrays, $sort_flag = Collator::SORT_REGULAR $md5 = md5( $res_dump ); global $test_num; - + $res_str .= "\n\n". "Test $test_num.$md5:" . $res_dump; diff --git a/ext/intl/tests/collator_get_error_code.phpt b/ext/intl/tests/collator_get_error_code.phpt index c886943d5d..17a17eeefc 100644 --- a/ext/intl/tests/collator_get_error_code.phpt +++ b/ext/intl/tests/collator_get_error_code.phpt @@ -16,7 +16,7 @@ get_error_code() function check_rc( $rc, $expected ) { return ( $rc === $expected ? "ok" : "failed" ) . "\n"; -} +} function ut_main() { diff --git a/ext/intl/tests/collator_get_sort_key.phpt b/ext/intl/tests/collator_get_sort_key.phpt index 6cd522963b..62cc3a7b11 100644 --- a/ext/intl/tests/collator_get_sort_key.phpt +++ b/ext/intl/tests/collator_get_sort_key.phpt @@ -2,7 +2,7 @@ collator_get_sort_key() --SKIPIF-- <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?> -<?php /* XXX Obviously it fails somewhere between >= 4.8 and < 51.2 */ +<?php /* XXX Obviously it fails somewhere between >= 4.8 and < 51.2 */ if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?> --FILE-- <?php diff --git a/ext/intl/tests/collator_sort.phpt b/ext/intl/tests/collator_sort.phpt index e16eeea1e8..4f7a12352a 100644 --- a/ext/intl/tests/collator_sort.phpt +++ b/ext/intl/tests/collator_sort.phpt @@ -36,7 +36,7 @@ function sort_arrays( $locale, $arrays, $sort_flag = Collator::SORT_REGULAR ) $md5 = md5( $res_dump ); global $test_num; - + $res_str .= "\n\n". "Test $test_num.$md5:" . $res_dump; diff --git a/ext/intl/tests/collator_sort_variant2.phpt b/ext/intl/tests/collator_sort_variant2.phpt index 29a5082fda..abb302eda6 100644 --- a/ext/intl/tests/collator_sort_variant2.phpt +++ b/ext/intl/tests/collator_sort_variant2.phpt @@ -36,7 +36,7 @@ function sort_arrays( $locale, $arrays, $sort_flag = Collator::SORT_REGULAR ) $md5 = md5( $res_dump ); global $test_num; - + $res_str .= "\n\n". "Test $test_num.$md5:" . $res_dump; diff --git a/ext/intl/tests/collator_sort_with_sort_keys.phpt b/ext/intl/tests/collator_sort_with_sort_keys.phpt index 8be9c97789..8f19f23881 100644 --- a/ext/intl/tests/collator_sort_with_sort_keys.phpt +++ b/ext/intl/tests/collator_sort_with_sort_keys.phpt @@ -31,8 +31,8 @@ function sort_arrays( $locale, $arrays ) // with output string. $res_dump = "\n" . dump( $array ) . "\n Result: " . dump( $res_val ); - - + + // Preppend test signature to output string $md5 = md5( $res_dump ); diff --git a/ext/intl/tests/collator_sort_with_sort_keys_variant2.phpt b/ext/intl/tests/collator_sort_with_sort_keys_variant2.phpt index 5257f8a6ff..7416e6f7ec 100644 --- a/ext/intl/tests/collator_sort_with_sort_keys_variant2.phpt +++ b/ext/intl/tests/collator_sort_with_sort_keys_variant2.phpt @@ -31,8 +31,8 @@ function sort_arrays( $locale, $arrays ) // with output string. $res_dump = "\n" . dump( $array ) . "\n Result: " . dump( $res_val ); - - + + // Preppend test signature to output string $md5 = md5( $res_dump ); diff --git a/ext/intl/tests/dateformat_bug68893.phpt b/ext/intl/tests/dateformat_bug68893.phpt index b3faf54342..5ada711c38 100644 --- a/ext/intl/tests/dateformat_bug68893.phpt +++ b/ext/intl/tests/dateformat_bug68893.phpt @@ -5,10 +5,10 @@ Bug #68893 Stackoverflow in datefmt_create --FILE-- <?php -$f = datefmt_create("en_us", -10000000, 1); +$f = datefmt_create("en_us", -10000000, 1); var_dump($f, intl_get_error_message()); -$f = datefmt_create("en_us", 1, -10000000); +$f = datefmt_create("en_us", 1, -10000000); var_dump($f, intl_get_error_message()); ?> diff --git a/ext/intl/tests/dateformat_format.phpt b/ext/intl/tests/dateformat_format.phpt index cc1682ddd2..5b121558a0 100644 --- a/ext/intl/tests/dateformat_format.phpt +++ b/ext/intl/tests/dateformat_format.phpt @@ -20,7 +20,7 @@ function ut_main() $locale_arr = array ( 'en_US' ); - + $datetype_arr = array ( IntlDateFormatter::FULL, IntlDateFormatter::LONG, @@ -73,12 +73,12 @@ function ut_main() $localtime_arr2, $localtime_arr3 ); - + $d1 = new DateTime("2010-01-01 01:02:03", new DateTimeZone("UTC")); $d2 = new DateTime("2000-12-31 03:04:05", new DateTimeZone("UTC")); $d2->setTimezone(new DateTimeZone("PDT")); $dates = array( - $d1, + $d1, $d2, new StdClass(), ); @@ -129,7 +129,7 @@ function ut_main() $res_str .= "\n------------"; $res_str .= "\nDate is: ".var_export($date_entry, true); $res_str .= "\n------------"; - + $fmt = ut_datefmt_create( $locale_entry , $datetype_entry ,$datetype_entry, $timezone, IntlDateFormatter::GREGORIAN ); $formatted1 = ut_datefmt_format( $fmt , $date_entry); if( intl_get_error_code() == U_ZERO_ERROR){ diff --git a/ext/intl/tests/dateformat_format_parse.phpt b/ext/intl/tests/dateformat_format_parse.phpt index 516951371a..68f54eb7e7 100644 --- a/ext/intl/tests/dateformat_format_parse.phpt +++ b/ext/intl/tests/dateformat_format_parse.phpt @@ -13,12 +13,12 @@ datefmt_format_code() and datefmt_parse_code() function ut_main() { - $timezone = 'GMT+05:00'; + $timezone = 'GMT+05:00'; $locale_arr = array ( 'en_US' ); - + $datetype_arr = array ( IntlDateFormatter::FULL, IntlDateFormatter::LONG, diff --git a/ext/intl/tests/dateformat_format_parse_version2.phpt b/ext/intl/tests/dateformat_format_parse_version2.phpt index 8c6f00ef54..f672cd6d22 100644 --- a/ext/intl/tests/dateformat_format_parse_version2.phpt +++ b/ext/intl/tests/dateformat_format_parse_version2.phpt @@ -13,12 +13,12 @@ datefmt_format_code() and datefmt_parse_code() function ut_main() { - $timezone = 'GMT+05:00'; + $timezone = 'GMT+05:00'; $locale_arr = array ( 'en_US' ); - + $datetype_arr = array ( IntlDateFormatter::FULL, IntlDateFormatter::LONG, diff --git a/ext/intl/tests/dateformat_format_variant2.phpt b/ext/intl/tests/dateformat_format_variant2.phpt index 4e4cf7c02d..d61b20b03a 100644 --- a/ext/intl/tests/dateformat_format_variant2.phpt +++ b/ext/intl/tests/dateformat_format_variant2.phpt @@ -20,7 +20,7 @@ function ut_main() $locale_arr = array ( 'en_US' ); - + $datetype_arr = array ( IntlDateFormatter::FULL, IntlDateFormatter::LONG, @@ -73,12 +73,12 @@ function ut_main() $localtime_arr2, $localtime_arr3 ); - + $d1 = new DateTime("2010-01-01 01:02:03", new DateTimeZone("UTC")); $d2 = new DateTime("2000-12-31 03:04:05", new DateTimeZone("UTC")); $d2->setTimezone(new DateTimeZone("PDT")); $dates = array( - $d1, + $d1, $d2, new StdClass(), ); @@ -129,7 +129,7 @@ function ut_main() $res_str .= "\n------------"; $res_str .= "\nDate is: ".var_export($date_entry, true); $res_str .= "\n------------"; - + $fmt = ut_datefmt_create( $locale_entry , $datetype_entry ,$datetype_entry, $timezone, IntlDateFormatter::GREGORIAN ); $formatted1 = ut_datefmt_format( $fmt , $date_entry); if( intl_get_error_code() == U_ZERO_ERROR){ diff --git a/ext/intl/tests/dateformat_format_variant3.phpt b/ext/intl/tests/dateformat_format_variant3.phpt index 6827e8132a..e2f9ec81b0 100644 --- a/ext/intl/tests/dateformat_format_variant3.phpt +++ b/ext/intl/tests/dateformat_format_variant3.phpt @@ -20,7 +20,7 @@ function ut_main() $locale_arr = array ( 'en_US' ); - + $datetype_arr = array ( IntlDateFormatter::FULL, IntlDateFormatter::LONG, @@ -73,12 +73,12 @@ function ut_main() $localtime_arr2, $localtime_arr3 ); - + $d1 = new DateTime("2010-01-01 01:02:03", new DateTimeZone("UTC")); $d2 = new DateTime("2000-12-31 03:04:05", new DateTimeZone("UTC")); $d2->setTimezone(new DateTimeZone("PDT")); $dates = array( - $d1, + $d1, $d2, new StdClass(), ); @@ -129,7 +129,7 @@ function ut_main() $res_str .= "\n------------"; $res_str .= "\nDate is: ".var_export($date_entry, true); $res_str .= "\n------------"; - + $fmt = ut_datefmt_create( $locale_entry , $datetype_entry ,$datetype_entry, $timezone, IntlDateFormatter::GREGORIAN ); $formatted1 = ut_datefmt_format( $fmt , $date_entry); if( intl_get_error_code() == U_ZERO_ERROR){ diff --git a/ext/intl/tests/dateformat_get_datetype.phpt b/ext/intl/tests/dateformat_get_datetype.phpt index 24d03898ea..ec03bb68f4 100644 --- a/ext/intl/tests/dateformat_get_datetype.phpt +++ b/ext/intl/tests/dateformat_get_datetype.phpt @@ -19,7 +19,7 @@ function ut_main() IntlDateFormatter::SHORT, IntlDateFormatter::NONE ); - + $res_str = ''; foreach( $datetype_arr as $datetype_entry ) diff --git a/ext/intl/tests/dateformat_get_locale.phpt b/ext/intl/tests/dateformat_get_locale.phpt index 48b7daa8d4..aa7a0a46c3 100644 --- a/ext/intl/tests/dateformat_get_locale.phpt +++ b/ext/intl/tests/dateformat_get_locale.phpt @@ -20,7 +20,7 @@ function ut_main() 'en_UK', 'hi' ); - + $res_str = ''; foreach( $locale_arr as $locale_entry ) diff --git a/ext/intl/tests/dateformat_get_timetype.phpt b/ext/intl/tests/dateformat_get_timetype.phpt index 2ddc1172b1..cca3c6f96a 100644 --- a/ext/intl/tests/dateformat_get_timetype.phpt +++ b/ext/intl/tests/dateformat_get_timetype.phpt @@ -19,7 +19,7 @@ function ut_main() IntlDateFormatter::SHORT, IntlDateFormatter::NONE ); - + $res_str = ''; foreach( $timetype_arr as $timetype_entry ) diff --git a/ext/intl/tests/dateformat_get_timezone_id.phpt b/ext/intl/tests/dateformat_get_timezone_id.phpt index a9701c3868..f529614f21 100644 --- a/ext/intl/tests/dateformat_get_timezone_id.phpt +++ b/ext/intl/tests/dateformat_get_timezone_id.phpt @@ -20,7 +20,7 @@ function ut_main() 'US/Pacific', 'US/Central' ); - + $res_str = ''; foreach( $timezone_id_arr as $timezone_id_entry ) diff --git a/ext/intl/tests/formatter_fail.phpt b/ext/intl/tests/formatter_fail.phpt index dcc5cb24fa..9cfc6f5054 100644 --- a/ext/intl/tests/formatter_fail.phpt +++ b/ext/intl/tests/formatter_fail.phpt @@ -49,11 +49,11 @@ try { print_exception($e); $fmt = null; } -err($fmt); +err($fmt); $fmt = numfmt_create(); -err($fmt); +err($fmt); $fmt = NumberFormatter::create(); -err($fmt); +err($fmt); foreach($args as $arg) { $fmt = crt("O", $arg[0], $arg[1]); diff --git a/ext/intl/tests/formatter_get_set_pattern.phpt b/ext/intl/tests/formatter_get_set_pattern.phpt index 7f33254e2c..66d6837d75 100644 --- a/ext/intl/tests/formatter_get_set_pattern.phpt +++ b/ext/intl/tests/formatter_get_set_pattern.phpt @@ -33,7 +33,7 @@ function ut_main() $res_str .= "New pattern: '" . ut_nfmt_get_pattern( $fmt ) . "'\n"; $res_str .= "Formatted number: " . ut_nfmt_format( $fmt, $test_value ) . "\n"; - ut_nfmt_set_pattern($fmt, str_repeat('@', 200)); + ut_nfmt_set_pattern($fmt, str_repeat('@', 200)); $res_str .= "New pattern: '" . ut_nfmt_get_pattern( $fmt ) . "'\n"; $res_str .= "Formatted number: " . ut_nfmt_format( $fmt, $test_value ) . "\n"; diff --git a/ext/intl/tests/formatter_get_set_pattern2.phpt b/ext/intl/tests/formatter_get_set_pattern2.phpt index 7bf98ae79e..b1d1ad0c48 100644 --- a/ext/intl/tests/formatter_get_set_pattern2.phpt +++ b/ext/intl/tests/formatter_get_set_pattern2.phpt @@ -33,7 +33,7 @@ function ut_main() $res_str .= "New pattern: '" . ut_nfmt_get_pattern( $fmt ) . "'\n"; $res_str .= "Formatted number: " . ut_nfmt_format( $fmt, $test_value ) . "\n"; - ut_nfmt_set_pattern($fmt, str_repeat('@', 200)); + ut_nfmt_set_pattern($fmt, str_repeat('@', 200)); $res_str .= "New pattern: '" . ut_nfmt_get_pattern( $fmt ) . "'\n"; $res_str .= "Formatted number: " . ut_nfmt_format( $fmt, $test_value ) . "\n"; diff --git a/ext/intl/tests/grapheme.phpt b/ext/intl/tests/grapheme.phpt index 251b1d142f..6b476edaab 100644 --- a/ext/intl/tests/grapheme.phpt +++ b/ext/intl/tests/grapheme.phpt @@ -29,7 +29,7 @@ function ut_main() $char_fi_ligature = "\xEF\xAC\x81"; // 'LATIN SMALL LIGATURE FI' (U+FB01) $char_long_s_dot = "\xE1\xBA\x9B"; // 'LATIN SMALL LETTER LONG S WITH DOT ABOVE' (U+1E9B) - + // the word 'hindi' using Devanagari characters: $hindi = "\xe0\xa4\xb9\xe0\xa4\xbf\xe0\xa4\xa8\xe0\xa5\x8d\xe0\xa4\xa6\xe0\xa5\x80"; @@ -42,7 +42,7 @@ function ut_main() //===================================================================================== $res_str .= "\n" . 'function grapheme_strlen($string) {}' . "\n\n"; - + $res_str .= "\"hindi\" in devanagari strlen " . grapheme_strlen($hindi) . "\n"; $res_str .= "\"ab\" + \"hindi\" + \"cde\" strlen " . grapheme_strlen('ab' . $hindi . 'cde') . "\n"; $res_str .= "\"\" strlen " . grapheme_strlen("") . "\n"; @@ -50,7 +50,7 @@ function ut_main() $res_str .= "char_a_ring_nfd + \"bc\" strlen " . grapheme_strlen($char_a_ring_nfd . 'bc') . "\n"; $res_str .= "\"abc\" strlen " . grapheme_strlen('abc') . "\n"; - + //===================================================================================== $res_str .= "\n" . 'function grapheme_strpos($haystack, $needle, $offset = 0) {}' . "\n\n"; @@ -75,7 +75,7 @@ function ut_main() array( "ao" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "o", "o", -5, 6 ), array( $char_o_diaeresis_nfd . $char_a_ring_nfd . "a" . $char_a_ring_nfd . "bc", $char_a_ring_nfd, 2, 3 ), array( $char_o_diaeresis_nfd . $char_a_ring_nfd . "a" . $char_a_ring_nfd . "bc", $char_a_ring_nfd, -4, 3 ), - + array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "opq", "op", 5 ), array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "opq", "opq", 5 ), array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd, "abc", "false" ), @@ -119,10 +119,10 @@ function ut_main() } $res_str .= " == " . $test[count($test)-1] . check_result($result, $test[count($test)-1]) . "\n"; } - + //===================================================================================== $res_str .= "\n" . 'function grapheme_stripos($haystack, $needle, $offset = 0) {}' . "\n\n"; - + $tests = array( array( "ao" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "O", "o", 2, 6 ), array( "ao" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Oo", "o", -6, 6 ), @@ -142,7 +142,7 @@ function ut_main() array( "abc", "A", 0, 0 ), array( "Abc", "a", 1, "false" ), array( "ababc", "A", 1, 2 ), - + array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", "oP", 5 ), array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", "opQ", 5 ), array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd, "abc", "false" ), @@ -187,7 +187,7 @@ function ut_main() $res_str .= " == " . $test[count($test)-1] . check_result($result, $test[count($test)-1]) . "\n"; } - + //===================================================================================== $res_str .= "\n" . 'function grapheme_strrpos($haystack, $needle, $offset = 0) {}' . "\n\n"; @@ -209,7 +209,7 @@ function ut_main() array( "ababc", "a", 1, 2 ), array( "ao" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "o", "o", 2, 6 ), array( $char_o_diaeresis_nfd . $char_a_ring_nfd . "a" . $char_a_ring_nfd . "bc", $char_a_ring_nfd, 2, 3 ), - + array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "opq", "op", 5 ), array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "opq", "opq", 5 ), array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd, "abc", "false" ), @@ -252,11 +252,11 @@ function ut_main() } $res_str .= " == " . $test[count($test)-1] . check_result($result, $test[count($test)-1]) . "\n"; } - + //===================================================================================== $res_str .= "\n" . 'function grapheme_strripos($haystack, $needle, $offset = 0) {}' . "\n\n"; - + $tests = array( array( "ao" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "O", "o", 2, 6 ), array( $char_o_diaeresis_nfd . $char_a_ring_nfd . "a" . $char_A_ring_nfd . "bc", $char_a_ring_nfd, 2, 3 ), @@ -274,7 +274,7 @@ function ut_main() array( "abc", "A", 0, 0 ), array( "Abc", "a", 1, "false" ), array( "ababc", "A", 1, 2 ), - + array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", "oP", 5 ), array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", "opQ", 5 ), array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd, "abc", "false" ), @@ -317,8 +317,8 @@ function ut_main() } $res_str .= " == " . $test[count($test)-1] . check_result($result, $test[count($test)-1]) . "\n"; } - - + + //===================================================================================== $res_str .= "\n" . 'function grapheme_substr($string, $start, $length = -1) {}' . "\n\n"; @@ -343,7 +343,7 @@ function ut_main() array( "Abc", -4, 1, "false" ), array( "ababc", 1, 2, "ba" ), array( "ababc", 0, 10, "ababc" ), - + array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", 0, 10 , "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq" ), array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", 5, "Opq" ), array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", 5, -1, "Op" ), @@ -392,7 +392,7 @@ function ut_main() array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", -8, -7, "a" ), array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", -8, -8, "" ), array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", -8, -9, "false" ), - + ); foreach( $tests as $test ) { @@ -414,7 +414,7 @@ function ut_main() } $res_str .= " == " . urlencode($test[count($test)-1]) . check_result($result, $test[count($test)-1]) . "\n"; } - + //===================================================================================== $res_str .= "\n" . 'function grapheme_strstr($haystack, $needle, $before_needle = FALSE) {}' . "\n\n"; @@ -441,7 +441,7 @@ function ut_main() array( "ababc", "bab", TRUE, "a" ), array( "ababc", "abc", TRUE, "ab" ), array( "ababc", "abc", FALSE, "abc" ), - + array( "ab" . $char_a_ring_nfd . "c", "d", "false" ), array( "bc" . $char_a_ring_nfd . "a", "a", "a" ), array( "a" . $char_a_ring_nfd . "bc", "b", "bc" ), @@ -479,7 +479,7 @@ function ut_main() } $res_str .= " == " . urlencode($test[count($test)-1]) . check_result($result, $test[count($test)-1]) . "\n"; } - + //===================================================================================== $res_str .= "\n" . 'function grapheme_stristr($haystack, $needle, $before_needle = FALSE) {}' . "\n\n"; @@ -506,7 +506,7 @@ function ut_main() array( "aBabc", "bab", TRUE, "a" ), array( "ababc", "aBc", TRUE, "ab" ), array( "ababc", "abC", FALSE, "abc" ), - + array( "ab" . $char_a_ring_nfd . "c", "d", "false" ), array( "bc" . $char_a_ring_nfd . "A", "a", "A" ), array( "a" . $char_a_ring_nfd . "bc", "B", "bc" ), @@ -544,7 +544,7 @@ function ut_main() } $res_str .= " == " . urlencode($test[count($test)-1]) . check_result($result, $test[count($test)-1]) . "\n"; } - + //===================================================================================== $res_str .= "\n" . 'function grapheme_extract($haystack, $size, $extract_type = GRAPHEME_EXTR_COUNT, $start = 0[, $next])' . "\n\n"; @@ -635,7 +635,7 @@ function ut_main() } $res_str .= "\n"; } - + //===================================================================================== $res_str .= "\n" . 'function grapheme_extract($haystack, $size, $extract_type = GRAPHEME_EXTR_MAXBYTES, $start = 0)' . "\n\n"; @@ -693,7 +693,7 @@ function ut_main() } $res_str .= " == " . urlencode($test[count($test)-1]) . check_result($result, $test[count($test)-1]) . "\n"; } - + //===================================================================================== $res_str .= "\n" . 'function grapheme_extract($haystack, $size, $extract_type = GRAPHEME_EXTR_MAXCHARS, $start = 0)' . "\n\n"; @@ -757,10 +757,10 @@ function ut_main() } $res_str .= " == " . urlencode($test[count($test)-1]) . check_result($result, $test[count($test)-1]) . "\n"; } - - + + //===================================================================================== - + return $res_str; } diff --git a/ext/intl/tests/idn_uts46_basic.phpt b/ext/intl/tests/idn_uts46_basic.phpt index 2ca185092d..4cf349081b 100644 --- a/ext/intl/tests/idn_uts46_basic.phpt +++ b/ext/intl/tests/idn_uts46_basic.phpt @@ -14,7 +14,7 @@ $asciiNonTrans = "www.xn--fuball-cta.com"; echo "all ok, no details:", "\n"; var_dump(idn_to_ascii($utf8dn, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46)); - + echo "all ok, no details, transitional:", "\n"; var_dump(idn_to_ascii($utf8dn, 0, INTL_IDNA_VARIANT_UTS46)); diff --git a/ext/intl/tests/locale_compose_locale.phpt b/ext/intl/tests/locale_compose_locale.phpt index 2d0ca54e74..85b7257708 100644 --- a/ext/intl/tests/locale_compose_locale.phpt +++ b/ext/intl/tests/locale_compose_locale.phpt @@ -12,36 +12,36 @@ locale_compose_locale() function ut_main() { - $loc_parts_arr1 = array( + $loc_parts_arr1 = array( Locale::LANG_TAG =>'sl' , Locale::SCRIPT_TAG =>'Latn' , Locale::REGION_TAG =>'IT' ); - $loc_parts_arr2 = array( + $loc_parts_arr2 = array( Locale::LANG_TAG =>'de' , Locale::REGION_TAG =>'DE' ); - $loc_parts_arr3 = array( + $loc_parts_arr3 = array( Locale::LANG_TAG =>'hi' ); - $loc_parts_arr4 = array( + $loc_parts_arr4 = array( Locale::LANG_TAG =>'zh' , Locale::SCRIPT_TAG =>'Hans' , Locale::REGION_TAG =>'CN' ); - $loc_parts_arr5 = array( + $loc_parts_arr5 = array( Locale::LANG_TAG =>'es' , Locale::SCRIPT_TAG =>'Hans' , Locale::REGION_TAG =>'CN' ); - $loc_parts_arr6 = array( + $loc_parts_arr6 = array( Locale::LANG_TAG =>'en' , Locale::SCRIPT_TAG =>'Hans' , Locale::REGION_TAG =>'CN', Locale::VARIANT_TAG.'14' =>'rozaj' , 'variant1'=>'nedis' ); - $loc_parts_arr7 = array( + $loc_parts_arr7 = array( Locale::LANG_TAG =>'en' , Locale::SCRIPT_TAG =>'Hans' , Locale::REGION_TAG =>'CN', @@ -50,7 +50,7 @@ function ut_main() 'extlang0'=>'lng' , 'extlang1'=>'ing' ); - $loc_parts_arr8 = array( + $loc_parts_arr8 = array( Locale::LANG_TAG =>'en' , Locale::SCRIPT_TAG =>'Hans' , Locale::REGION_TAG =>'CN', @@ -61,21 +61,21 @@ function ut_main() 'private7'=>'prv1' , 'private9'=>'prv2' ); - $loc_parts_arr9 = array( + $loc_parts_arr9 = array( Locale::REGION_TAG =>'DE' ); - $loc_parts_arr10 = array( + $loc_parts_arr10 = array( Locale::LANG_TAG => 45, Locale::REGION_TAG => false, Locale::SCRIPT_TAG => 15 ); $loc_parts_arr11 = array( Locale::LANG_TAG =>'de' , - Locale::REGION_TAG =>'DE', + Locale::REGION_TAG =>'DE', 'private0' => 13, 'variant1' => array(), 'extlang2' => false - ); + ); $loc_parts_arr12 = array( Locale::LANG_TAG =>'en' , Locale::SCRIPT_TAG =>'Hans' , @@ -102,13 +102,13 @@ function ut_main() ); error_reporting( E_ERROR ); - + $cnt = 0; $res_str = ''; foreach($loc_parts_arr as $key => $value ){ $res_str .= "\n------------"; $res_str .= "\nInput Array name is : loc".(++$cnt) ; -/* +/* foreach($value as $valKey => $valValue ){ $res_str .= $valKey ."->".$valValue." " ; } diff --git a/ext/intl/tests/locale_filter_matches2.phpt b/ext/intl/tests/locale_filter_matches2.phpt index 63e4789d26..156415576e 100644 --- a/ext/intl/tests/locale_filter_matches2.phpt +++ b/ext/intl/tests/locale_filter_matches2.phpt @@ -21,7 +21,7 @@ function ut_main() 'art-lojban', 'sl_IT' ); - + $lang_tags = array( 'de-DEVA', 'de-DE-1996', @@ -48,7 +48,7 @@ function ut_main() $res_str .="--------------\n"; $result= ut_loc_locale_filter_matches( $lang_tag , $loc_range , $isCanonical); $res_str .= "loc_range:$loc_range matches lang_tag $lang_tag ? "; - if( $result){ + if( $result){ $res_str .= "YES\n"; }else{ $res_str .= "NO\n"; @@ -58,7 +58,7 @@ function ut_main() $can_loc_range = ut_loc_canonicalize($loc_range); $can_lang_tag = ut_loc_canonicalize($lang_tag); $res_str .= "loc_range:$can_loc_range canonically matches lang_tag $can_lang_tag ? "; - if( $result){ + if( $result){ $res_str .= "YES\n"; }else{ $res_str .= "NO\n"; diff --git a/ext/intl/tests/locale_filter_matches3.phpt b/ext/intl/tests/locale_filter_matches3.phpt index 4c1d4d3898..2d27de9346 100644 --- a/ext/intl/tests/locale_filter_matches3.phpt +++ b/ext/intl/tests/locale_filter_matches3.phpt @@ -21,7 +21,7 @@ function ut_main() 'art-lojban', 'sl_IT' ); - + $lang_tags = array( 'de-DEVA', 'de-DE-1996', @@ -48,7 +48,7 @@ function ut_main() $res_str .="--------------\n"; $result= ut_loc_locale_filter_matches( $lang_tag , $loc_range , $isCanonical); $res_str .= "loc_range:$loc_range matches lang_tag $lang_tag ? "; - if( $result){ + if( $result){ $res_str .= "YES\n"; }else{ $res_str .= "NO\n"; @@ -58,7 +58,7 @@ function ut_main() $can_loc_range = ut_loc_canonicalize($loc_range); $can_lang_tag = ut_loc_canonicalize($lang_tag); $res_str .= "loc_range:$can_loc_range canonically matches lang_tag $can_lang_tag ? "; - if( $result){ + if( $result){ $res_str .= "YES\n"; }else{ $res_str .= "NO\n"; diff --git a/ext/intl/tests/locale_get_all_variants.phpt b/ext/intl/tests/locale_get_all_variants.phpt index 864b8a2e1a..09362e13dd 100644 --- a/ext/intl/tests/locale_get_all_variants.phpt +++ b/ext/intl/tests/locale_get_all_variants.phpt @@ -24,7 +24,7 @@ function ut_main() 'sgn-BE-nl', 'sgn-CH-de', 'sl_IT_rozaj@currency=EUR' - ); + ); $res_str = ''; foreach($locales as $locale){ $variants_arr = ut_loc_locale_get_all_variants( $locale); diff --git a/ext/intl/tests/locale_get_default.phpt b/ext/intl/tests/locale_get_default.phpt index 57c46ccd2b..6bb5a9a86b 100644 --- a/ext/intl/tests/locale_get_default.phpt +++ b/ext/intl/tests/locale_get_default.phpt @@ -15,7 +15,7 @@ intl.default_locale=en-US function ut_main() { $res_str = ''; - + $lang = ut_loc_get_default() ; $res_str .= "Default locale: $lang"; $res_str .= "\n"; diff --git a/ext/intl/tests/locale_get_display_language.phpt b/ext/intl/tests/locale_get_display_language.phpt index 2e00056284..35d7532d6b 100644 --- a/ext/intl/tests/locale_get_display_language.phpt +++ b/ext/intl/tests/locale_get_display_language.phpt @@ -80,7 +80,7 @@ function ut_main() $scr = ut_loc_get_display_language( $locale ,$disp_locale ); $res_str .= "disp_locale=$disp_locale : display_language=$scr"; $res_str .= "\n"; - } + } $res_str .= "-----------------\n"; } diff --git a/ext/intl/tests/locale_get_display_name2.phpt b/ext/intl/tests/locale_get_display_name2.phpt index 59455a6863..313e89b3c0 100644 --- a/ext/intl/tests/locale_get_display_name2.phpt +++ b/ext/intl/tests/locale_get_display_name2.phpt @@ -89,10 +89,10 @@ function ut_main() foreach( $disp_locales as $disp_locale ) { $scr = ut_loc_get_display_name( $locale ,$disp_locale ); - $scr = str_replace(array('(', ')'), '#', $scr); + $scr = str_replace(array('(', ')'), '#', $scr); $res_str .= "disp_locale=$disp_locale : display_name=$scr"; $res_str .= "\n"; - } + } $res_str .= "-----------------\n"; } diff --git a/ext/intl/tests/locale_get_display_name3.phpt b/ext/intl/tests/locale_get_display_name3.phpt index 0340f14b2c..2052a6d456 100644 --- a/ext/intl/tests/locale_get_display_name3.phpt +++ b/ext/intl/tests/locale_get_display_name3.phpt @@ -89,10 +89,10 @@ function ut_main() foreach( $disp_locales as $disp_locale ) { $scr = ut_loc_get_display_name( $locale ,$disp_locale ); - $scr = str_replace(array('(', ')'), '#', $scr); + $scr = str_replace(array('(', ')'), '#', $scr); $res_str .= "disp_locale=$disp_locale : display_name=$scr"; $res_str .= "\n"; - } + } $res_str .= "-----------------\n"; } diff --git a/ext/intl/tests/locale_get_display_name4.phpt b/ext/intl/tests/locale_get_display_name4.phpt index 4b3255c0f6..a0b40a4114 100644 --- a/ext/intl/tests/locale_get_display_name4.phpt +++ b/ext/intl/tests/locale_get_display_name4.phpt @@ -90,10 +90,10 @@ function ut_main() foreach( $disp_locales as $disp_locale ) { $scr = ut_loc_get_display_name( $locale ,$disp_locale ); - $scr = str_replace(array('(', ')'), '#', $scr); + $scr = str_replace(array('(', ')'), '#', $scr); $res_str .= "disp_locale=$disp_locale : display_name=$scr"; $res_str .= "\n"; - } + } $res_str .= "-----------------\n"; } diff --git a/ext/intl/tests/locale_get_display_name5.phpt b/ext/intl/tests/locale_get_display_name5.phpt index b633b1f62c..99263190ac 100644 --- a/ext/intl/tests/locale_get_display_name5.phpt +++ b/ext/intl/tests/locale_get_display_name5.phpt @@ -89,10 +89,10 @@ function ut_main() foreach( $disp_locales as $disp_locale ) { $scr = ut_loc_get_display_name( $locale ,$disp_locale ); - $scr = str_replace(array('(', ')'), '#', $scr); + $scr = str_replace(array('(', ')'), '#', $scr); $res_str .= "disp_locale=$disp_locale : display_name=$scr"; $res_str .= "\n"; - } + } $res_str .= "-----------------\n"; } diff --git a/ext/intl/tests/locale_lookup.phpt b/ext/intl/tests/locale_lookup.phpt index ff8aab049d..1d52e8049f 100644 --- a/ext/intl/tests/locale_lookup.phpt +++ b/ext/intl/tests/locale_lookup.phpt @@ -20,7 +20,7 @@ function ut_main() 'jbo', 'art-lojban' ); - + $lang_tags = array( 'de-DEVA', 'de-DE-1996', diff --git a/ext/intl/tests/locale_lookup_variant2.phpt b/ext/intl/tests/locale_lookup_variant2.phpt index 4715951e9a..c25e614205 100644 --- a/ext/intl/tests/locale_lookup_variant2.phpt +++ b/ext/intl/tests/locale_lookup_variant2.phpt @@ -20,7 +20,7 @@ function ut_main() 'jbo', 'art-lojban' ); - + $lang_tags = array( 'de-DEVA', 'de-DE-1996', diff --git a/ext/intl/tests/msgfmt_fail2.phpt b/ext/intl/tests/msgfmt_fail2.phpt index aabb558fe0..0016de4bb7 100644 --- a/ext/intl/tests/msgfmt_fail2.phpt +++ b/ext/intl/tests/msgfmt_fail2.phpt @@ -50,9 +50,9 @@ try { print_exception($e); $fmt = null; } -err($fmt); +err($fmt); $fmt = msgfmt_create(); -err($fmt); +err($fmt); $fmt = MessageFormatter::create(); err($fmt); try { @@ -61,11 +61,11 @@ try { print_exception($e); $fmt = null; } -err($fmt); +err($fmt); $fmt = msgfmt_create('en'); -err($fmt); +err($fmt); $fmt = MessageFormatter::create('en'); -err($fmt); +err($fmt); foreach($args as $arg) { $fmt = crt("O", $arg[0], $arg[1]); diff --git a/ext/intl/tests/msgfmt_format.phpt b/ext/intl/tests/msgfmt_format.phpt index c1bf5e9db6..19581e9698 100644 --- a/ext/intl/tests/msgfmt_format.phpt +++ b/ext/intl/tests/msgfmt_format.phpt @@ -15,16 +15,16 @@ function ut_main() $locales = array( 'en_US' => "{0,number,integer} monkeys on {1,number,integer} trees make {2,number} monkeys per tree", 'ru_UA' => "{0,number,integer} мавп на {1,number,integer} деревах це {2,number} мавпи на кожному деревi", - 'de' => "{0,number,integer} Affen über {1,number,integer} Bäume um {2,number} Affen pro Baum", - 'en_UK' => "{0,number,integer} monkeys on {1,number,integer} trees make {2,number} monkeys per tree", + 'de' => "{0,number,integer} Affen über {1,number,integer} Bäume um {2,number} Affen pro Baum", + 'en_UK' => "{0,number,integer} monkeys on {1,number,integer} trees make {2,number} monkeys per tree", 'root' => '{0,whatever} would not work!', 'fr' => "C'est la vie!", - ); + ); $str_res = ''; $m = 4560; $t = 123; - + foreach( $locales as $locale => $pattern ) { $str_res .= "\nLocale is: $locale\n"; diff --git a/ext/intl/tests/msgfmt_format_mixed_params.phpt b/ext/intl/tests/msgfmt_format_mixed_params.phpt index 3ab7688b55..3a94e095e2 100644 --- a/ext/intl/tests/msgfmt_format_mixed_params.phpt +++ b/ext/intl/tests/msgfmt_format_mixed_params.phpt @@ -11,7 +11,7 @@ ini_set("intl.error_level", E_WARNING); $mf = new MessageFormatter('en_US', "{0,number} -- {foo,ordinal}"); - + var_dump($mf->format(array(2.3, "foo" => 1.3))); var_dump($mf->format(array("foo" => 1.3, 0 => 2.3))); 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 ed1ea88e46..34d45776b6 100644 --- a/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt +++ b/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt @@ -23,7 +23,7 @@ $mf = new MessageFormatter('en_US'," ordinal {i,ordinal} duration {j,duration} "); - + $ex = "1336317965.5 str"; var_dump($mf->format(array( 'a' => $ex, diff --git a/ext/intl/tests/msgfmt_get_set_pattern.phpt b/ext/intl/tests/msgfmt_get_set_pattern.phpt index 67b1aca459..7d7ab83e09 100644 --- a/ext/intl/tests/msgfmt_get_set_pattern.phpt +++ b/ext/intl/tests/msgfmt_get_set_pattern.phpt @@ -35,7 +35,7 @@ function ut_main() ut_msgfmt_set_pattern($fmt, str_repeat($pattern, 10)); $res_str .= "New pattern: '" . ut_msgfmt_get_pattern( $fmt ) . "'\n"; $res_str .= "Formatted message: " . ut_msgfmt_format( $fmt, array(123, 456) ) . "\n"; - + return $res_str; } diff --git a/ext/intl/tests/msgfmt_parse.phpt b/ext/intl/tests/msgfmt_parse.phpt index b9ec36374b..95645a63a0 100644 --- a/ext/intl/tests/msgfmt_parse.phpt +++ b/ext/intl/tests/msgfmt_parse.phpt @@ -15,12 +15,12 @@ function ut_main() $locales = array( 'en_US' => "{0,number,integer} monkeys on {1,number,integer} trees make {2,number} monkeys per tree", 'ru_UA' => "{0,number,integer} мавп на {1,number,integer} деревах це {2,number} мавпи на кожному деревi", - 'de' => "{0,number,integer} Affen über {1,number,integer} Bäume um {2,number} Affen pro Baum", - 'en_UK' => "{0,number,integer} monkeys on {1,number,integer} trees make {2,number} monkeys per tree", + 'de' => "{0,number,integer} Affen über {1,number,integer} Bäume um {2,number} Affen pro Baum", + 'en_UK' => "{0,number,integer} monkeys on {1,number,integer} trees make {2,number} monkeys per tree", 'root' => '{0,whatever} would not work!', 'fr' => 'C\'est {0,number,integer}', ); - + $results = array( 'en_US' => "4,560 monkeys on 123 trees make 37.073 monkeys per tree", 'ru_UA' => "4 560 мавп на 123 деревах це 37,073 мавпи на кожному деревi", @@ -28,11 +28,11 @@ function ut_main() 'en_UK' => "4,560 monkeys on 123 trees make 37.073 monkeys per tree", 'root' => "4,560 monkeys on 123 trees make 37.073 monkeys per tree", 'fr' => "C'est 42", - + ); $str_res = ''; - + foreach( $locales as $locale => $pattern ) { $str_res .= "\nLocale is: $locale\n"; diff --git a/ext/intl/tests/msgfmt_setPattern_cache.phpt b/ext/intl/tests/msgfmt_setPattern_cache.phpt index 35ec463c2a..995eee6f2e 100644 --- a/ext/intl/tests/msgfmt_setPattern_cache.phpt +++ b/ext/intl/tests/msgfmt_setPattern_cache.phpt @@ -11,7 +11,7 @@ ini_set("intl.error_level", E_WARNING); $mf = new MessageFormatter('en_US', "{0,number} -- {1,ordinal}"); - + var_dump($mf->format(array(1.3, 1.3))); var_dump($mf->format(array(1.3, 1.3))); $mf->setPattern("{0,ordinal} -- {1,number}"); diff --git a/ext/intl/tests/normalizer_get_raw_decomposition.phpt b/ext/intl/tests/normalizer_get_raw_decomposition.phpt index 7a374a9e61..6e393cdd08 100644 --- a/ext/intl/tests/normalizer_get_raw_decomposition.phpt +++ b/ext/intl/tests/normalizer_get_raw_decomposition.phpt @@ -22,15 +22,15 @@ function ut_main() "aa", "\xF5", ]; - + foreach ($strings as $string) { $decomposition = ut_norm_get_raw_decomposition($string, Normalizer::FORM_KC); $error_code = intl_get_error_code(); $error_message = intl_get_error_message(); - + $string_hex = bin2hex($string); $result .= "---------------------\n"; - + if ($decomposition === null) { $result .= "'$string_hex' has no decomposition mapping\n" ; } else { diff --git a/ext/intl/tests/normalizer_normalize.phpt b/ext/intl/tests/normalizer_normalize.phpt index 5baa390767..8070677bf3 100644 --- a/ext/intl/tests/normalizer_normalize.phpt +++ b/ext/intl/tests/normalizer_normalize.phpt @@ -39,7 +39,7 @@ function ut_main() $res_str .= "Invalid normalization form declarations!\n"; } - + $char_a_diaeresis = "\xC3\xA4"; // 'LATIN SMALL LETTER A WITH DIAERESIS' (U+00E4) $char_a_ring = "\xC3\xA5"; // 'LATIN SMALL LETTER A WITH RING ABOVE' (U+00E5) $char_o_diaeresis = "\xC3\xB6"; // 'LATIN SMALL LETTER O WITH DIAERESIS' (U+00F6) @@ -55,7 +55,7 @@ function ut_main() $char_fi_ligature = "\xEF\xAC\x81"; // 'LATIN SMALL LIGATURE FI' (U+FB01) $char_long_s_dot = "\xE1\xBA\x9B"; // 'LATIN SMALL LETTER LONG S WITH DOT ABOVE' (U+1E9B) - + $strs = array( 'ABC', $char_a_diaeresis . '||' . $char_a_ring . '||' . $char_o_diaeresis, @@ -64,7 +64,7 @@ function ut_main() $char_fi_ligature, $char_long_s_dot, ); - + foreach( $forms as $form ) { foreach( $strs as $str ) @@ -83,12 +83,12 @@ function ut_main() $res_str .= "'$str_hex' normalized to form '{$forms_str[$form]}' is '$str_norm_hex'" . "\terror info: '$error_message' ($error_code)\n" . ""; - + $is_norm = ut_norm_is_normalized( $str, $form ); $error_code = intl_get_error_code(); $error_message = intl_get_error_message(); - $res_str .= " is in form '{$forms_str[$form]}'? = " . ($is_norm ? "yes" : "no") + $res_str .= " is in form '{$forms_str[$form]}'? = " . ($is_norm ? "yes" : "no") . "\terror info: '$error_message' ($error_code)\n" . ""; } diff --git a/ext/intl/tests/normalizer_normalize_kc_cf.phpt b/ext/intl/tests/normalizer_normalize_kc_cf.phpt index a4e478cc4e..43b8afbfb5 100644 --- a/ext/intl/tests/normalizer_normalize_kc_cf.phpt +++ b/ext/intl/tests/normalizer_normalize_kc_cf.phpt @@ -27,7 +27,7 @@ function ut_main() if (Normalizer::FORM_C != Normalizer::NFC) { $res_str .= "Invalid normalization form declarations!\n"; } - + $char_a_diaeresis = "\xC3\xA4"; // 'LATIN SMALL LETTER A WITH DIAERESIS' (U+00E4) $char_a_ring = "\xC3\xA5"; // 'LATIN SMALL LETTER A WITH RING ABOVE' (U+00E5) $char_o_diaeresis = "\xC3\xB6"; // 'LATIN SMALL LETTER O WITH DIAERESIS' (U+00F6) @@ -43,7 +43,7 @@ function ut_main() $char_fi_ligature = "\xEF\xAC\x81"; // 'LATIN SMALL LIGATURE FI' (U+FB01) $char_long_s_dot = "\xE1\xBA\x9B"; // 'LATIN SMALL LETTER LONG S WITH DOT ABOVE' (U+1E9B) - + $strs = array( 'ABC', 'abc', @@ -53,7 +53,7 @@ function ut_main() $char_fi_ligature, $char_long_s_dot, ); - + foreach( $forms as $form ) { foreach( $strs as $str ) @@ -72,12 +72,12 @@ function ut_main() $res_str .= "'$str_hex' normalized to form '{$forms_str[$form]}' is '$str_norm_hex'" . "\terror info: '$error_message' ($error_code)\n" . ""; - + $is_norm = ut_norm_is_normalized( $str, $form ); $error_code = intl_get_error_code(); $error_message = intl_get_error_message(); - $res_str .= " is in form '{$forms_str[$form]}'? = " . ($is_norm ? "yes" : "no") + $res_str .= " is in form '{$forms_str[$form]}'? = " . ($is_norm ? "yes" : "no") . "\terror info: '$error_message' ($error_code)\n" . ""; } diff --git a/ext/intl/tests/resourcebundle_create.phpt b/ext/intl/tests/resourcebundle_create.phpt index 9d551219ec..09bad4fddf 100644 --- a/ext/intl/tests/resourcebundle_create.phpt +++ b/ext/intl/tests/resourcebundle_create.phpt @@ -4,7 +4,7 @@ Test ResourceBundle::__construct() - existing/missing bundles/locales <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?> --FILE-- <?php - + include "resourcebundle.inc"; function ut_main() { @@ -31,7 +31,7 @@ function ut_main() { // missing $r3 = ut_resourcebundle_create( 'en_US', 'nonexisting' ); $str_res .= debug( $r3 ); - + return $str_res; } diff --git a/ext/intl/tests/resourcebundle_individual.phpt b/ext/intl/tests/resourcebundle_individual.phpt index dcbf1f5831..0fb512f8e5 100644 --- a/ext/intl/tests/resourcebundle_individual.phpt +++ b/ext/intl/tests/resourcebundle_individual.phpt @@ -27,7 +27,7 @@ function ut_main() { $t = ut_resourcebundle_get( $r, 'nonexisting' ); $str_res .= debug( $t ); - + return $str_res; } include_once( 'ut_common.inc' ); diff --git a/ext/intl/tests/resourcebundle_locales.phpt b/ext/intl/tests/resourcebundle_locales.phpt index e14a7e5aa1..c744e63193 100644 --- a/ext/intl/tests/resourcebundle_locales.phpt +++ b/ext/intl/tests/resourcebundle_locales.phpt @@ -4,14 +4,14 @@ Test ResourceBundle::getLocales <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?> --FILE-- <?php - + include "resourcebundle.inc"; function ut_main() { $str_res = ''; $str_res .= join("\n", ut_resourcebundle_locales(BUNDLE)); - + return $str_res; } diff --git a/ext/intl/tests/timezone_getOffset_basic.phpt b/ext/intl/tests/timezone_getOffset_basic.phpt index 582d45cad9..403bf8fc35 100644 --- a/ext/intl/tests/timezone_getOffset_basic.phpt +++ b/ext/intl/tests/timezone_getOffset_basic.phpt @@ -17,7 +17,7 @@ var_dump($ams->getOffset($date *1000., true, $rawOffset, $dstOffset), $rawOffset, $dstOffset); $lsb = IntlTimeZone::createTimeZone('Europe/Lisbon'); - + var_dump(intltz_get_offset($lsb, $date *1000., true, $rawOffset, $dstOffset), $rawOffset, $dstOffset); diff --git a/ext/json/tests/002.phpt b/ext/json/tests/002.phpt index 48ecdc5d7b..e0f4bedde6 100644 --- a/ext/json/tests/002.phpt +++ b/ext/json/tests/002.phpt @@ -22,7 +22,7 @@ var_dump(json_encode("руссиш")); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(2) """" string(4) "null" string(4) "true" diff --git a/ext/json/tests/003.phpt b/ext/json/tests/003.phpt index b7a215cee7..3248689bf9 100644 --- a/ext/json/tests/003.phpt +++ b/ext/json/tests/003.phpt @@ -22,7 +22,7 @@ var_dump(json_last_error(), json_last_error_msg()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(1) { [0]=> &array(1) { diff --git a/ext/json/tests/004.phpt b/ext/json/tests/004.phpt index 040973c9f3..f712ffd38b 100644 --- a/ext/json/tests/004.phpt +++ b/ext/json/tests/004.phpt @@ -22,7 +22,7 @@ var_dump(json_last_error(), json_last_error_msg()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- object(stdClass)#%d (1) { ["prop"]=> *RECURSION* diff --git a/ext/json/tests/bug41403.phpt b/ext/json/tests/bug41403.phpt index f3af6b92ce..685c831838 100644 --- a/ext/json/tests/bug41403.phpt +++ b/ext/json/tests/bug41403.phpt @@ -2,7 +2,7 @@ Bug #41403 (json_decode cannot decode floats if localeconv decimal_point is not '.') --SKIPIF-- <?php -if (!extension_loaded('json')) die('skip'); +if (!extension_loaded('json')) die('skip'); if (setlocale(LC_NUMERIC, "de_DE") === false) { die("skip no de_DE locale"); } @@ -20,7 +20,7 @@ var_dump(json_decode('[123,13452345]')); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(1) { [0]=> float(2,1) diff --git a/ext/json/tests/bug41504.phpt b/ext/json/tests/bug41504.phpt index bef497404f..2724f1690b 100644 --- a/ext/json/tests/bug41504.phpt +++ b/ext/json/tests/bug41504.phpt @@ -11,7 +11,7 @@ var_dump(json_decode('{"key":"value", "":"value"}', true)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(1) { [""]=> string(5) "value" diff --git a/ext/json/tests/bug41567.phpt b/ext/json/tests/bug41567.phpt index a2db6fe290..05d8ca438b 100644 --- a/ext/json/tests/bug41567.phpt +++ b/ext/json/tests/bug41567.phpt @@ -12,6 +12,6 @@ var_dump(json_decode($a)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- float(123456789.12345) Done diff --git a/ext/json/tests/bug47644.phpt b/ext/json/tests/bug47644.phpt index 85c4858af5..c8650958e8 100644 --- a/ext/json/tests/bug47644.phpt +++ b/ext/json/tests/bug47644.phpt @@ -15,7 +15,7 @@ for ($i = 10000000000000000; $i < 10000000000000006; $i++) { echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(1) { [0]=> int(10000000000000000) diff --git a/ext/json/tests/bug69187.phpt b/ext/json/tests/bug69187.phpt index d39dbe522d..00fdbd46fd 100644 --- a/ext/json/tests/bug69187.phpt +++ b/ext/json/tests/bug69187.phpt @@ -4,7 +4,7 @@ Bug #69187 json_last_error return BC in PHP7 <?php if (!extension_loaded("json")) print "skip"; ?> --FILE-- <?php -var_dump(json_decode(NULL)); +var_dump(json_decode(NULL)); var_dump(json_last_error()); var_dump(json_decode(FALSE)); var_dump(json_last_error()); diff --git a/ext/json/tests/fail001.phpt b/ext/json/tests/fail001.phpt index ea203746a6..47c2e65487 100644 --- a/ext/json/tests/fail001.phpt +++ b/ext/json/tests/fail001.phpt @@ -6,7 +6,7 @@ JSON (http://www.crockford.com/JSON/JSON_checker/test/fail*.json) ?> --FILE-- <?php - + $tests = array( '"A JSON payload should be an object or array, not a string."', '["Unclosed array"', diff --git a/ext/json/tests/json_decode_basic.phpt b/ext/json/tests/json_decode_basic.phpt index 0bc939c257..d1169eb777 100644 --- a/ext/json/tests/json_decode_basic.phpt +++ b/ext/json/tests/json_decode_basic.phpt @@ -27,7 +27,7 @@ $inputs = array ( '{"Jan":31,"Feb":29,"Mar":31,"April":30,"May":31,"June":30}', '""', '{}' -); +); // loop through with each element of the $inputs array to test json_decode() function $count = 1; @@ -40,7 +40,7 @@ foreach($inputs as $input) { ?> ===Done=== ---EXPECTF-- +--EXPECTF-- *** Testing json_decode() : basic functionality *** -- Iteration 1 -- int(0) diff --git a/ext/json/tests/json_encode_basic.phpt b/ext/json/tests/json_encode_basic.phpt index 265d67299c..119c04f106 100644 --- a/ext/json/tests/json_encode_basic.phpt +++ b/ext/json/tests/json_encode_basic.phpt @@ -37,7 +37,7 @@ $inputs = array ( 123.456, 1.23E3, -1.23E3, - + // boolean TRUE, true, @@ -47,7 +47,7 @@ $inputs = array ( // NULL NULL, null, - + // strings "abc", 'abc', @@ -74,8 +74,8 @@ $inputs = array ( // object variable $obj - -); + +); // loop through with each element of the $inputs array to test json_encode() function $count = 1; @@ -87,7 +87,7 @@ foreach($inputs as $input) { ?> ===Done=== ---EXPECT-- +--EXPECT-- *** Testing json_encode() : basic functionality *** -- Iteration 1 -- string(1) "0" diff --git a/ext/json/tests/json_encode_basic_utf8.phpt b/ext/json/tests/json_encode_basic_utf8.phpt index 7330a56a2a..ac5000d9fd 100644 --- a/ext/json/tests/json_encode_basic_utf8.phpt +++ b/ext/json/tests/json_encode_basic_utf8.phpt @@ -7,11 +7,11 @@ Test json_encode() function : basic functionality with UTF8 string input echo "*** Testing json_encode() : basic functionality with UTF-8 input***\n"; $utf8_string = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); -var_dump(json_encode($utf8_string)); +var_dump(json_encode($utf8_string)); ?> ===Done=== ---EXPECT-- +--EXPECT-- *** Testing json_encode() : basic functionality with UTF-8 input*** string(103) ""\u65e5\u672c\u8a9e\u30c6\u30ad\u30b9\u30c8\u3067\u3059\u300201234\uff15\uff16\uff17\uff18\uff19\u3002"" ===Done=== diff --git a/ext/json/tests/pass002.phpt b/ext/json/tests/pass002.phpt index aa61cf5396..1d375ad3cf 100644 --- a/ext/json/tests/pass002.phpt +++ b/ext/json/tests/pass002.phpt @@ -4,7 +4,7 @@ JSON (http://www.crockford.com/JSON/JSON_checker/test/pass2.json) <?php if (!extension_loaded("json")) print "skip"; ?> --FILE-- <?php - + $test = '[[[[[[[[[[[[[[[[[[["Not too deep"]]]]]]]]]]]]]]]]]]]'; echo 'Testing: ' . $test . "\n"; echo "DECODE: AS OBJECT\n"; diff --git a/ext/json/tests/pass003.phpt b/ext/json/tests/pass003.phpt index bdfbaf298c..6afbf2d927 100644 --- a/ext/json/tests/pass003.phpt +++ b/ext/json/tests/pass003.phpt @@ -4,7 +4,7 @@ JSON (http://www.crockford.com/JSON/JSON_checker/test/pass3.json) <?php if (!extension_loaded("json")) print "skip"; ?> --FILE-- <?php - + $test = ' { "JSON Test Pattern pass3": { diff --git a/ext/ldap/tests/bug76248.phpt b/ext/ldap/tests/bug76248.phpt index 45a7f83efb..21bb4fa31d 100644 --- a/ext/ldap/tests/bug76248.phpt +++ b/ext/ldap/tests/bug76248.phpt @@ -14,14 +14,14 @@ if ($pid == 0) { $server = stream_socket_server("tcp://127.0.0.1:12345"); $socket = stream_socket_accept($server, 3); fwrite($socket, base64_decode("MAwCAQFhBwoBAAQABAAweQIBAmR0BJljbj1yb290LGRjPWV4YW1wbGUsZGM9Y29tMFcwIwQLb2JqZWN0Q2xhc3MxFAQSb3JnYW5pemF0aW9uYWxSb2xlMAwEAmNuMQYEBHJvb3QwIgQLZGVzY3JpcHRpb24xEwQRRGlyZWN0b3J5IE1hbmFnZXIwDAIBAmUHCgEABAAEADB5AgEDZHQEmWNuPXJvb3QsZGM9ZXhhbXBsZSxkYz1jb20wVzAjBAtvYmplY3RDbGFzczEUBBJvcmdhbml6YXRpb25hbFJvbGUwDAQCY24xBgQEcm9vdDAiBAtkZXNjcmlwdGlvbjETBBFEaXJlY3RvcnkgTWFuYWdlcjAMAgEDZQcKAQAEAAQA")); - fflush($socket); + fflush($socket); } else { // parent $ds = ldap_connect("127.0.0.1", PORT); ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3); $b = ldap_bind($ds, "cn=root,dc=example,dc=com", "secret"); - $s = ldap_search($ds, "dc=example,dc=com", "(cn=root)"); + $s = ldap_search($ds, "dc=example,dc=com", "(cn=root)"); $tt = ldap_get_entries($ds, $s); var_dump($tt); } diff --git a/ext/ldap/tests/ldap_unbind_variation.phpt b/ext/ldap/tests/ldap_unbind_variation.phpt index 377018c583..60edb03b68 100644 --- a/ext/ldap/tests/ldap_unbind_variation.phpt +++ b/ext/ldap/tests/ldap_unbind_variation.phpt @@ -14,10 +14,10 @@ function rebind_proc ($ds, $ldap_url) { global $user; global $passwd; global $protocol_version; - + // required by most modern LDAP servers, use LDAPv3 ldap_set_option($a, LDAP_OPT_PROTOCOL_VERSION, $protocol_version); - + if (!ldap_bind($a, $user, $passwd)) { print "Cannot bind"; } diff --git a/ext/libxml/tests/bug61367-write.phpt b/ext/libxml/tests/bug61367-write.phpt index 63e99a8e50..155c9aba9d 100644 --- a/ext/libxml/tests/bug61367-write.phpt +++ b/ext/libxml/tests/bug61367-write.phpt @@ -10,7 +10,7 @@ open_basedir=. class StreamExploiter { public function stream_close ( ) { $doc = new DOMDocument; - $doc->appendChild($doc->createTextNode('hello')); + $doc->appendChild($doc->createTextNode('hello')); var_dump($doc->save(dirname(getcwd()) . '/bad')); } diff --git a/ext/mbstring/tests/bug43994.phpt b/ext/mbstring/tests/bug43994.phpt index b2fd867da9..2e8631d8de 100644 --- a/ext/mbstring/tests/bug43994.phpt +++ b/ext/mbstring/tests/bug43994.phpt @@ -38,7 +38,7 @@ foreach($inputs as $input) { }; ?> ---EXPECTF-- +--EXPECTF-- -- Iteration 1 -- Without $regs arg: diff --git a/ext/mbstring/tests/bug69079.phpt b/ext/mbstring/tests/bug69079.phpt index 65b1fd45a5..287b577ce4 100644 --- a/ext/mbstring/tests/bug69079.phpt +++ b/ext/mbstring/tests/bug69079.phpt @@ -7,7 +7,7 @@ Bug #69079 (enhancement for mb_substitute_character) mb_internal_encoding('UTF-8'); var_dump(mb_substitute_character(0x1F600)); -var_dump(bin2hex(mb_scrub("\xff"))); +var_dump(bin2hex(mb_scrub("\xff"))); mb_substitute_character(0x3f); // Reset to '?', as the next call will fail var_dump(mb_substitute_character(0xD800)); // Surrogate (illegal) var_dump(bin2hex(mb_scrub("\xff"))); diff --git a/ext/mbstring/tests/htmlent.phpt b/ext/mbstring/tests/htmlent.phpt index 5af96c7c41..21d827efd4 100644 --- a/ext/mbstring/tests/htmlent.phpt +++ b/ext/mbstring/tests/htmlent.phpt @@ -1,9 +1,9 @@ --TEST-- HTML input/output --SKIPIF-- -<?php - ini_set('include_path', dirname(__FILE__)); - extension_loaded('mbstring') or die('skip mbstring not available'); +<?php + ini_set('include_path', dirname(__FILE__)); + extension_loaded('mbstring') or die('skip mbstring not available'); ?> --INI-- output_buffering=4096 diff --git a/ext/mbstring/tests/mb_convert_encoding_variation1.phpt b/ext/mbstring/tests/mb_convert_encoding_variation1.phpt index c8d2114380..d8969c2e1f 100644 --- a/ext/mbstring/tests/mb_convert_encoding_variation1.phpt +++ b/ext/mbstring/tests/mb_convert_encoding_variation1.phpt @@ -68,7 +68,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -77,7 +77,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt b/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt index 5374c31c15..923ca64cf9 100644 --- a/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt +++ b/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt @@ -10,7 +10,7 @@ function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is n /* Prototype : string mb_decode_mimeheader(string string) * Description: Decodes the MIME "encoded-word" in the string * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_decode_mimeheader() : basic functionality ***\n"; diff --git a/ext/mbstring/tests/mb_decode_mimeheader_error.phpt b/ext/mbstring/tests/mb_decode_mimeheader_error.phpt index c40cdbd643..e534d5942a 100644 --- a/ext/mbstring/tests/mb_decode_mimeheader_error.phpt +++ b/ext/mbstring/tests/mb_decode_mimeheader_error.phpt @@ -10,7 +10,7 @@ function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is n /* Prototype : string mb_decode_mimeheader(string string) * Description: Decodes the MIME "encoded-word" in the string * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_decode_mimeheader() : error conditions ***\n"; diff --git a/ext/mbstring/tests/mb_decode_mimeheader_variation1.phpt b/ext/mbstring/tests/mb_decode_mimeheader_variation1.phpt index e07ccad998..b4e4d1e843 100644 --- a/ext/mbstring/tests/mb_decode_mimeheader_variation1.phpt +++ b/ext/mbstring/tests/mb_decode_mimeheader_variation1.phpt @@ -12,7 +12,7 @@ function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is n /* Prototype : string mb_decode_mimeheader(string string) * Description: Decodes the MIME "encoded-word" in the string * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_decode_mimeheader() : usage variation ***\n"; @@ -101,7 +101,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable 'resource' => $fp ); diff --git a/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt b/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt index 7527c9aa5a..ca5b6d7b69 100644 --- a/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt +++ b/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt @@ -10,7 +10,7 @@ function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is n /* Prototype : string mb_decode_mimeheader(string string) * Description: Decodes the MIME "encoded-word" in the string * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_decode_mimeheader() : variation ***\n"; @@ -33,7 +33,7 @@ $encoded_words = array( "=?EUC-JP?Q?=C6=FC=CB=DC=B8=EC=A5=C6=A5=AD=A5=B9=A5=C8=A4=C7=A4=B9=A1=A3?= =?EUC-JP?Q?=30=31=32=33=34=A3=B5=A3=B6=A3=B7=A3=B8=A3=B9=A1=A3?=" ); - + foreach ($encoded_words as $word) { var_dump(bin2hex(mb_decode_mimeheader($word))); } diff --git a/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt b/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt index 968e76eaf6..dded058d11 100644 --- a/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt +++ b/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt @@ -10,7 +10,7 @@ function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is n /* Prototype : string mb_decode_mimeheader(string string) * Description: Decodes the MIME "encoded-word" in the string * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_decode_mimeheader() : variation ***\n"; diff --git a/ext/mbstring/tests/mb_detect_order.phpt b/ext/mbstring/tests/mb_detect_order.phpt index 382691cfc8..8c6ee3eb5e 100644 --- a/ext/mbstring/tests/mb_detect_order.phpt +++ b/ext/mbstring/tests/mb_detect_order.phpt @@ -1,5 +1,5 @@ --TEST-- -mb_detect_order() +mb_detect_order() --SKIPIF-- <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?> --INI-- diff --git a/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt b/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt index 11fe23f531..dd276485fd 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt @@ -30,7 +30,7 @@ $linefeed = "\r\n"; for ($i = 0; $i < 100; $i++) { echo "\n-- Iteration $i --\n"; var_dump( mb_encode_mimeheader($str, $charset, "B", $linefeed, $i)); - var_dump( mb_encode_mimeheader($str, $charset, "Q", $linefeed, $i)); + var_dump( mb_encode_mimeheader($str, $charset, "Q", $linefeed, $i)); }; echo "Done"; ?> diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt index 7b5bd30661..a0c412082d 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt @@ -70,7 +70,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -79,7 +79,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt index e765e94388..0dc6139271 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt @@ -72,7 +72,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -81,7 +81,7 @@ $inputs = array( /*18*/ "utf-8", 'utf-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt index c2976f5d00..37d0c6433d 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt @@ -72,7 +72,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -81,7 +81,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt index fe050840ef..0873d809c5 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt @@ -73,7 +73,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -82,7 +82,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt index 66014fa8a5..ea581f39a7 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt @@ -73,7 +73,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -82,7 +82,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_ereg1.phpt b/ext/mbstring/tests/mb_ereg1.phpt index c61cdb6da2..59ef788a77 100644 --- a/ext/mbstring/tests/mb_ereg1.phpt +++ b/ext/mbstring/tests/mb_ereg1.phpt @@ -19,7 +19,7 @@ foreach ($a as $args) { } ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(false) array(3) { [0]=> diff --git a/ext/mbstring/tests/mb_ereg2.phpt b/ext/mbstring/tests/mb_ereg2.phpt index a160c486db..30e857eed7 100644 --- a/ext/mbstring/tests/mb_ereg2.phpt +++ b/ext/mbstring/tests/mb_ereg2.phpt @@ -8,19 +8,19 @@ if (!function_exists("mb_ereg")) print "skip mb_ereg() not available"; --FILE-- <?php -$a = -1; $b = -1; $c = -1; -mb_ereg($a, $b, $c); -var_dump($a, $b, $c); +$a = -1; $b = -1; $c = -1; +mb_ereg($a, $b, $c); +var_dump($a, $b, $c); -mb_eregi($a, $b, $c); -var_dump($a, $b, $c); +mb_eregi($a, $b, $c); +var_dump($a, $b, $c); -mb_ereg_search_init($a, $b, $c); +mb_ereg_search_init($a, $b, $c); var_dump($a, $b, $c); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(-1) int(-1) array(1) { diff --git a/ext/mbstring/tests/mb_ereg3.phpt b/ext/mbstring/tests/mb_ereg3.phpt index 9fb01cbf89..c591563444 100644 --- a/ext/mbstring/tests/mb_ereg3.phpt +++ b/ext/mbstring/tests/mb_ereg3.phpt @@ -11,19 +11,19 @@ if (!function_exists("mb_ereg")) print "skip mb_ereg() not available"; // Note: This test is identical to mb_ereg2.phpt, but using deprecated mbereg_* aliases. // Deleted it once the deprecated aliases have been removed. -$a = -1; $b = -1; $c = -1; -mbereg($a, $b, $c); -var_dump($a, $b, $c); +$a = -1; $b = -1; $c = -1; +mbereg($a, $b, $c); +var_dump($a, $b, $c); -mberegi($a, $b, $c); -var_dump($a, $b, $c); +mberegi($a, $b, $c); +var_dump($a, $b, $c); -mbereg_search_init($a, $b, $c); +mbereg_search_init($a, $b, $c); var_dump($a, $b, $c); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Deprecated: Function mbereg() is deprecated in %s on line %d int(-1) int(-1) diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt index ad2c6c1c56..6e988555ae 100644 --- a/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt +++ b/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt @@ -2,7 +2,7 @@ mb_ereg_replace() compat test 1 --SKIPIF-- <?php -extension_loaded('mbstring') or die('skip'); +extension_loaded('mbstring') or die('skip'); function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build"); ?> --FILE-- diff --git a/ext/mbstring/tests/mb_ereg_replace_error.phpt b/ext/mbstring/tests/mb_ereg_replace_error.phpt index 4e8a3388dd..bc138a4153 100644 --- a/ext/mbstring/tests/mb_ereg_replace_error.phpt +++ b/ext/mbstring/tests/mb_ereg_replace_error.phpt @@ -10,7 +10,7 @@ function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not availab /* Prototype : proto string mb_ereg_replace(string pattern, string replacement, string string [, string option]) * Description: Replace regular expression for multibyte string * Source code: ext/mbstring/php_mbregex.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_ereg_replace() : error conditions ***\n"; diff --git a/ext/mbstring/tests/mb_ereg_replace_variation1.phpt b/ext/mbstring/tests/mb_ereg_replace_variation1.phpt index cbf3dd98cd..d07aacb705 100644 --- a/ext/mbstring/tests/mb_ereg_replace_variation1.phpt +++ b/ext/mbstring/tests/mb_ereg_replace_variation1.phpt @@ -12,7 +12,7 @@ function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not availab /* Prototype : proto string mb_ereg_replace(string pattern, string replacement, string string [, string option]) * Description: Replace regular expression for multibyte string * Source code: ext/mbstring/php_mbregex.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_ereg_replace() : usage variations ***\n"; @@ -64,7 +64,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -73,7 +73,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_ereg_replace_variation2.phpt b/ext/mbstring/tests/mb_ereg_replace_variation2.phpt index 37a89fcba7..62a65c30ee 100644 --- a/ext/mbstring/tests/mb_ereg_replace_variation2.phpt +++ b/ext/mbstring/tests/mb_ereg_replace_variation2.phpt @@ -10,7 +10,7 @@ function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not availab /* Prototype : proto string mb_ereg_replace(string pattern, string replacement, string string [, string option]) * Description: Replace regular expression for multibyte string * Source code: ext/mbstring/php_mbregex.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_ereg_replace() : usage variations ***\n"; @@ -65,7 +65,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -74,7 +74,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_ereg_replace_variation3.phpt b/ext/mbstring/tests/mb_ereg_replace_variation3.phpt index 09da6cd3ee..0b3dd1d78c 100644 --- a/ext/mbstring/tests/mb_ereg_replace_variation3.phpt +++ b/ext/mbstring/tests/mb_ereg_replace_variation3.phpt @@ -4,13 +4,13 @@ Test mb_ereg_replace() function : usage variations <?php extension_loaded('mbstring') or die('skip'); function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build"); -?> +?> --FILE-- <?php /* Prototype : proto string mb_ereg_replace(string pattern, string replacement, string string [, string option]) * Description: Replace regular expression for multibyte string * Source code: ext/mbstring/php_mbregex.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_ereg_replace() : usage variations ***\n"; @@ -65,7 +65,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -74,7 +74,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_ereg_replace_variation4.phpt b/ext/mbstring/tests/mb_ereg_replace_variation4.phpt index 05b4f60da3..ecc7bdc131 100644 --- a/ext/mbstring/tests/mb_ereg_replace_variation4.phpt +++ b/ext/mbstring/tests/mb_ereg_replace_variation4.phpt @@ -4,13 +4,13 @@ Test mb_ereg_replace() function : usage variations <?php extension_loaded('mbstring') or die('skip'); function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build"); -?> +?> --FILE-- <?php /* Prototype : proto string mb_ereg_replace(string pattern, string replacement, string string [, string option]) * Description: Replace regular expression for multibyte string * Source code: ext/mbstring/php_mbregex.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_ereg_replace() : usage variations ***\n"; @@ -65,7 +65,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -74,7 +74,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_ereg_search_regs.phpt b/ext/mbstring/tests/mb_ereg_search_regs.phpt index 2cc55a7bdc..9c9132b023 100644 --- a/ext/mbstring/tests/mb_ereg_search_regs.phpt +++ b/ext/mbstring/tests/mb_ereg_search_regs.phpt @@ -8,18 +8,18 @@ function_exists('mb_ereg_search_regs') or die("skip mb_ereg_search_regs() not av --FILE-- <?php // homepage: - + //$mb_str = "Алексей Федорович Карамазов был Алексей Федорович Карамазов был kyrillischer string string"; // = "Lorem ipsum dolor sit amet" - + mb_ereg_search_init("Алексей Федорович Карамазов был Алексей Федорович Карамазов был"); - - - + + + $match= mb_ereg_search_regs("ов"); - var_dump($match); - - + var_dump($match); + + ?> --EXPECT-- array(1) { diff --git a/ext/mbstring/tests/mb_ereg_variation1.phpt b/ext/mbstring/tests/mb_ereg_variation1.phpt index 7172dd2a75..73d0c42a87 100644 --- a/ext/mbstring/tests/mb_ereg_variation1.phpt +++ b/ext/mbstring/tests/mb_ereg_variation1.phpt @@ -65,7 +65,7 @@ $inputs = array( /*12*/ "string", 'string', $heredoc, - + // object data /*15*/ new classA(), diff --git a/ext/mbstring/tests/mb_ereg_variation2.phpt b/ext/mbstring/tests/mb_ereg_variation2.phpt index 291c1c1ec4..0c8560022c 100644 --- a/ext/mbstring/tests/mb_ereg_variation2.phpt +++ b/ext/mbstring/tests/mb_ereg_variation2.phpt @@ -66,7 +66,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -75,7 +75,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_ereg_variation6.phpt b/ext/mbstring/tests/mb_ereg_variation6.phpt index 0de5064fed..22d70146a1 100644 --- a/ext/mbstring/tests/mb_ereg_variation6.phpt +++ b/ext/mbstring/tests/mb_ereg_variation6.phpt @@ -24,13 +24,13 @@ if(mb_regex_encoding('utf-8') == true) { echo "Could not set regex encoding to utf-8\n"; } -$regex_char = array ('\w+' => '\w+', - '\W+' => '\W+', - '\s+' => '\s+', - '\S+' => '\S+', - '\d+' => '\d+', - '\D+' => '\D+', - '\b' => '\b', +$regex_char = array ('\w+' => '\w+', + '\W+' => '\W+', + '\s+' => '\s+', + '\S+' => '\S+', + '\d+' => '\d+', + '\D+' => '\D+', + '\b' => '\b', '\B' => '\B'); $string_ascii = 'This is an English string. 0123456789.'; diff --git a/ext/mbstring/tests/mb_eregi_replace.phpt b/ext/mbstring/tests/mb_eregi_replace.phpt index 0405d8984c..540905b1a1 100644 --- a/ext/mbstring/tests/mb_eregi_replace.phpt +++ b/ext/mbstring/tests/mb_eregi_replace.phpt @@ -22,7 +22,7 @@ function do_translit($st) { "Я"=>"YA","Ч"=>"CH","С"=>"C","М"=>"M","И"=>"I","Т"=>"T", "Ь"=>"\'","Б"=>"B","Ю"=>"YU", ); - + foreach($replacement as $i=>$u) { $st = mb_eregi_replace($i,$u,$st); } diff --git a/ext/mbstring/tests/mb_http_output.phpt b/ext/mbstring/tests/mb_http_output.phpt index a6cac3fb35..cb2ea21f77 100644 --- a/ext/mbstring/tests/mb_http_output.phpt +++ b/ext/mbstring/tests/mb_http_output.phpt @@ -1,5 +1,5 @@ --TEST-- -mb_http_output() +mb_http_output() --SKIPIF-- <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?> --FILE-- diff --git a/ext/mbstring/tests/mb_internal_encoding_error1.phpt b/ext/mbstring/tests/mb_internal_encoding_error1.phpt index ce824e6a2f..53d47684d9 100644 --- a/ext/mbstring/tests/mb_internal_encoding_error1.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_error1.phpt @@ -4,7 +4,7 @@ Test mb_internal_encoding() function : error conditions - pass incorrect number <?php extension_loaded('mbstring') or die('skip'); function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is not available in this build"); -?> +?> --FILE-- <?php /* Prototype : string mb_internal_encoding([string $encoding]) diff --git a/ext/mbstring/tests/mb_internal_encoding_variation1.phpt b/ext/mbstring/tests/mb_internal_encoding_variation1.phpt index 581df06414..cd7fe6139d 100644 --- a/ext/mbstring/tests/mb_internal_encoding_variation1.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_variation1.phpt @@ -65,7 +65,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -74,7 +74,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_regex_encoding_variation1.phpt b/ext/mbstring/tests/mb_regex_encoding_variation1.phpt index 09b263d751..cda29cbbe0 100644 --- a/ext/mbstring/tests/mb_regex_encoding_variation1.phpt +++ b/ext/mbstring/tests/mb_regex_encoding_variation1.phpt @@ -63,7 +63,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -72,7 +72,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_regex_set_options.phpt b/ext/mbstring/tests/mb_regex_set_options.phpt index 88ee9c9250..26c8a998f8 100644 --- a/ext/mbstring/tests/mb_regex_set_options.phpt +++ b/ext/mbstring/tests/mb_regex_set_options.phpt @@ -1,5 +1,5 @@ --TEST-- -mb_regex_set_options() +mb_regex_set_options() --SKIPIF-- <?php extension_loaded('mbstring') or die("skip mbstring not available\n"); diff --git a/ext/mbstring/tests/mb_split.phpt b/ext/mbstring/tests/mb_split.phpt index 4f5171623c..f25ab1615c 100644 --- a/ext/mbstring/tests/mb_split.phpt +++ b/ext/mbstring/tests/mb_split.phpt @@ -21,7 +21,7 @@ mbstring.func_overload=0 print "ok\n"; } else { print count($result1).'-'.count($result2)."\n"; - } + } } var_dump( mb_split( " ", "a b c d e f g" ) diff --git a/ext/mbstring/tests/mb_split_error.phpt b/ext/mbstring/tests/mb_split_error.phpt index b48e21520b..3902317ccf 100644 --- a/ext/mbstring/tests/mb_split_error.phpt +++ b/ext/mbstring/tests/mb_split_error.phpt @@ -10,7 +10,7 @@ function_exists('mb_split') or die("skip mb_split() is not available in this bui /* Prototype : proto array mb_split(string pattern, string string [, int limit]) * Description: split multibyte string into array by regular expression * Source code: ext/mbstring/php_mbregex.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/mbstring/tests/mb_split_variation1.phpt b/ext/mbstring/tests/mb_split_variation1.phpt index b508049969..0f71b2e72c 100644 --- a/ext/mbstring/tests/mb_split_variation1.phpt +++ b/ext/mbstring/tests/mb_split_variation1.phpt @@ -10,7 +10,7 @@ function_exists('mb_split') or die("skip mb_split() is not available in this bui /* Prototype : proto array mb_split(string pattern, string string [, int limit]) * Description: split multibyte string into array by regular expression * Source code: ext/mbstring/php_mbregex.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_split() : usage variations ***\n"; @@ -64,7 +64,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -73,7 +73,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_split_variation2.phpt b/ext/mbstring/tests/mb_split_variation2.phpt index a6db2cc04f..cb1d513d4b 100644 --- a/ext/mbstring/tests/mb_split_variation2.phpt +++ b/ext/mbstring/tests/mb_split_variation2.phpt @@ -10,7 +10,7 @@ function_exists('mb_split') or die("skip mb_split() is not available in this bui /* Prototype : proto array mb_split(string pattern, string string [, int limit]) * Description: split multibyte string into array by regular expression * Source code: ext/mbstring/php_mbregex.c - * Alias to functions: + * Alias to functions: */ @@ -65,7 +65,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -74,7 +74,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_split_variation3.phpt b/ext/mbstring/tests/mb_split_variation3.phpt index ccf614b8bf..b3c973a5e3 100644 --- a/ext/mbstring/tests/mb_split_variation3.phpt +++ b/ext/mbstring/tests/mb_split_variation3.phpt @@ -11,7 +11,7 @@ if (PHP_INT_SIZE != 8) die('skip 64-bit only'); /* Prototype : proto array mb_split(string pattern, string string [, int limit]) * Description: split multibyte string into array by regular expression * Source code: ext/mbstring/php_mbregex.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_split() : usage variations ***\n"; @@ -65,7 +65,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -74,7 +74,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_stripos.phpt b/ext/mbstring/tests/mb_stripos.phpt index ac84b58242..d1f795ceac 100644 --- a/ext/mbstring/tests/mb_stripos.phpt +++ b/ext/mbstring/tests/mb_stripos.phpt @@ -1,5 +1,5 @@ --TEST-- -mb_stripos() +mb_stripos() --SKIPIF-- <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?> --FILE-- diff --git a/ext/mbstring/tests/mb_stripos_basic.phpt b/ext/mbstring/tests/mb_stripos_basic.phpt index 5a2fb6cb37..fe8d52e122 100644 --- a/ext/mbstring/tests/mb_stripos_basic.phpt +++ b/ext/mbstring/tests/mb_stripos_basic.phpt @@ -10,7 +10,7 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this /* Prototype : int mb_stripos(string haystack, string needle [, int offset [, string encoding]]) * Description: Finds position of first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* @@ -34,14 +34,14 @@ $ascii_needles = array( 'de', 'De', 'dE', - + //flag a swap between good and bad - '!', - + '!', + // 4 bad ones 'df', 'Df', - 'dF', + 'dF', 'DF' ); @@ -63,11 +63,11 @@ $greek_bmixed2 = base64_decode('zrzOvs6f'); $greek_needles = array( // 4 good ones $greek_nlower, $greek_nupper, $greek_nmixed1, $greek_nmixed2, - + '!', // used to flag a swap between good and bad - + // 4 bad ones - $greek_blower, $greek_bupper, $greek_bmixed1, $greek_bmixed2, + $greek_blower, $greek_bupper, $greek_bmixed1, $greek_bmixed2, ); // try the basic options @@ -80,7 +80,7 @@ foreach ($ascii_needles as $needle) { foreach ($ascii_haystacks as $haystack) { var_dump(mb_stripos($haystack, $needle)); } - } + } } echo "\n -- Greek Strings, needle should be found --\n"; @@ -92,7 +92,7 @@ foreach ($greek_needles as $needle) { foreach ($greek_haystacks as $haystack) { var_dump(mb_stripos($haystack, $needle)); } - } + } } echo "Done"; diff --git a/ext/mbstring/tests/mb_stripos_basic2.phpt b/ext/mbstring/tests/mb_stripos_basic2.phpt index a9399da391..06d57ac597 100644 --- a/ext/mbstring/tests/mb_stripos_basic2.phpt +++ b/ext/mbstring/tests/mb_stripos_basic2.phpt @@ -10,7 +10,7 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this /* Prototype : int mb_stripos(string haystack, string needle [, int offset [, string encoding]]) * Description: Finds position of first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* @@ -56,7 +56,7 @@ $greek_needles = array( echo "\n -- ASCII Strings --\n"; foreach ($ascii_needles as $needle) { foreach ($ascii_haystacks as $haystack) { - var_dump(mb_stripos($haystack, $needle)); + var_dump(mb_stripos($haystack, $needle)); var_dump(mb_stripos($haystack, $needle, 6)); } } @@ -65,7 +65,7 @@ echo "\n -- Greek Strings --\n"; foreach ($greek_needles as $needle) { foreach ($greek_haystacks as $haystack) { var_dump(mb_stripos($haystack, $needle)); - var_dump(mb_stripos($haystack, $needle, 4)); + var_dump(mb_stripos($haystack, $needle, 4)); } } diff --git a/ext/mbstring/tests/mb_stripos_error1.phpt b/ext/mbstring/tests/mb_stripos_error1.phpt index 4187898f01..d255e05c29 100644 --- a/ext/mbstring/tests/mb_stripos_error1.phpt +++ b/ext/mbstring/tests/mb_stripos_error1.phpt @@ -10,7 +10,7 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this /* Prototype : int mb_stripos(string haystack, string needle [, int offset [, string encoding]]) * Description: Finds position of first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/mbstring/tests/mb_stripos_error2.phpt b/ext/mbstring/tests/mb_stripos_error2.phpt index 82b01b92f3..00b442575a 100644 --- a/ext/mbstring/tests/mb_stripos_error2.phpt +++ b/ext/mbstring/tests/mb_stripos_error2.phpt @@ -10,7 +10,7 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this /* Prototype : int mb_stripos(string haystack, string needle [, int offset [, string encoding]]) * Description: Finds position of first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/mbstring/tests/mb_stripos_variation1.phpt b/ext/mbstring/tests/mb_stripos_variation1.phpt index 39837aa080..8237534ab1 100644 --- a/ext/mbstring/tests/mb_stripos_variation1.phpt +++ b/ext/mbstring/tests/mb_stripos_variation1.phpt @@ -10,7 +10,7 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this /* Prototype : int mb_stripos(string haystack, string needle [, int offset [, string encoding]]) * Description: Finds position of first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* @@ -69,7 +69,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -78,7 +78,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_stripos_variation2.phpt b/ext/mbstring/tests/mb_stripos_variation2.phpt index 32b75467f7..9db38dea0a 100644 --- a/ext/mbstring/tests/mb_stripos_variation2.phpt +++ b/ext/mbstring/tests/mb_stripos_variation2.phpt @@ -10,7 +10,7 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this /* Prototype : int mb_stripos(string haystack, string needle [, int offset [, string encoding]]) * Description: Finds position of first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* @@ -69,7 +69,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -78,7 +78,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_stripos_variation3.phpt b/ext/mbstring/tests/mb_stripos_variation3.phpt index 025105ae73..4c9441462a 100644 --- a/ext/mbstring/tests/mb_stripos_variation3.phpt +++ b/ext/mbstring/tests/mb_stripos_variation3.phpt @@ -71,7 +71,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', @@ -80,7 +80,7 @@ $inputs = array( /*20*/ "string", 'string', $heredoc, - + // object data /*23*/ new classA(), diff --git a/ext/mbstring/tests/mb_stripos_variation4.phpt b/ext/mbstring/tests/mb_stripos_variation4.phpt index dc11b48d38..a91f876308 100644 --- a/ext/mbstring/tests/mb_stripos_variation4.phpt +++ b/ext/mbstring/tests/mb_stripos_variation4.phpt @@ -10,7 +10,7 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this /* Prototype : int mb_stripos(string haystack, string needle [, int offset [, string encoding]]) * Description: Finds position of first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* @@ -70,7 +70,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -79,7 +79,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_stristr_basic.phpt b/ext/mbstring/tests/mb_stristr_basic.phpt index 58a03dcb2c..918bf27710 100644 --- a/ext/mbstring/tests/mb_stristr_basic.phpt +++ b/ext/mbstring/tests/mb_stristr_basic.phpt @@ -10,7 +10,7 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this /* Prototype : string mb_stristr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_stristr() : basic functionality ***\n"; diff --git a/ext/mbstring/tests/mb_stristr_error1.phpt b/ext/mbstring/tests/mb_stristr_error1.phpt index c20f13470d..d50971fd5a 100644 --- a/ext/mbstring/tests/mb_stristr_error1.phpt +++ b/ext/mbstring/tests/mb_stristr_error1.phpt @@ -10,7 +10,7 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this /* Prototype : string mb_stristr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_stristr() : error conditions ***\n"; diff --git a/ext/mbstring/tests/mb_stristr_error2.phpt b/ext/mbstring/tests/mb_stristr_error2.phpt index 74f8bfb4eb..91a02a5a5c 100644 --- a/ext/mbstring/tests/mb_stristr_error2.phpt +++ b/ext/mbstring/tests/mb_stristr_error2.phpt @@ -10,7 +10,7 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this /* Prototype : string mb_stristr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_stristr() : error conditions ***\n"; diff --git a/ext/mbstring/tests/mb_stristr_variation1.phpt b/ext/mbstring/tests/mb_stristr_variation1.phpt index c8c2ae1f68..076d59a549 100644 --- a/ext/mbstring/tests/mb_stristr_variation1.phpt +++ b/ext/mbstring/tests/mb_stristr_variation1.phpt @@ -10,7 +10,7 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this /* Prototype : string mb_stristr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_stristr() : usage variation ***\n"; @@ -102,7 +102,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable 'resource' => $fp ); diff --git a/ext/mbstring/tests/mb_stristr_variation2.phpt b/ext/mbstring/tests/mb_stristr_variation2.phpt index 498bb3b868..2467c307fe 100644 --- a/ext/mbstring/tests/mb_stristr_variation2.phpt +++ b/ext/mbstring/tests/mb_stristr_variation2.phpt @@ -10,7 +10,7 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this /* Prototype : string mb_stristr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_stristr() : usage variation ***\n"; @@ -102,7 +102,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable 'resource' => $fp ); diff --git a/ext/mbstring/tests/mb_stristr_variation3.phpt b/ext/mbstring/tests/mb_stristr_variation3.phpt index 5447ab0717..2333b33f7f 100644 --- a/ext/mbstring/tests/mb_stristr_variation3.phpt +++ b/ext/mbstring/tests/mb_stristr_variation3.phpt @@ -10,9 +10,9 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this /* Prototype : string mb_stristr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ - + echo "*** Testing mb_stristr() : usage variation ***\n"; // Define error handler @@ -108,7 +108,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable 'resource' => $fp ); diff --git a/ext/mbstring/tests/mb_stristr_variation4.phpt b/ext/mbstring/tests/mb_stristr_variation4.phpt index 7da3eeced0..40810a1a8b 100644 --- a/ext/mbstring/tests/mb_stristr_variation4.phpt +++ b/ext/mbstring/tests/mb_stristr_variation4.phpt @@ -10,7 +10,7 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this /* Prototype : string mb_stristr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_stristr() : usage variation ***\n"; @@ -102,7 +102,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable 'resource' => $fp ); diff --git a/ext/mbstring/tests/mb_stristr_variation5.phpt b/ext/mbstring/tests/mb_stristr_variation5.phpt index 54d527ecf5..e56f2b02c2 100644 --- a/ext/mbstring/tests/mb_stristr_variation5.phpt +++ b/ext/mbstring/tests/mb_stristr_variation5.phpt @@ -10,7 +10,7 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this /* Prototype : string mb_stristr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_stristr() : basic functionality ***\n"; diff --git a/ext/mbstring/tests/mb_strlen.phpt b/ext/mbstring/tests/mb_strlen.phpt index 97c09a79ae..512d76de04 100644 --- a/ext/mbstring/tests/mb_strlen.phpt +++ b/ext/mbstring/tests/mb_strlen.phpt @@ -43,7 +43,7 @@ echo "== JIS ==\n"; $jis = mb_convert_encoding($euc_jp, 'JIS','EUC-JP'); print mb_strlen($jis,'JIS') . "\n"; mb_internal_encoding('JIS') or print("mb_internal_encoding() failed\n"); -print strlen($jis) . "\n"; +print strlen($jis) . "\n"; // UTF-8 // Note: either convert_encoding or strlen has problem @@ -51,7 +51,7 @@ echo "== UTF-8 ==\n"; $utf8 = mb_convert_encoding($euc_jp, 'UTF-8','EUC-JP'); print mb_strlen($utf8,'UTF-8') . "\n"; mb_internal_encoding('UTF-8') or print("mb_internal_encoding() failed\n"); -print strlen($utf8) . "\n"; +print strlen($utf8) . "\n"; // Wrong Parameters diff --git a/ext/mbstring/tests/mb_strlen_variation1.phpt b/ext/mbstring/tests/mb_strlen_variation1.phpt index 4af8dc61aa..309535f5f1 100644 --- a/ext/mbstring/tests/mb_strlen_variation1.phpt +++ b/ext/mbstring/tests/mb_strlen_variation1.phpt @@ -66,7 +66,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -75,7 +75,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strlen_variation2.phpt b/ext/mbstring/tests/mb_strlen_variation2.phpt index 276731ce92..4b301ce4cf 100644 --- a/ext/mbstring/tests/mb_strlen_variation2.phpt +++ b/ext/mbstring/tests/mb_strlen_variation2.phpt @@ -67,7 +67,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -76,7 +76,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strpos.phpt b/ext/mbstring/tests/mb_strpos.phpt index e5a74364ff..7e4a64e351 100644 --- a/ext/mbstring/tests/mb_strpos.phpt +++ b/ext/mbstring/tests/mb_strpos.phpt @@ -1,5 +1,5 @@ --TEST-- -mb_strpos() +mb_strpos() --SKIPIF-- <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?> --FILE-- diff --git a/ext/mbstring/tests/mb_strpos_variation1.phpt b/ext/mbstring/tests/mb_strpos_variation1.phpt index 0684724b5c..42df52a45f 100644 --- a/ext/mbstring/tests/mb_strpos_variation1.phpt +++ b/ext/mbstring/tests/mb_strpos_variation1.phpt @@ -68,7 +68,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -77,7 +77,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strpos_variation2.phpt b/ext/mbstring/tests/mb_strpos_variation2.phpt index fb2d7227b9..38dcbb5fb2 100644 --- a/ext/mbstring/tests/mb_strpos_variation2.phpt +++ b/ext/mbstring/tests/mb_strpos_variation2.phpt @@ -68,7 +68,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -77,7 +77,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strpos_variation3.phpt b/ext/mbstring/tests/mb_strpos_variation3.phpt index cbdeda2b38..efb0bce79f 100644 --- a/ext/mbstring/tests/mb_strpos_variation3.phpt +++ b/ext/mbstring/tests/mb_strpos_variation3.phpt @@ -71,7 +71,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', @@ -80,7 +80,7 @@ $inputs = array( /*20*/ "string", 'string', $heredoc, - + // object data /*23*/ new classA(), diff --git a/ext/mbstring/tests/mb_strpos_variation4.phpt b/ext/mbstring/tests/mb_strpos_variation4.phpt index 31b43bacb7..ece6bfa155 100644 --- a/ext/mbstring/tests/mb_strpos_variation4.phpt +++ b/ext/mbstring/tests/mb_strpos_variation4.phpt @@ -69,7 +69,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -78,7 +78,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strrchr_basic.phpt b/ext/mbstring/tests/mb_strrchr_basic.phpt index 8c227487f0..a6574bcb09 100644 --- a/ext/mbstring/tests/mb_strrchr_basic.phpt +++ b/ext/mbstring/tests/mb_strrchr_basic.phpt @@ -10,7 +10,7 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this /* Prototype : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds the last occurrence of a character in a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrchr() : basic functionality ***\n"; diff --git a/ext/mbstring/tests/mb_strrchr_error1.phpt b/ext/mbstring/tests/mb_strrchr_error1.phpt index 42346afbf0..117680c424 100644 --- a/ext/mbstring/tests/mb_strrchr_error1.phpt +++ b/ext/mbstring/tests/mb_strrchr_error1.phpt @@ -4,13 +4,13 @@ Test mb_strrchr() function : error conditions <?php extension_loaded('mbstring') or die('skip'); function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this build"); -?> +?> --FILE-- <?php /* Prototype : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds the last occurrence of a character in a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrchr() : error conditions ***\n"; diff --git a/ext/mbstring/tests/mb_strrchr_error2.phpt b/ext/mbstring/tests/mb_strrchr_error2.phpt index 11abee609b..3aad8f7667 100644 --- a/ext/mbstring/tests/mb_strrchr_error2.phpt +++ b/ext/mbstring/tests/mb_strrchr_error2.phpt @@ -10,7 +10,7 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this /* Prototype : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds the last occurrence of a character in a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrchr() : error conditions ***\n"; diff --git a/ext/mbstring/tests/mb_strrchr_variation1.phpt b/ext/mbstring/tests/mb_strrchr_variation1.phpt index 7284939a57..93584abe1c 100644 --- a/ext/mbstring/tests/mb_strrchr_variation1.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation1.phpt @@ -10,7 +10,7 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this /* Prototype : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds the last occurrence of a character in a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrchr() : usage variation ***\n"; @@ -102,7 +102,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable 'resource' => $fp ); diff --git a/ext/mbstring/tests/mb_strrchr_variation2.phpt b/ext/mbstring/tests/mb_strrchr_variation2.phpt index 074cdda108..d1cddbc0bc 100644 --- a/ext/mbstring/tests/mb_strrchr_variation2.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation2.phpt @@ -10,7 +10,7 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this /* Prototype : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds the last occurrence of a character in a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrchr() : usage variation ***\n"; @@ -102,7 +102,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable 'resource' => $fp ); diff --git a/ext/mbstring/tests/mb_strrchr_variation3.phpt b/ext/mbstring/tests/mb_strrchr_variation3.phpt index 72b9c66cbe..376daec7c0 100644 --- a/ext/mbstring/tests/mb_strrchr_variation3.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation3.phpt @@ -10,7 +10,7 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this /* Prototype : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds the last occurrence of a character in a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrchr() : usage variation ***\n"; @@ -108,7 +108,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable 'resource' => $fp ); @@ -123,7 +123,7 @@ foreach($inputs as $key =>$value) { } else { var_dump(bin2hex($res)); - } + } }; fclose($fp); diff --git a/ext/mbstring/tests/mb_strrchr_variation4.phpt b/ext/mbstring/tests/mb_strrchr_variation4.phpt index a85979c988..78d8ca309d 100644 --- a/ext/mbstring/tests/mb_strrchr_variation4.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation4.phpt @@ -10,7 +10,7 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this /* Prototype : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds the last occurrence of a character in a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrchr() : usage variation ***\n"; @@ -102,7 +102,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable 'resource' => $fp ); diff --git a/ext/mbstring/tests/mb_strrchr_variation5.phpt b/ext/mbstring/tests/mb_strrchr_variation5.phpt index fa37db646c..dac9dca76a 100644 --- a/ext/mbstring/tests/mb_strrchr_variation5.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation5.phpt @@ -10,7 +10,7 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this /* Prototype : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds the last occurrence of a character in a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrchr() : variation ***\n"; diff --git a/ext/mbstring/tests/mb_strrchr_variation6.phpt b/ext/mbstring/tests/mb_strrchr_variation6.phpt index 2c941c5114..fc0040101e 100644 --- a/ext/mbstring/tests/mb_strrchr_variation6.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation6.phpt @@ -10,7 +10,7 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this /* Prototype : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds the last occurrence of a character in a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrchr() : variation ***\n"; diff --git a/ext/mbstring/tests/mb_strrichr_basic.phpt b/ext/mbstring/tests/mb_strrichr_basic.phpt index 2670de774c..5cba03f4b9 100644 --- a/ext/mbstring/tests/mb_strrichr_basic.phpt +++ b/ext/mbstring/tests/mb_strrichr_basic.phpt @@ -10,7 +10,7 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th /* Prototype : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds the last occurrence of a character in a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrichr() : basic functionality ***\n"; diff --git a/ext/mbstring/tests/mb_strrichr_error1.phpt b/ext/mbstring/tests/mb_strrichr_error1.phpt index 7280c53085..3d2716f6ab 100644 --- a/ext/mbstring/tests/mb_strrichr_error1.phpt +++ b/ext/mbstring/tests/mb_strrichr_error1.phpt @@ -10,7 +10,7 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th /* Prototype : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds the last occurrence of a character in a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrichr() : error conditions ***\n"; diff --git a/ext/mbstring/tests/mb_strrichr_error2.phpt b/ext/mbstring/tests/mb_strrichr_error2.phpt index b1877db9c1..ef9f2e2696 100644 --- a/ext/mbstring/tests/mb_strrichr_error2.phpt +++ b/ext/mbstring/tests/mb_strrichr_error2.phpt @@ -10,7 +10,7 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th /* Prototype : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds the last occurrence of a character in a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrichr() : error conditions ***\n"; diff --git a/ext/mbstring/tests/mb_strrichr_variation1.phpt b/ext/mbstring/tests/mb_strrichr_variation1.phpt index 06ca5e31c9..a786eff155 100644 --- a/ext/mbstring/tests/mb_strrichr_variation1.phpt +++ b/ext/mbstring/tests/mb_strrichr_variation1.phpt @@ -10,7 +10,7 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th /* Prototype : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds the last occurrence of a character in a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrichr() : usage variation ***\n"; @@ -102,7 +102,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable 'resource' => $fp ); diff --git a/ext/mbstring/tests/mb_strrichr_variation2.phpt b/ext/mbstring/tests/mb_strrichr_variation2.phpt index e2c979b428..80de558edc 100644 --- a/ext/mbstring/tests/mb_strrichr_variation2.phpt +++ b/ext/mbstring/tests/mb_strrichr_variation2.phpt @@ -10,7 +10,7 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th /* Prototype : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds the last occurrence of a character in a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrichr() : usage variation ***\n"; @@ -102,7 +102,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable 'resource' => $fp ); diff --git a/ext/mbstring/tests/mb_strrichr_variation3.phpt b/ext/mbstring/tests/mb_strrichr_variation3.phpt index 5f73dc4da7..5532804a95 100644 --- a/ext/mbstring/tests/mb_strrichr_variation3.phpt +++ b/ext/mbstring/tests/mb_strrichr_variation3.phpt @@ -10,9 +10,9 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th /* Prototype : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds the last occurrence of a character in a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ - + echo "*** Testing mb_strrichr() : usage variation ***\n"; // Define error handler @@ -108,7 +108,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable 'resource' => $fp ); @@ -123,7 +123,7 @@ foreach($inputs as $key =>$value) { } else { var_dump(bin2hex($res)); - } + } }; fclose($fp); diff --git a/ext/mbstring/tests/mb_strrichr_variation4.phpt b/ext/mbstring/tests/mb_strrichr_variation4.phpt index f9d9f68037..c6d6e60281 100644 --- a/ext/mbstring/tests/mb_strrichr_variation4.phpt +++ b/ext/mbstring/tests/mb_strrichr_variation4.phpt @@ -10,7 +10,7 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th /* Prototype : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds the last occurrence of a character in a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrichr() : usage variation ***\n"; @@ -102,7 +102,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable 'resource' => $fp ); diff --git a/ext/mbstring/tests/mb_strrichr_variation5.phpt b/ext/mbstring/tests/mb_strrichr_variation5.phpt index 0e5d472fd8..e279fe1e89 100644 --- a/ext/mbstring/tests/mb_strrichr_variation5.phpt +++ b/ext/mbstring/tests/mb_strrichr_variation5.phpt @@ -10,7 +10,7 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th /* Prototype : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds the last occurrence of a character in a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strrichr() : basic functionality ***\n"; diff --git a/ext/mbstring/tests/mb_strripos_basic.phpt b/ext/mbstring/tests/mb_strripos_basic.phpt index d63a2eaf6c..530c0fe3c2 100644 --- a/ext/mbstring/tests/mb_strripos_basic.phpt +++ b/ext/mbstring/tests/mb_strripos_basic.phpt @@ -10,7 +10,7 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th /* Prototype : int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) * Description: Finds position of last occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* @@ -34,14 +34,14 @@ $ascii_needles = array( 'de', 'De', 'dE', - + //flag a swap between good and bad - '!', - + '!', + // 4 bad ones 'df', 'Df', - 'dF', + 'dF', 'DF' ); @@ -63,11 +63,11 @@ $greek_bmixed2 = base64_decode('zrzOvs6f'); $greek_needles = array( // 4 good ones $greek_nlower, $greek_nupper, $greek_nmixed1, $greek_nmixed2, - + '!', // used to flag a swap between good and bad - + // 4 bad ones - $greek_blower, $greek_bupper, $greek_bmixed1, $greek_bmixed2, + $greek_blower, $greek_bupper, $greek_bmixed1, $greek_bmixed2, ); // try the basic options @@ -80,7 +80,7 @@ foreach ($ascii_needles as $needle) { foreach ($ascii_haystacks as $haystack) { var_dump(mb_strripos($haystack, $needle)); } - } + } } echo "\n -- Greek Strings, needle should be found --\n"; @@ -92,7 +92,7 @@ foreach ($greek_needles as $needle) { foreach ($greek_haystacks as $haystack) { var_dump(mb_strripos($haystack, $needle)); } - } + } } echo "Done"; diff --git a/ext/mbstring/tests/mb_strripos_basic2.phpt b/ext/mbstring/tests/mb_strripos_basic2.phpt index 09fc7e352b..ea3918d4d9 100644 --- a/ext/mbstring/tests/mb_strripos_basic2.phpt +++ b/ext/mbstring/tests/mb_strripos_basic2.phpt @@ -10,7 +10,7 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th /* Prototype : int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) * Description: Finds position of last occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* @@ -56,7 +56,7 @@ $greek_needles = array( echo "\n -- ASCII Strings --\n"; foreach ($ascii_needles as $needle) { foreach ($ascii_haystacks as $haystack) { - var_dump(mb_strripos($haystack, $needle)); + var_dump(mb_strripos($haystack, $needle)); var_dump(mb_strripos($haystack, $needle, 14)); } } @@ -65,7 +65,7 @@ echo "\n -- Greek Strings --\n"; foreach ($greek_needles as $needle) { foreach ($greek_haystacks as $haystack) { var_dump(mb_strripos($haystack, $needle)); - var_dump(mb_strripos($haystack, $needle, 12)); + var_dump(mb_strripos($haystack, $needle, 12)); } } diff --git a/ext/mbstring/tests/mb_strripos_error1.phpt b/ext/mbstring/tests/mb_strripos_error1.phpt index 3e2f6d928d..23829a132a 100644 --- a/ext/mbstring/tests/mb_strripos_error1.phpt +++ b/ext/mbstring/tests/mb_strripos_error1.phpt @@ -10,7 +10,7 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th /* Prototype : int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) * Description: Finds position of last occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/mbstring/tests/mb_strripos_error2.phpt b/ext/mbstring/tests/mb_strripos_error2.phpt index d01a774107..4bc0888c64 100644 --- a/ext/mbstring/tests/mb_strripos_error2.phpt +++ b/ext/mbstring/tests/mb_strripos_error2.phpt @@ -10,7 +10,7 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th /* Prototype : int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) * Description: Finds position of last occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/mbstring/tests/mb_strripos_variation1.phpt b/ext/mbstring/tests/mb_strripos_variation1.phpt index 0a3be0a7da..63ef9a34fc 100644 --- a/ext/mbstring/tests/mb_strripos_variation1.phpt +++ b/ext/mbstring/tests/mb_strripos_variation1.phpt @@ -10,7 +10,7 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th /* Prototype : int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) * Description: Finds position of last occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* @@ -69,7 +69,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -78,7 +78,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strripos_variation2.phpt b/ext/mbstring/tests/mb_strripos_variation2.phpt index eafe7f79e9..51f00b3a0c 100644 --- a/ext/mbstring/tests/mb_strripos_variation2.phpt +++ b/ext/mbstring/tests/mb_strripos_variation2.phpt @@ -10,7 +10,7 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th /* Prototype : int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) * Description: Finds position of last occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* @@ -69,7 +69,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -78,7 +78,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt b/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt index 16f92bfdfa..b5bfea654b 100644 --- a/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt +++ b/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt @@ -11,7 +11,7 @@ if (PHP_INT_SIZE != 8) die('skip 64-bit only'); /* Prototype : int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) * Description: Finds position of last occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* @@ -70,7 +70,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -79,7 +79,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strripos_variation4.phpt b/ext/mbstring/tests/mb_strripos_variation4.phpt index 27973e51ea..55aa897d8f 100644 --- a/ext/mbstring/tests/mb_strripos_variation4.phpt +++ b/ext/mbstring/tests/mb_strripos_variation4.phpt @@ -10,7 +10,7 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th /* Prototype : int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) * Description: Finds position of last occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* @@ -70,7 +70,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -79,7 +79,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt b/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt index ce3074abf0..0a83bb94ba 100644 --- a/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt +++ b/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt @@ -10,7 +10,7 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th /* Prototype : int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) * Description: Finds position of last occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/mbstring/tests/mb_strrpos_variation1.phpt b/ext/mbstring/tests/mb_strrpos_variation1.phpt index f0e6e47987..8f120c3253 100644 --- a/ext/mbstring/tests/mb_strrpos_variation1.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation1.phpt @@ -68,7 +68,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -77,7 +77,7 @@ $inputs = array( /*18*/ "hello, world", 'hello, world', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strrpos_variation2.phpt b/ext/mbstring/tests/mb_strrpos_variation2.phpt index c2855e0f81..4019154bf8 100644 --- a/ext/mbstring/tests/mb_strrpos_variation2.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation2.phpt @@ -68,7 +68,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -77,7 +77,7 @@ $inputs = array( /*18*/ "world", 'world', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strrpos_variation3.phpt b/ext/mbstring/tests/mb_strrpos_variation3.phpt index da28d6ed7c..dc691b0ef3 100644 --- a/ext/mbstring/tests/mb_strrpos_variation3.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation3.phpt @@ -65,7 +65,7 @@ $inputs = array( false, TRUE, FALSE, - + // object data /*16*/ new classA(), diff --git a/ext/mbstring/tests/mb_strrpos_variation4.phpt b/ext/mbstring/tests/mb_strrpos_variation4.phpt index 287142793b..1bd764658c 100644 --- a/ext/mbstring/tests/mb_strrpos_variation4.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation4.phpt @@ -69,7 +69,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -78,7 +78,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strstr.phpt b/ext/mbstring/tests/mb_strstr.phpt index fcf9e85bc2..d224475370 100644 --- a/ext/mbstring/tests/mb_strstr.phpt +++ b/ext/mbstring/tests/mb_strstr.phpt @@ -1,5 +1,5 @@ --TEST-- -mb_strstr() +mb_strstr() --SKIPIF-- <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?> --INI-- diff --git a/ext/mbstring/tests/mb_strstr_basic.phpt b/ext/mbstring/tests/mb_strstr_basic.phpt index 2b41707a6a..1b75b8c8b1 100644 --- a/ext/mbstring/tests/mb_strstr_basic.phpt +++ b/ext/mbstring/tests/mb_strstr_basic.phpt @@ -10,7 +10,7 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b /* Prototype : string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds first occurrence of a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strstr() : basic functionality ***\n"; diff --git a/ext/mbstring/tests/mb_strstr_error1.phpt b/ext/mbstring/tests/mb_strstr_error1.phpt index cf7c0b1f17..cd0af724a3 100644 --- a/ext/mbstring/tests/mb_strstr_error1.phpt +++ b/ext/mbstring/tests/mb_strstr_error1.phpt @@ -10,7 +10,7 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b /* Prototype : string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds first occurrence of a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strstr() : error conditions ***\n"; diff --git a/ext/mbstring/tests/mb_strstr_error2.phpt b/ext/mbstring/tests/mb_strstr_error2.phpt index 8df700080e..a36b5fcd0d 100644 --- a/ext/mbstring/tests/mb_strstr_error2.phpt +++ b/ext/mbstring/tests/mb_strstr_error2.phpt @@ -10,7 +10,7 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b /* Prototype : string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds first occurrence of a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strstr() : error conditions ***\n"; diff --git a/ext/mbstring/tests/mb_strstr_variation1.phpt b/ext/mbstring/tests/mb_strstr_variation1.phpt index a9406f1cad..2bf155a7e0 100644 --- a/ext/mbstring/tests/mb_strstr_variation1.phpt +++ b/ext/mbstring/tests/mb_strstr_variation1.phpt @@ -10,7 +10,7 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b /* Prototype : string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds first occurrence of a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strstr() : usage variation ***\n"; @@ -102,7 +102,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable 'resource' => $fp ); diff --git a/ext/mbstring/tests/mb_strstr_variation2.phpt b/ext/mbstring/tests/mb_strstr_variation2.phpt index 8c059cb6b2..687374f2e4 100644 --- a/ext/mbstring/tests/mb_strstr_variation2.phpt +++ b/ext/mbstring/tests/mb_strstr_variation2.phpt @@ -10,7 +10,7 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b /* Prototype : string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds first occurrence of a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strstr() : usage variation ***\n"; @@ -102,7 +102,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable 'resource' => $fp ); diff --git a/ext/mbstring/tests/mb_strstr_variation3.phpt b/ext/mbstring/tests/mb_strstr_variation3.phpt index 28dc17ac53..fbad4fe81e 100644 --- a/ext/mbstring/tests/mb_strstr_variation3.phpt +++ b/ext/mbstring/tests/mb_strstr_variation3.phpt @@ -10,7 +10,7 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b /* Prototype : string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds first occurrence of a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strstr() : usage variation ***\n"; @@ -108,7 +108,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable 'resource' => $fp ); @@ -123,7 +123,7 @@ foreach($inputs as $key =>$value) { } else { var_dump(bin2hex($res)); - } + } }; fclose($fp); diff --git a/ext/mbstring/tests/mb_strstr_variation4.phpt b/ext/mbstring/tests/mb_strstr_variation4.phpt index 8a0efcba8e..ef661e8265 100644 --- a/ext/mbstring/tests/mb_strstr_variation4.phpt +++ b/ext/mbstring/tests/mb_strstr_variation4.phpt @@ -10,7 +10,7 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b /* Prototype : string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds first occurrence of a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strstr() : usage variation ***\n"; @@ -102,7 +102,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable 'resource' => $fp ); diff --git a/ext/mbstring/tests/mb_strstr_variation5.phpt b/ext/mbstring/tests/mb_strstr_variation5.phpt index ab6315be44..4bb084c27e 100644 --- a/ext/mbstring/tests/mb_strstr_variation5.phpt +++ b/ext/mbstring/tests/mb_strstr_variation5.phpt @@ -10,7 +10,7 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b /* Prototype : string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds first occurrence of a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strstr() : variation ***\n"; diff --git a/ext/mbstring/tests/mb_strstr_variation6.phpt b/ext/mbstring/tests/mb_strstr_variation6.phpt index d00f15cfa3..25d4a43775 100644 --- a/ext/mbstring/tests/mb_strstr_variation6.phpt +++ b/ext/mbstring/tests/mb_strstr_variation6.phpt @@ -10,7 +10,7 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b /* Prototype : string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) * Description: Finds first occurrence of a string within another * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_strstr() : variation ***\n"; diff --git a/ext/mbstring/tests/mb_strtolower_variation1.phpt b/ext/mbstring/tests/mb_strtolower_variation1.phpt index 3b151b96c7..057fc299ce 100644 --- a/ext/mbstring/tests/mb_strtolower_variation1.phpt +++ b/ext/mbstring/tests/mb_strtolower_variation1.phpt @@ -64,7 +64,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -73,7 +73,7 @@ $inputs = array( /*18*/ "String", 'String', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strtolower_variation2.phpt b/ext/mbstring/tests/mb_strtolower_variation2.phpt index ef69eb00af..c9e2520232 100644 --- a/ext/mbstring/tests/mb_strtolower_variation2.phpt +++ b/ext/mbstring/tests/mb_strtolower_variation2.phpt @@ -67,7 +67,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -76,7 +76,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strtolower_variation4.phpt b/ext/mbstring/tests/mb_strtolower_variation4.phpt index 007430b262..05091b4752 100644 --- a/ext/mbstring/tests/mb_strtolower_variation4.phpt +++ b/ext/mbstring/tests/mb_strtolower_variation4.phpt @@ -18,7 +18,7 @@ function_exists('mb_strtolower') or die("skip mb_strtolower() is not available i echo "*** Testing mb_strtolower() : usage variations ***\n"; -$uppers = array('Basic Latin' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', +$uppers = array('Basic Latin' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'Characters With Accents' => base64_decode('w4DDgcOCw4PDhMOFw4bDh8OIw4nDisOLw4zDjcOOw4/DkMORw5LDk8OUw5XDlg=='), 'Russian' => base64_decode('0JDQkdCS0JPQlNCV0JbQlw==')); $lowers = array('Basic Latin' => 'abcdefghijklmnopqrstuvwxyz', diff --git a/ext/mbstring/tests/mb_strtoupper_variation1.phpt b/ext/mbstring/tests/mb_strtoupper_variation1.phpt index efe8845638..6331db27ba 100644 --- a/ext/mbstring/tests/mb_strtoupper_variation1.phpt +++ b/ext/mbstring/tests/mb_strtoupper_variation1.phpt @@ -13,7 +13,7 @@ function_exists('mb_strtoupper') or die("skip mb_strtoupper() is not available i */ /* - * + * * Pass different data types as $sourcestring argument to mb_strtoupper to test behaviour */ @@ -66,7 +66,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -75,7 +75,7 @@ $inputs = array( /*18*/ "String", 'String', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strtoupper_variation2.phpt b/ext/mbstring/tests/mb_strtoupper_variation2.phpt index 25b9a53e91..d92b773ba4 100644 --- a/ext/mbstring/tests/mb_strtoupper_variation2.phpt +++ b/ext/mbstring/tests/mb_strtoupper_variation2.phpt @@ -67,7 +67,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -76,7 +76,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_strtoupper_variation4.phpt b/ext/mbstring/tests/mb_strtoupper_variation4.phpt index 739671b6c4..0c4caf6fd1 100644 --- a/ext/mbstring/tests/mb_strtoupper_variation4.phpt +++ b/ext/mbstring/tests/mb_strtoupper_variation4.phpt @@ -19,7 +19,7 @@ function_exists('mb_strtoupper') or die("skip mb_strtoupper() is not available i echo "*** Testing mb_strtoupper() : usage variations ***\n"; -$uppers = array('Basic Latin' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', +$uppers = array('Basic Latin' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'Characters With Accents' => base64_decode('w4DDgcOCw4PDhMOFw4bDh8OIw4nDisOLw4zDjcOOw4/DkMORw5LDk8OUw5XDlg=='), 'Russian' => base64_decode('0JDQkdCS0JPQlNCV0JbQlw==')); $lowers = array('Basic Latin' => 'abcdefghijklmnopqrstuvwxyz', diff --git a/ext/mbstring/tests/mb_substitute_character.phpt b/ext/mbstring/tests/mb_substitute_character.phpt index db1198822f..502a4136dd 100644 --- a/ext/mbstring/tests/mb_substitute_character.phpt +++ b/ext/mbstring/tests/mb_substitute_character.phpt @@ -1,5 +1,5 @@ --TEST-- -mb_substitute_character() +mb_substitute_character() --SKIPIF-- <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?> --FILE-- diff --git a/ext/mbstring/tests/mb_substitute_character_basic.phpt b/ext/mbstring/tests/mb_substitute_character_basic.phpt index 036203f416..582cc1d043 100644 --- a/ext/mbstring/tests/mb_substitute_character_basic.phpt +++ b/ext/mbstring/tests/mb_substitute_character_basic.phpt @@ -10,7 +10,7 @@ function_exists('mb_substitute_character') or die("skip mb_substitute_character( /* Prototype : mixed mb_substitute_character([mixed substchar]) * Description: Sets the current substitute_character or returns the current substitute_character * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_substitute_character() : basic functionality ***\n"; diff --git a/ext/mbstring/tests/mb_substitute_character_error.phpt b/ext/mbstring/tests/mb_substitute_character_error.phpt index 2a816b8b2f..a933aa1a90 100644 --- a/ext/mbstring/tests/mb_substitute_character_error.phpt +++ b/ext/mbstring/tests/mb_substitute_character_error.phpt @@ -10,7 +10,7 @@ function_exists('mb_substitute_character') or die("skip mb_substitute_character( /* Prototype : mixed mb_substitute_character([mixed substchar]) * Description: Sets the current substitute_character or returns the current substitute_character * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_substitute_character() : error conditions ***\n"; diff --git a/ext/mbstring/tests/mb_substitute_character_variation1.phpt b/ext/mbstring/tests/mb_substitute_character_variation1.phpt index fa786a1e5c..f39364da47 100644 --- a/ext/mbstring/tests/mb_substitute_character_variation1.phpt +++ b/ext/mbstring/tests/mb_substitute_character_variation1.phpt @@ -10,7 +10,7 @@ function_exists('mb_substitute_character') or die("skip mb_substitute_character( /* Prototype : mixed mb_substitute_character([mixed substchar]) * Description: Sets the current substitute_character or returns the current substitute_character * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_substitute_character() : usage variation ***\n"; diff --git a/ext/mbstring/tests/mb_substitute_character_variation2.phpt b/ext/mbstring/tests/mb_substitute_character_variation2.phpt index 6248174aa6..ad5929b013 100644 --- a/ext/mbstring/tests/mb_substitute_character_variation2.phpt +++ b/ext/mbstring/tests/mb_substitute_character_variation2.phpt @@ -10,7 +10,7 @@ function_exists('mb_substitute_character') or die("skip mb_substitute_character( /* Prototype : mixed mb_substitute_character([mixed substchar]) * Description: Sets the current substitute_character or returns the current substitute_character * Source code: ext/mbstring/mbstring.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mb_substitute_character() : variation ***\n"; diff --git a/ext/mbstring/tests/mb_substr_count_variation1.phpt b/ext/mbstring/tests/mb_substr_count_variation1.phpt index cc55135ab2..64d3c0f263 100644 --- a/ext/mbstring/tests/mb_substr_count_variation1.phpt +++ b/ext/mbstring/tests/mb_substr_count_variation1.phpt @@ -67,7 +67,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -76,7 +76,7 @@ $inputs = array( /*18*/ "hello, world", 'hello, world', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_substr_count_variation2.phpt b/ext/mbstring/tests/mb_substr_count_variation2.phpt index 87b5eed189..340693dabe 100644 --- a/ext/mbstring/tests/mb_substr_count_variation2.phpt +++ b/ext/mbstring/tests/mb_substr_count_variation2.phpt @@ -66,7 +66,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -75,7 +75,7 @@ $inputs = array( /*18*/ "world", 'world', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_substr_count_variation3.phpt b/ext/mbstring/tests/mb_substr_count_variation3.phpt index d2e7a60566..738ccdd00e 100644 --- a/ext/mbstring/tests/mb_substr_count_variation3.phpt +++ b/ext/mbstring/tests/mb_substr_count_variation3.phpt @@ -68,7 +68,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -77,7 +77,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_substr_variation1.phpt b/ext/mbstring/tests/mb_substr_variation1.phpt index b02daa3450..8c4b10ddd9 100644 --- a/ext/mbstring/tests/mb_substr_variation1.phpt +++ b/ext/mbstring/tests/mb_substr_variation1.phpt @@ -67,7 +67,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -76,7 +76,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_substr_variation2.phpt b/ext/mbstring/tests/mb_substr_variation2.phpt index 7c763f3616..1cd608ef50 100644 --- a/ext/mbstring/tests/mb_substr_variation2.phpt +++ b/ext/mbstring/tests/mb_substr_variation2.phpt @@ -69,7 +69,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -78,7 +78,7 @@ $inputs = array( /*18*/ "UTF-8", 'UTF-8', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/mbstring/tests/mb_substr_variation4.phpt b/ext/mbstring/tests/mb_substr_variation4.phpt index ce4df53005..f6e711da7c 100644 --- a/ext/mbstring/tests/mb_substr_variation4.phpt +++ b/ext/mbstring/tests/mb_substr_variation4.phpt @@ -44,7 +44,7 @@ for ($i = -60; $i <= 60; $i += 10) { } else { echo "Difference in length of ASCII string and multibyte string\n"; } - + } echo "Done"; diff --git a/ext/mbstring/tests/mb_substr_variation5.phpt b/ext/mbstring/tests/mb_substr_variation5.phpt index 1ec92be993..5c912f93b5 100644 --- a/ext/mbstring/tests/mb_substr_variation5.phpt +++ b/ext/mbstring/tests/mb_substr_variation5.phpt @@ -45,7 +45,7 @@ for ($i = -60; $i <= 60; $i += 10) { } else { echo "Difference in length of ASCII string and multibyte string\n"; } - + } echo "Done"; diff --git a/ext/mbstring/tests/mb_substr_variation6.phpt b/ext/mbstring/tests/mb_substr_variation6.phpt index aa75c70c00..cd5a26381b 100644 --- a/ext/mbstring/tests/mb_substr_variation6.phpt +++ b/ext/mbstring/tests/mb_substr_variation6.phpt @@ -41,7 +41,7 @@ for ($i = -60; $i <= 60; $i += 10) { } else { var_dump($a); - } + } echo "--Multibyte String --\n"; $b = mb_substr($string_mb, $i, 4, 'UTF-8'); if (strlen($a) == mb_strlen($b, 'UTF-8')) { // should return same length @@ -49,7 +49,7 @@ for ($i = -60; $i <= 60; $i += 10) { } else { echo "Difference in length of ASCII string and multibyte string\n"; } - + } echo "Done"; diff --git a/ext/mbstring/tests/mb_substr_variation7.phpt b/ext/mbstring/tests/mb_substr_variation7.phpt index 22b5fa2fe3..9cb433e085 100644 --- a/ext/mbstring/tests/mb_substr_variation7.phpt +++ b/ext/mbstring/tests/mb_substr_variation7.phpt @@ -42,7 +42,7 @@ for ($i = -60; $i <= 60; $i += 10) { } else { var_dump($a); - } + } echo "--Multibyte String --\n"; $b = mb_substr($string_mb, 1, $i, 'UTF-8'); if (strlen($a) == mb_strlen($b, 'UTF-8')) { // should return same length @@ -50,7 +50,7 @@ for ($i = -60; $i <= 60; $i += 10) { } else { echo "Difference in length of ASCII string and multibyte string\n"; } - + } echo "Done"; diff --git a/ext/mbstring/tests/overload01.phpt b/ext/mbstring/tests/overload01.phpt index 8950d912fb..4e6802b930 100644 --- a/ext/mbstring/tests/overload01.phpt +++ b/ext/mbstring/tests/overload01.phpt @@ -1,8 +1,8 @@ --TEST-- Function overloading test 1 --SKIPIF-- -<?php - extension_loaded('mbstring') or die('skip mbstring not available'); +<?php + extension_loaded('mbstring') or die('skip mbstring not available'); ?> --INI-- output_handler= diff --git a/ext/mbstring/tests/overload02.phpt b/ext/mbstring/tests/overload02.phpt index 64b46dfd73..2aa30ad025 100644 --- a/ext/mbstring/tests/overload02.phpt +++ b/ext/mbstring/tests/overload02.phpt @@ -1,8 +1,8 @@ --TEST-- -Function overloading test 2 +Function overloading test 2 --SKIPIF-- -<?php - extension_loaded('mbstring') or die('skip mbstring not available'); +<?php + extension_loaded('mbstring') or die('skip mbstring not available'); if (!function_exists("mb_ereg_replace")) { die('skip mb_ereg_replace() function is not available.'); } diff --git a/ext/mysqli/tests/004.phpt b/ext/mysqli/tests/004.phpt index ad58e7af27..349788eb92 100644 --- a/ext/mysqli/tests/004.phpt +++ b/ext/mysqli/tests/004.phpt @@ -34,7 +34,7 @@ require_once('skipifconnectfailure.inc'); if (!$stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch ORDER BY c1")) printf("[007] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - + $c1 = $c2 = NULL; mysqli_stmt_bind_result($stmt, $c1, $c2); mysqli_stmt_execute($stmt); diff --git a/ext/mysqli/tests/bug33491.phpt b/ext/mysqli/tests/bug33491.phpt index aa2fb62def..7b49774033 100644 --- a/ext/mysqli/tests/bug33491.phpt +++ b/ext/mysqli/tests/bug33491.phpt @@ -3,8 +3,8 @@ Bug #33491 (extended mysqli class crashes when result is not object) --INI-- error_reporting=1 --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/bug38003.phpt b/ext/mysqli/tests/bug38003.phpt index a974815d4d..bcfd239911 100644 --- a/ext/mysqli/tests/bug38003.phpt +++ b/ext/mysqli/tests/bug38003.phpt @@ -16,7 +16,7 @@ $DB = new DB(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Uncaught Error: Call to private DB::__construct() from invalid context in %s Stack trace: #0 {main} diff --git a/ext/mysqli/tests/bug54221.phpt b/ext/mysqli/tests/bug54221.phpt index b031909aa2..8346ccfbee 100644 --- a/ext/mysqli/tests/bug54221.phpt +++ b/ext/mysqli/tests/bug54221.phpt @@ -30,7 +30,7 @@ mysqli.reconnect = Off $warnings = $link->get_warnings(); if ($warnings) { do { - echo "Warning: ".$warnings->errno.": ".$warnings->message."\n"; + echo "Warning: ".$warnings->errno.": ".$warnings->message."\n"; } while ($warnings->next()); } } diff --git a/ext/mysqli/tests/bug55582.phpt b/ext/mysqli/tests/bug55582.phpt index 3933845147..132a731d0c 100644 --- a/ext/mysqli/tests/bug55582.phpt +++ b/ext/mysqli/tests/bug55582.phpt @@ -12,7 +12,7 @@ require_once("connect.inc"); if (!($link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))) { printf("[001] Cannot connect to the server"); } - + var_dump($link->real_query("SELECT 1")); $res = $link->use_result(); var_dump(mysqli_num_rows($res)); diff --git a/ext/mysqli/tests/bug62046.phpt b/ext/mysqli/tests/bug62046.phpt index c8ad3c3675..3ad913d951 100644 --- a/ext/mysqli/tests/bug62046.phpt +++ b/ext/mysqli/tests/bug62046.phpt @@ -16,14 +16,14 @@ require_once('skipifconnectfailure.inc'); printf("[002] Prepare failed, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); } if (FALSE === $stmt->execute()) { - printf("[003] Execute failed, [%d] %s\n", $stmt->errorno, $stmt->error); + printf("[003] Execute failed, [%d] %s\n", $stmt->errorno, $stmt->error); } if (FALSE === $stmt->store_result()) { - printf("[004] store_result failed, [%d] %s\n", $stmt->errorno, $stmt->error); + printf("[004] store_result failed, [%d] %s\n", $stmt->errorno, $stmt->error); } $one = NULL; if (FALSE === $stmt->bind_result($one)) { - printf("[005] bind_result failed, [%d] %s\n", $stmt->errorno, $stmt->error); + printf("[005] bind_result failed, [%d] %s\n", $stmt->errorno, $stmt->error); } if (FALSE === $stmt->reset()) { printf("[006] bind_result failed, [%d] %s\n", $stmt->errorno, $stmt->error); diff --git a/ext/mysqli/tests/bug70384.phpt b/ext/mysqli/tests/bug70384.phpt index 6987789d36..4e9ef3181e 100644 --- a/ext/mysqli/tests/bug70384.phpt +++ b/ext/mysqli/tests/bug70384.phpt @@ -49,7 +49,7 @@ mysqli_float_handling - ensure 4 byte float is handled correctly if (json_encode($rows[0][0]) != json_encode($jsfield_data)) { printf("[006] Data differs"); var_dump(json_encode($rows[0][0]) != json_encode($jsfield_data)); - die(); + die(); } mysqli_close($link); echo "OK"; diff --git a/ext/mysqli/tests/bug70949.phpt b/ext/mysqli/tests/bug70949.phpt index 17f7f9d96b..dc7b202152 100644 --- a/ext/mysqli/tests/bug70949.phpt +++ b/ext/mysqli/tests/bug70949.phpt @@ -21,7 +21,7 @@ $mysql->query("INSERT INTO bug70949 VALUES ('dummy'),(NULL),('foo'),('bar')"); $sql = "select * from bug70949"; if ($stmt = $mysql->prepare($sql)) -{ +{ $stmt->attr_set(MYSQLI_STMT_ATTR_CURSOR_TYPE, MYSQLI_CURSOR_TYPE_READ_ONLY); if ($stmt->bind_result($name)) { @@ -29,7 +29,7 @@ if ($stmt = $mysql->prepare($sql)) if ($stmt->execute()) { while ($stmt->fetch()) - { + { var_dump($name); } } diff --git a/ext/mysqli/tests/bug71863.phpt b/ext/mysqli/tests/bug71863.phpt index ea0a78faeb..18465e996b 100644 --- a/ext/mysqli/tests/bug71863.phpt +++ b/ext/mysqli/tests/bug71863.phpt @@ -18,7 +18,7 @@ $req = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); // create db and table for test mysqli_query($req, "DROP TABLE IF EXISTS test_bug_71863") or die(mysqli_error($req)); mysqli_query($req, "CREATE TABLE test_bug_71863 (id INT UNSIGNED NOT NULL DEFAULT 0)") or die(mysqli_error($req)); - + // segfault if EXPLAIN + "Unknown column" error mysqli_query($req, "EXPLAIN SELECT `id` FROM `test_bug_71863` WHERE `owner_id` = '2' AND `object_id` = '1' AND type = '0'") or die(mysqli_error($req)."\n"); diff --git a/ext/mysqli/tests/bug72489.phpt b/ext/mysqli/tests/bug72489.phpt index 744a504c8d..cd941b2881 100644 --- a/ext/mysqli/tests/bug72489.phpt +++ b/ext/mysqli/tests/bug72489.phpt @@ -45,9 +45,9 @@ while ($stmt->fetch()) { echo "Finished 1\n"; $newArray = array(); - + echo "Finished 2\n"; - + ?> --CLEAN-- <?php diff --git a/ext/mysqli/tests/bug73949.phpt b/ext/mysqli/tests/bug73949.phpt index 9de75ecd2b..e6bcc4ff62 100644 --- a/ext/mysqli/tests/bug73949.phpt +++ b/ext/mysqli/tests/bug73949.phpt @@ -12,7 +12,7 @@ require_once("connect.inc"); class cc{ function __construct($c=null){ - } + } }; $i=mysqli_connect('p:'.$host, $user, $passwd, $db); $res=mysqli_query($i, "SHOW STATUS LIKE 'Connections'"); diff --git a/ext/mysqli/tests/bug_bits.phpt b/ext/mysqli/tests/bug_bits.phpt index 8a56469772..59752e4159 100644 --- a/ext/mysqli/tests/bug_bits.phpt +++ b/ext/mysqli/tests/bug_bits.phpt @@ -42,7 +42,7 @@ while ($row = $res->fetch_assoc()) { $link->close(); -echo "Done\n"; +echo "Done\n"; ?> --CLEAN-- <?php diff --git a/ext/mysqli/tests/mysqli_begin_transaction.phpt b/ext/mysqli/tests/mysqli_begin_transaction.phpt index 6c0508172f..57f0595238 100644 --- a/ext/mysqli/tests/mysqli_begin_transaction.phpt +++ b/ext/mysqli/tests/mysqli_begin_transaction.phpt @@ -97,7 +97,7 @@ if (!have_innodb($link)) $res = mysqli_query($link, "SELECT id FROM test WHERE id = 2"); } } - + if (!mysqli_begin_transaction($link, -1)) { printf("[019] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); } diff --git a/ext/mysqli/tests/mysqli_connect.phpt b/ext/mysqli/tests/mysqli_connect.phpt index 8b1c923304..3ae0050017 100644 --- a/ext/mysqli/tests/mysqli_connect.phpt +++ b/ext/mysqli/tests/mysqli_connect.phpt @@ -1,9 +1,9 @@ --TEST-- mysqli_connect() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt index d60ff3876a..a43b8da460 100644 --- a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt +++ b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt @@ -1,9 +1,9 @@ --TEST-- new mysqli() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_get_client_version.phpt b/ext/mysqli/tests/mysqli_get_client_version.phpt index 9fb1040580..3cf7ac2cc2 100644 --- a/ext/mysqli/tests/mysqli_get_client_version.phpt +++ b/ext/mysqli/tests/mysqli_get_client_version.phpt @@ -4,10 +4,10 @@ mysqli_get_client_version() <?php require_once('skipif.inc'); ?> <?php require_once('skipifemb.inc'); ?> --FILE-- -<?php +<?php if (!is_int($info = mysqli_get_client_version()) || ($info < 100)) printf("[001] Expecting int/any_non_empty, got %s/%s\n", gettype($info), $info); - + print "done!"; ?> --EXPECT-- diff --git a/ext/mysqli/tests/mysqli_get_host_info.phpt b/ext/mysqli/tests/mysqli_get_host_info.phpt index 0dd7291342..81b5ac1b4d 100644 --- a/ext/mysqli/tests/mysqli_get_host_info.phpt +++ b/ext/mysqli/tests/mysqli_get_host_info.phpt @@ -23,7 +23,7 @@ require_once('skipifconnectfailure.inc'); if ($IS_MYSQLND && $host != 'localhost' && $host != '127.0.0.1' && $port != '' && $host != "" && strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { /* this should be a TCP/IP connection and not a Unix Socket (or SHM or Named Pipe) */ if (!stristr($info, "TCP/IP")) - printf("[004] Should be a TCP/IP connection but mysqlnd says '%s'\n", $info); + printf("[004] Should be a TCP/IP connection but mysqlnd says '%s'\n", $info); } print "done!"; ?> diff --git a/ext/mysqli/tests/mysqli_init.phpt b/ext/mysqli/tests/mysqli_init.phpt index c6774c311f..47550dcc6e 100644 --- a/ext/mysqli/tests/mysqli_init.phpt +++ b/ext/mysqli/tests/mysqli_init.phpt @@ -1,9 +1,9 @@ --TEST-- mysqli_init() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- 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 7b98713046..8203e0c4d9 100644 --- a/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt +++ b/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt @@ -45,12 +45,12 @@ if (!$IS_MYSQLND) printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); continue; } - + if (!mysqli_query($link, sprintf("CREATE TABLE test (id %s)", $data[0]))) { printf("[004] TODO [%d] %s\n", mysqli_errno($link), mysqli_error($link)); continue; } - + if (!mysqli_query($link, sprintf("INSERT INTO test(id) VALUES (%f)", $data[1]))) { printf("[005] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); continue; @@ -65,7 +65,7 @@ if (!$IS_MYSQLND) mysqli_free_result($res); if ($row['id'] !== $data[1]) { - printf("[007] Expecting %s - %s/%s got %s/%s\n", + printf("[007] Expecting %s - %s/%s got %s/%s\n", $name, $data[1], gettype($data[1]), $row['id'], gettype($row['id'])); } @@ -81,7 +81,7 @@ if (!$IS_MYSQLND) printf("[009] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); continue; } - + if (!$res = mysqli_query($link, "SELECT id FROM test")) { printf("[010] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); continue; @@ -91,14 +91,14 @@ if (!$IS_MYSQLND) mysqli_free_result($res); if (!is_string($row['id']) || ($row['id'] != $data[1])) { - printf("[011] Expecting %s - %s/string got %s/%s\n", + printf("[011] Expecting %s - %s/string got %s/%s\n", $name, $data[1], $row['id'], gettype($row['id'])); - } - mysqli_close($link); + } + mysqli_close($link); } - + print "done!"; ?> --CLEAN-- diff --git a/ext/mysqli/tests/mysqli_stmt_multires.phpt b/ext/mysqli/tests/mysqli_stmt_multires.phpt index b95bfd7f91..8564383bc9 100644 --- a/ext/mysqli/tests/mysqli_stmt_multires.phpt +++ b/ext/mysqli/tests/mysqli_stmt_multires.phpt @@ -22,7 +22,7 @@ require_once('skipifconnectfailure.inc'); if (!$link->query("CREATE PROCEDURE p123() BEGIN SELECT id+12, CONCAT_WS('-',label,'ahoi') FROM test ORDER BY id LIMIT 1; SELECT id + 42, CONCAT_WS('---',label, label) FROM test ORDER BY id LIMIT 1; END")) { printf("[002] [%d] %s\n", $link->error, $link->errno); } - + if (!($stmt = $link->prepare("CALL p123"))) { printf("[003] [%d] %s\n", $stmt->error, $stmt->errno); } diff --git a/ext/odbc/tests/bug47803.phpt b/ext/odbc/tests/bug47803.phpt index ec023a5c87..aa5925df7f 100644 --- a/ext/odbc/tests/bug47803.phpt +++ b/ext/odbc/tests/bug47803.phpt @@ -73,7 +73,7 @@ if (!$result) { print ('[sql] prep: '.$sql); goto out; } -foreach ($upd_params as $k) { +foreach ($upd_params as $k) { if(!odbc_execute($result, array($k['id']))) { print ('[sql] exec: '."array({$k['id']})"); goto out; diff --git a/ext/odbc/tests/bug60616.phpt b/ext/odbc/tests/bug60616.phpt index 95c72049e3..16536881af 100644 --- a/ext/odbc/tests/bug60616.phpt +++ b/ext/odbc/tests/bug60616.phpt @@ -2,7 +2,7 @@ odbc_exec(): Getting accurate unicode data from query --SKIPIF-- <?php include 'skipif.inc'; ?> -<?php +<?php if ("unixODBC" != ODBC_TYPE) { die("skip ODBC_TYPE != unixODBC"); } diff --git a/ext/odbc/tests/odbc_exec_001.phpt b/ext/odbc/tests/odbc_exec_001.phpt index cfb13876a2..dd1fa26a67 100644 --- a/ext/odbc/tests/odbc_exec_001.phpt +++ b/ext/odbc/tests/odbc_exec_001.phpt @@ -2,7 +2,7 @@ odbc_exec(): Basic test --SKIPIF-- <?php include 'skipif.inc'; ?> -<?php +<?php if ("unixODBC" != ODBC_TYPE) { die("skip ODBC_TYPE != unixODBC"); } diff --git a/ext/opcache/tests/blacklist-win32.phpt b/ext/opcache/tests/blacklist-win32.phpt index fab0698f7f..7fbe5dbd29 100644 --- a/ext/opcache/tests/blacklist-win32.phpt +++ b/ext/opcache/tests/blacklist-win32.phpt @@ -13,8 +13,8 @@ opcache.file_cache_only=0 <?php $conf = opcache_get_configuration(); $conf = $conf['blacklist']; -$conf[3] = preg_replace("!^\\Q".dirname(__FILE__)."\\E!", "__DIR__", $conf[3]); -$conf[4] = preg_replace("!^\\Q".dirname(__FILE__)."\\E!", "__DIR__", $conf[4]); +$conf[3] = preg_replace("!^\\Q".dirname(__FILE__)."\\E!", "__DIR__", $conf[3]); +$conf[4] = preg_replace("!^\\Q".dirname(__FILE__)."\\E!", "__DIR__", $conf[4]); print_r($conf); include("blacklist.inc"); $status = opcache_get_status(); diff --git a/ext/opcache/tests/blacklist.phpt b/ext/opcache/tests/blacklist.phpt index 4e9a0f16fc..da3ef47c99 100644 --- a/ext/opcache/tests/blacklist.phpt +++ b/ext/opcache/tests/blacklist.phpt @@ -13,8 +13,8 @@ opcache.file_cache_only=0 <?php $conf = opcache_get_configuration(); $conf = $conf['blacklist']; -$conf[3] = preg_replace("!^\\Q".dirname(__FILE__)."\\E!", "__DIR__", $conf[3]); -$conf[4] = preg_replace("!^\\Q".dirname(__FILE__)."\\E!", "__DIR__", $conf[4]); +$conf[3] = preg_replace("!^\\Q".dirname(__FILE__)."\\E!", "__DIR__", $conf[3]); +$conf[4] = preg_replace("!^\\Q".dirname(__FILE__)."\\E!", "__DIR__", $conf[4]); print_r($conf); include("blacklist.inc"); $status = opcache_get_status(); diff --git a/ext/opcache/tests/bug64482.phpt b/ext/opcache/tests/bug64482.phpt index fa722f6d45..e328c9fc1d 100644 --- a/ext/opcache/tests/bug64482.phpt +++ b/ext/opcache/tests/bug64482.phpt @@ -6,7 +6,7 @@ opcache.enable_cli=1 --SKIPIF-- <?php require_once('skipif.inc'); ?> --FILE-- -<?php +<?php include 'bug64482.inc'; echo "\n"; include 'php://filter/read=string.toupper/resource=bug64482.inc'; diff --git a/ext/opcache/tests/bug66338.phpt b/ext/opcache/tests/bug66338.phpt index 6553f83f29..8b30391c4f 100644 --- a/ext/opcache/tests/bug66338.phpt +++ b/ext/opcache/tests/bug66338.phpt @@ -9,17 +9,17 @@ opcache.enable=0 $root = str_replace('.php', "", __FILE__); $base = basename( $root ); -file_put_contents( "$root-Officials.inc", '<?php +file_put_contents( "$root-Officials.inc", '<?php class Officials { static function getLeader() { return LocalTerms::GOV_LEADER; } } ' ); -file_put_contents( "$root-clientUS.php", '<?php +file_put_contents( "$root-clientUS.php", '<?php class LocalTerms { const GOV_LEADER = "Barack Hussein Obama II"; } require \''.$root.'-Officials.inc\'; printf( "The President of the USA is %s\n", Officials::getLeader() ); ' ); -file_put_contents( "$root-clientUK.php", '<?php +file_put_contents( "$root-clientUK.php", '<?php class LocalTerms { const GOV_LEADER = "David William Donald Cameron"; } require \''.$root.'-Officials.inc\'; printf( "The Prime Minister of the UK is %s\n", Officials::getLeader() ); diff --git a/ext/opcache/tests/bug69038.phpt b/ext/opcache/tests/bug69038.phpt index ab625d74b0..1670a9eca6 100644 --- a/ext/opcache/tests/bug69038.phpt +++ b/ext/opcache/tests/bug69038.phpt @@ -9,7 +9,7 @@ opcache.optimization_level=-1 --FILE-- <?php function a($a = "bad") { - + switch (PHP_OS) { case "LALALALA" : return "LALALAL"; case PHP_OS: return "okey"; diff --git a/ext/opcache/tests/bug74980.phpt b/ext/opcache/tests/bug74980.phpt index 40fd3cd537..e82e234bdd 100644 --- a/ext/opcache/tests/bug74980.phpt +++ b/ext/opcache/tests/bug74980.phpt @@ -16,7 +16,7 @@ class A while ($undef) { $arr[][] = NULL; } - + foreach ($arr as $a) { bar($a + []); } diff --git a/ext/opcache/tests/compact_literals.phpt b/ext/opcache/tests/compact_literals.phpt index 367331f742..0aabb22b50 100644 --- a/ext/opcache/tests/compact_literals.phpt +++ b/ext/opcache/tests/compact_literals.phpt @@ -65,7 +65,7 @@ function get_eol_define() { get_eol_define(); define("EOL", MY_EOL); -echo "constants define" . ":" . EOL; +echo "constants define" . ":" . EOL; echo "define " . "TEST" . EOL; define("TEST", "TEST"); @@ -150,7 +150,7 @@ var_dump($h::H); var_dump(CH::H); echo "-->I" . PHP_EOL; -$h = geti(); +$h = geti(); $h->H(); var_dump($h::H); var_dump(CI::H); diff --git a/ext/opcache/tests/opt/sccp_013.phpt b/ext/opcache/tests/opt/sccp_013.phpt index d421743e18..18b57a4185 100644 --- a/ext/opcache/tests/opt/sccp_013.phpt +++ b/ext/opcache/tests/opt/sccp_013.phpt @@ -16,7 +16,7 @@ function loadEntities($entity_information) { var_dump((bool)($entity_types[$info])); } -loadEntities(array("first", "second")); +loadEntities(array("first", "second")); ?> --EXPECT-- bool(true) diff --git a/ext/opcache/tests/opt/sccp_014.phpt b/ext/opcache/tests/opt/sccp_014.phpt index 76592ea444..2898239e7c 100644 --- a/ext/opcache/tests/opt/sccp_014.phpt +++ b/ext/opcache/tests/opt/sccp_014.phpt @@ -17,7 +17,7 @@ function loadEntities($entity_information) { var_dump((bool)($entity_types->a)); } -loadEntities(array("first", "second")); +loadEntities(array("first", "second")); ?> --EXPECT-- bool(false) diff --git a/ext/opcache/tests/opt/sccp_015.phpt b/ext/opcache/tests/opt/sccp_015.phpt index 3e229fef00..b31f4edc15 100644 --- a/ext/opcache/tests/opt/sccp_015.phpt +++ b/ext/opcache/tests/opt/sccp_015.phpt @@ -19,7 +19,7 @@ function loadEntities($entity_information) { } } -loadEntities(array("first", "second")); +loadEntities(array("first", "second")); ?> --EXPECT-- bool(false) diff --git a/ext/opcache/tests/opt/sccp_021.phpt b/ext/opcache/tests/opt/sccp_021.phpt index 38d93d2264..327cbc9a91 100644 --- a/ext/opcache/tests/opt/sccp_021.phpt +++ b/ext/opcache/tests/opt/sccp_021.phpt @@ -21,7 +21,7 @@ class A { $queries[$i] .= $query_token; } - return; + return; } } ?> diff --git a/ext/openssl/tests/001.phpt b/ext/openssl/tests/001.phpt index 7f5af24ae6..77b0f32183 100644 --- a/ext/openssl/tests/001.phpt +++ b/ext/openssl/tests/001.phpt @@ -1,9 +1,9 @@ --TEST-- OpenSSL private key functions --SKIPIF-- -<?php -if (!extension_loaded("openssl")) die("skip"); -if (!@openssl_pkey_new()) die("skip cannot create private key"); +<?php +if (!extension_loaded("openssl")) die("skip"); +if (!@openssl_pkey_new()) die("skip cannot create private key"); ?> --FILE-- <?php diff --git a/ext/openssl/tests/bug25614.phpt b/ext/openssl/tests/bug25614.phpt index a43130708b..6adc0f39c1 100644 --- a/ext/openssl/tests/bug25614.phpt +++ b/ext/openssl/tests/bug25614.phpt @@ -1,12 +1,12 @@ --TEST-- openssl: get public key from generated private key --SKIPIF-- -<?php -if (!extension_loaded("openssl")) die("skip"); -if (!@openssl_pkey_new()) die("skip cannot create private key"); +<?php +if (!extension_loaded("openssl")) die("skip"); +if (!@openssl_pkey_new()) die("skip cannot create private key"); ?> --FILE-- -<?php +<?php $priv = openssl_pkey_new(); $pub = openssl_pkey_get_public($priv); ?> diff --git a/ext/openssl/tests/bug28382.phpt b/ext/openssl/tests/bug28382.phpt index c3888e962b..1ff839bf4c 100644 --- a/ext/openssl/tests/bug28382.phpt +++ b/ext/openssl/tests/bug28382.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #28382 (openssl_x509_parse extensions support) --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip"); ?> --FILE-- diff --git a/ext/openssl/tests/bug36732.phpt b/ext/openssl/tests/bug36732.phpt index 72ca6904a9..2de0346bae 100644 --- a/ext/openssl/tests/bug36732.phpt +++ b/ext/openssl/tests/bug36732.phpt @@ -1,11 +1,11 @@ --TEST-- Bug #36732 (add support for req_extensions in openss_csr_new and sign) --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip"); ?> --FILE-- -<?php +<?php $configargs = array( "req_extensions" => "v3_req", "x509_extensions" => "usr_cert", diff --git a/ext/openssl/tests/bug37820.phpt b/ext/openssl/tests/bug37820.phpt index d85a935ff3..2f1998a1bb 100644 --- a/ext/openssl/tests/bug37820.phpt +++ b/ext/openssl/tests/bug37820.phpt @@ -1,11 +1,11 @@ --TEST-- openssl_sign/verify: accept different algos --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip"); ?> --FILE-- -<?php +<?php $dir = dirname(__FILE__); $file_pub = $dir . '/bug37820cert.pem'; $file_key = $dir . '/bug37820key.pem'; diff --git a/ext/openssl/tests/bug38255.phpt b/ext/openssl/tests/bug38255.phpt index 9eca6594a9..3969d993bf 100644 --- a/ext/openssl/tests/bug38255.phpt +++ b/ext/openssl/tests/bug38255.phpt @@ -1,12 +1,12 @@ --TEST-- openssl key from zval leaks --SKIPIF-- -<?php -if (!extension_loaded("openssl")) die("skip"); +<?php +if (!extension_loaded("openssl")) die("skip"); ?> --FILE-- <?php -$pub_key_id = false; +$pub_key_id = false; $signature = ''; $ok = openssl_verify("foo", $signature, $pub_key_id, OPENSSL_ALGO_MD5); diff --git a/ext/openssl/tests/bug38261.phpt b/ext/openssl/tests/bug38261.phpt index 6691947320..dec675cebc 100644 --- a/ext/openssl/tests/bug38261.phpt +++ b/ext/openssl/tests/bug38261.phpt @@ -1,8 +1,8 @@ --TEST-- openssl key from zval leaks --SKIPIF-- -<?php -if (!extension_loaded("openssl")) die("skip"); +<?php +if (!extension_loaded("openssl")) die("skip"); ?> --FILE-- <?php diff --git a/ext/openssl/tests/bug39217.phpt b/ext/openssl/tests/bug39217.phpt index 47f234d769..b9c5e50a73 100644 --- a/ext/openssl/tests/bug39217.phpt +++ b/ext/openssl/tests/bug39217.phpt @@ -1,11 +1,11 @@ --TEST-- Bug #39217 (Large serial number return -1) --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip"); ?> --FILE-- -<?php +<?php $dir = dirname(__FILE__); $certs = array('bug39217cert2.txt', 'bug39217cert1.txt'); foreach($certs as $cert) { diff --git a/ext/openssl/tests/bug41033.phpt b/ext/openssl/tests/bug41033.phpt index f52a4c7d27..6f8ebc64c3 100644 --- a/ext/openssl/tests/bug41033.phpt +++ b/ext/openssl/tests/bug41033.phpt @@ -1,7 +1,7 @@ --TEST-- #41033, enable signing with DSA keys --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip, openssl required"); ?> --FILE-- diff --git a/ext/openssl/tests/bug41353.phpt b/ext/openssl/tests/bug41353.phpt index 2f5ca2007e..36a7be6e22 100644 --- a/ext/openssl/tests/bug41353.phpt +++ b/ext/openssl/tests/bug41353.phpt @@ -1,8 +1,8 @@ --TEST-- Bug #41353 (openssl_pkcs12_read() does not verify the type of the first arg) --SKIPIF-- -<?php -if (!extension_loaded("openssl")) die("skip"); +<?php +if (!extension_loaded("openssl")) die("skip"); ?> --FILE-- <?php diff --git a/ext/openssl/tests/bug46127.phpt b/ext/openssl/tests/bug46127.phpt index f11d8baf0b..d0172371f6 100644 --- a/ext/openssl/tests/bug46127.phpt +++ b/ext/openssl/tests/bug46127.phpt @@ -1,7 +1,7 @@ --TEST-- #46127, openssl_sign/verify: accept different algos --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip openssl not loaded"); if (!function_exists("proc_open")) die("skip no proc_open"); ?> diff --git a/ext/openssl/tests/bug48182.phpt b/ext/openssl/tests/bug48182.phpt index dcadaaa6b9..0357720003 100644 --- a/ext/openssl/tests/bug48182.phpt +++ b/ext/openssl/tests/bug48182.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #48182: ssl handshake fails during asynchronous socket connection --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip openssl not loaded"); if (!function_exists("proc_open")) die("skip no proc_open"); ?> diff --git a/ext/openssl/tests/bug54992.phpt b/ext/openssl/tests/bug54992.phpt index 01369dca00..c07bbf8cba 100644 --- a/ext/openssl/tests/bug54992.phpt +++ b/ext/openssl/tests/bug54992.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #54992: Stream not closed and error not returned when SSL CN_match fails --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip openssl not loaded"); if (!function_exists("proc_open")) die("skip no proc_open"); ?> diff --git a/ext/openssl/tests/bug61124.phpt b/ext/openssl/tests/bug61124.phpt index 4b6194bdb4..9c7d0ac483 100644 --- a/ext/openssl/tests/bug61124.phpt +++ b/ext/openssl/tests/bug61124.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #61124: Segmentation fault with openssl_decrypt --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip"); --FILE-- <?php diff --git a/ext/openssl/tests/bug65729.phpt b/ext/openssl/tests/bug65729.phpt index 5e91197b70..cffba43dfe 100644 --- a/ext/openssl/tests/bug65729.phpt +++ b/ext/openssl/tests/bug65729.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #65729: CN_match gives false positive when wildcard is used --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip openssl not loaded"); if (!function_exists("proc_open")) die("skip no proc_open"); ?> diff --git a/ext/openssl/tests/bug66501.phpt b/ext/openssl/tests/bug66501.phpt index 34dac6d44a..e023ee1480 100644 --- a/ext/openssl/tests/bug66501.phpt +++ b/ext/openssl/tests/bug66501.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #66501: EC private key support in openssl_sign --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip"); if (!defined('OPENSSL_KEYTYPE_EC')) die("skip no EC available"); ?> diff --git a/ext/openssl/tests/bug68912.phpt b/ext/openssl/tests/bug68912.phpt index dae57e9fdc..724a96017a 100644 --- a/ext/openssl/tests/bug68912.phpt +++ b/ext/openssl/tests/bug68912.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #68912 (Segmentation fault at openssl_spki_new) --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip"); if (!@openssl_pkey_new()) die("skip cannot create private key"); ?> @@ -9,8 +9,8 @@ if (!@openssl_pkey_new()) die("skip cannot create private key"); <?php $var1=fopen(__FILE__, 'r'); -$var2=2; -$var3=3; +$var2=2; +$var3=3; openssl_spki_new($var1, $var2, $var3); ?> diff --git a/ext/openssl/tests/bug68920.phpt b/ext/openssl/tests/bug68920.phpt index 4c6271819b..34e07a4532 100644 --- a/ext/openssl/tests/bug68920.phpt +++ b/ext/openssl/tests/bug68920.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #68920: peer_fingerprint input checks should be strict --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip openssl not loaded"); if (!function_exists("proc_open")) die("skip no proc_open"); ?> diff --git a/ext/openssl/tests/bug71475.phpt b/ext/openssl/tests/bug71475.phpt index e959371c4c..659544297b 100644 --- a/ext/openssl/tests/bug71475.phpt +++ b/ext/openssl/tests/bug71475.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #71475: openssl_seal() uninitialized memory usage --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip openssl not loaded"); ?> --FILE-- diff --git a/ext/openssl/tests/bug72333.phpt b/ext/openssl/tests/bug72333.phpt index 1350df8501..e478e3b925 100644 --- a/ext/openssl/tests/bug72333.phpt +++ b/ext/openssl/tests/bug72333.phpt @@ -34,11 +34,11 @@ CODE; $clientCode = <<<'CODE' $context = stream_context_create(['ssl' => ['verify_peer' => false, 'peer_name' => 'bug54992.local']]); - + phpt_wait(); $fp = stream_socket_client("ssl://127.0.0.1:10011", $errornum, $errorstr, 3000, STREAM_CLIENT_CONNECT, $context); stream_set_blocking($fp, false); - + function blocking_fwrite($fp, $buf) { $write = [$fp]; $total = 0; diff --git a/ext/openssl/tests/bug73072.phpt b/ext/openssl/tests/bug73072.phpt index 8f001829f2..06c1c2550c 100644 --- a/ext/openssl/tests/bug73072.phpt +++ b/ext/openssl/tests/bug73072.phpt @@ -16,9 +16,9 @@ $serverCode = <<<'CODE' "domain2.com" => __DIR__ . "/not_existing.pem", ] ]]); - + $server = stream_socket_server('tls://127.0.0.1:64322', $errno, $errstr, $flags, $ctx); - + phpt_notify(); @stream_socket_accept($server, 3); // if there is a segfault, this won't be called diff --git a/ext/openssl/tests/bug74903.phpt b/ext/openssl/tests/bug74903.phpt index 40b14f0acf..7a20b8693d 100644 --- a/ext/openssl/tests/bug74903.phpt +++ b/ext/openssl/tests/bug74903.phpt @@ -1,8 +1,8 @@ --TEST-- Bug #74903 openssl_pkcs7_encrypt() uses different EOL than before --SKIPIF-- -<?php -if (!extension_loaded("openssl")) die("skip"); +<?php +if (!extension_loaded("openssl")) die("skip"); ?> --FILE-- <?php diff --git a/ext/openssl/tests/openssl_csr_get_subject_basic.phpt b/ext/openssl/tests/openssl_csr_get_subject_basic.phpt index 7046085618..eba4a7ac8d 100644 --- a/ext/openssl/tests/openssl_csr_get_subject_basic.phpt +++ b/ext/openssl/tests/openssl_csr_get_subject_basic.phpt @@ -1,7 +1,7 @@ --TEST-- openssl_csr_get_subject() tests --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip"); ?> --FILE-- @@ -39,7 +39,7 @@ $csr_file = file_get_contents(dirname(__FILE__) . '/cert.csr'); var_dump(openssl_csr_get_subject($csr_file)); var_dump(openssl_csr_get_subject($csr, false)); ?> ---EXPECT-- +--EXPECT-- array(6) { ["C"]=> string(2) "NL" diff --git a/ext/openssl/tests/openssl_csr_new_basic.phpt b/ext/openssl/tests/openssl_csr_new_basic.phpt index 24db4a4afc..816c6f9d90 100644 --- a/ext/openssl/tests/openssl_csr_new_basic.phpt +++ b/ext/openssl/tests/openssl_csr_new_basic.phpt @@ -25,7 +25,7 @@ var_dump(openssl_csr_new(["countryName" => "DE"], $x, $conf + ["x509_extensions" echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: openssl_csr_new() expects parameter 1 to be array, int given in %s on line %d NULL diff --git a/ext/openssl/tests/openssl_decrypt_error.phpt b/ext/openssl/tests/openssl_decrypt_error.phpt index b34397a651..eab67f403c 100644 --- a/ext/openssl/tests/openssl_decrypt_error.phpt +++ b/ext/openssl/tests/openssl_decrypt_error.phpt @@ -12,7 +12,7 @@ $iv = str_repeat("\0", openssl_cipher_iv_length($method)); $encrypted = openssl_encrypt($data, $method, $password); var_dump($encrypted); /* Not passing $iv should be the same as all-NULL iv, but with a warning */ -var_dump(openssl_encrypt($data, $method, $password, 0, $iv)); +var_dump(openssl_encrypt($data, $method, $password, 0, $iv)); var_dump(openssl_decrypt($encrypted, $method, $wrong)); var_dump(openssl_decrypt($encrypted, $wrong, $password)); var_dump(openssl_decrypt($wrong, $method, $password)); diff --git a/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt b/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt index 430de54dfd..0a745e8c3d 100644 --- a/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt +++ b/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt @@ -1,7 +1,7 @@ --TEST-- Testing peer fingerprint on connection --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip openssl not loaded"); if (!function_exists("proc_open")) die("skip no proc_open"); ?> diff --git a/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt b/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt index 3e76efe22d..f892c6854f 100644 --- a/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt +++ b/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt @@ -7,13 +7,13 @@ openssl_pkcs7_decrypt() and invalid parameters function myErrorHandler($errno, $errstr, $errfile, $errline) { var_dump($errstr); -} -set_error_handler("myErrorHandler"); +} +set_error_handler("myErrorHandler"); -$a = 1; -$b = 1; -$c = new stdclass; -$d = new stdclass; +$a = 1; +$b = 1; +$c = new stdclass; +$d = new stdclass; var_dump(openssl_pkcs7_decrypt($a, $b, $c, $d)); var_dump($c); @@ -25,7 +25,7 @@ var_dump(openssl_pkcs7_decrypt($a, $b, 0, 0)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(57) "Object of class stdClass could not be converted to string" string(66) "openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert" bool(false) diff --git a/ext/openssl/tests/openssl_pkey_derive-ecdh.phpt b/ext/openssl/tests/openssl_pkey_derive-ecdh.phpt index d26e479ee8..387992423e 100644 --- a/ext/openssl/tests/openssl_pkey_derive-ecdh.phpt +++ b/ext/openssl/tests/openssl_pkey_derive-ecdh.phpt @@ -14,7 +14,7 @@ x3Nz35sz8u0CE6befv+Fxo5ORq373v9eDzp62Z8g -----END EC PRIVATE KEY----- "); -$pub = openssl_pkey_get_public("-----BEGIN PUBLIC KEY----- +$pub = openssl_pkey_get_public("-----BEGIN PUBLIC KEY----- MIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQBGs5c8VCdd3VcOAUhuCzEB6uMUDob lG5vtncWqvHfcnsR4uHEuufl24rbraVFyVeGr/BV0AfUnnhKGnaEtSDG9h4BMw5A vHiBzBCZUlA1TUMSmNpedutkZul4h6gYNrzFtfjmbqSnC0732YgUIrr4yueOSL2E diff --git a/ext/openssl/tests/openssl_seal_basic.phpt b/ext/openssl/tests/openssl_seal_basic.phpt index 4f1958a365..1899ebac3b 100644 --- a/ext/openssl/tests/openssl_seal_basic.phpt +++ b/ext/openssl/tests/openssl_seal_basic.phpt @@ -29,7 +29,7 @@ var_dump(openssl_seal($data, $sealed, $ekeys, array($wrong))); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: openssl_seal(): not a public key (1th member of pubkeys) in %s on line %d bool(false) diff --git a/ext/openssl/tests/openssl_sign_basic.phpt b/ext/openssl/tests/openssl_sign_basic.phpt index 3d41ee1d34..0200e5ba6e 100644 --- a/ext/openssl/tests/openssl_sign_basic.phpt +++ b/ext/openssl/tests/openssl_sign_basic.phpt @@ -12,7 +12,7 @@ var_dump(openssl_sign($data, $sign, $privkey)); // no output var_dump(openssl_sign($data, $sign, $wrong)); var_dump(openssl_sign(array(), $sign, $privkey)); ?> ---EXPECTF-- +--EXPECTF-- bool(true) Warning: openssl_sign(): supplied key param cannot be coerced into a private key in %s on line %d diff --git a/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt b/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt index 677f4d8905..9634663556 100644 --- a/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt +++ b/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt @@ -3,7 +3,7 @@ int openssl_x509_checkpurpose ( mixed $x509cert , int $purpose [, array $cainfo --CREDITS-- marcosptf - <marcosptf@yahoo.com.br> --SKIPIF-- -<?php if (!extension_loaded("openssl")) print "skip"; +<?php if (!extension_loaded("openssl")) print "skip"; if (OPENSSL_VERSION_NUMBER < 0x10000000) die("skip Output requires OpenSSL 1.0"); ?> --FILE-- diff --git a/ext/openssl/tests/openssl_x509_read_basic.phpt b/ext/openssl/tests/openssl_x509_read_basic.phpt index 5f530534ff..72a62f7079 100644 --- a/ext/openssl/tests/openssl_x509_read_basic.phpt +++ b/ext/openssl/tests/openssl_x509_read_basic.phpt @@ -6,7 +6,7 @@ openssl_x509_read() tests <?php $fp = fopen(dirname(__FILE__) . "/cert.crt","r"); $a = fread($fp,8192); -fclose($fp); +fclose($fp); $b = "file://" . dirname(__FILE__) . "/cert.crt"; $c = "invalid cert"; diff --git a/ext/openssl/tests/peer_verification.phpt b/ext/openssl/tests/peer_verification.phpt index 3abc191667..db2a773465 100644 --- a/ext/openssl/tests/peer_verification.phpt +++ b/ext/openssl/tests/peer_verification.phpt @@ -1,7 +1,7 @@ --TEST-- Peer verification enabled for client streams --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip openssl not loaded"); if (!function_exists("proc_open")) die("skip no proc_open"); ?> diff --git a/ext/openssl/tests/san_peer_matching.phpt b/ext/openssl/tests/san_peer_matching.phpt index f048c4e0f1..87410dd16d 100644 --- a/ext/openssl/tests/san_peer_matching.phpt +++ b/ext/openssl/tests/san_peer_matching.phpt @@ -1,7 +1,7 @@ --TEST-- Peer verification matches SAN names --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip openssl not loaded"); if (!function_exists("proc_open")) die("skip no proc_open"); ?> diff --git a/ext/openssl/tests/tlsv1.0_wrapper.phpt b/ext/openssl/tests/tlsv1.0_wrapper.phpt index 952a288305..6be29848bc 100644 --- a/ext/openssl/tests/tlsv1.0_wrapper.phpt +++ b/ext/openssl/tests/tlsv1.0_wrapper.phpt @@ -1,7 +1,7 @@ --TEST-- tlsv1.0 stream wrapper --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip openssl not loaded"); if (!function_exists("proc_open")) die("skip no proc_open"); ?> diff --git a/ext/openssl/tests/tlsv1.1_wrapper.phpt b/ext/openssl/tests/tlsv1.1_wrapper.phpt index eedf54fea7..25c2ee27f0 100644 --- a/ext/openssl/tests/tlsv1.1_wrapper.phpt +++ b/ext/openssl/tests/tlsv1.1_wrapper.phpt @@ -1,7 +1,7 @@ --TEST-- tlsv1.1 stream wrapper --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip openssl not loaded"); if (!function_exists("proc_open")) die("skip no proc_open"); ?> @@ -32,10 +32,10 @@ $clientCode = <<<'CODE' $client = stream_socket_client("tlsv1.1://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx); var_dump($client); - + $client = @stream_socket_client("sslv3://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx); var_dump($client); - + $client = @stream_socket_client("tlsv1.2://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx); var_dump($client); CODE; diff --git a/ext/openssl/tests/tlsv1.2_wrapper.phpt b/ext/openssl/tests/tlsv1.2_wrapper.phpt index 3d7b3ba26c..30e9e00ac7 100644 --- a/ext/openssl/tests/tlsv1.2_wrapper.phpt +++ b/ext/openssl/tests/tlsv1.2_wrapper.phpt @@ -1,7 +1,7 @@ --TEST-- tlsv1.2 stream wrapper --SKIPIF-- -<?php +<?php if (!extension_loaded("openssl")) die("skip openssl not loaded"); if (!function_exists("proc_open")) die("skip no proc_open"); ?> @@ -32,10 +32,10 @@ $clientCode = <<<'CODE' $client = stream_socket_client("tlsv1.2://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx); var_dump($client); - + $client = @stream_socket_client("sslv3://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx); var_dump($client); - + $client = @stream_socket_client("tlsv1.1://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx); var_dump($client); CODE; diff --git a/ext/pcntl/tests/001.phpt b/ext/pcntl/tests/001.phpt index fb1006e4bd..6aedbaf33b 100644 --- a/ext/pcntl/tests/001.phpt +++ b/ext/pcntl/tests/001.phpt @@ -2,11 +2,11 @@ Test pcntl wait functionality --SKIPIF-- <?php - if (!extension_loaded("pcntl")) print "skip"; + if (!extension_loaded("pcntl")) print "skip"; elseif (!function_exists("posix_kill")) print "skip posix_kill() not available"; ?> --FILE-- -<?php +<?php function test_exit_waits(){ print "\n\nTesting pcntl_wifexited and wexitstatus...."; @@ -25,7 +25,7 @@ function test_exit_signal(){ print "\n\nTesting pcntl_wifsignaled...."; $pid=pcntl_fork(); - + if ($pid==0) { sleep(10); exit; @@ -47,7 +47,7 @@ function test_stop_signal(){ print "\n\nTesting pcntl_wifstopped and pcntl_wstopsig...."; $pid=pcntl_fork(); - + if ($pid==0) { sleep(1); exit; diff --git a/ext/pcntl/tests/async_signals.phpt b/ext/pcntl/tests/async_signals.phpt index 86b006295d..8e30204ab4 100644 --- a/ext/pcntl/tests/async_signals.phpt +++ b/ext/pcntl/tests/async_signals.phpt @@ -2,7 +2,7 @@ Asynchronous signal handling through VM interrupts --SKIPIF-- <?php - if (!extension_loaded("pcntl")) print "skip"; + 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"; diff --git a/ext/pcntl/tests/pcntl_exec.phpt b/ext/pcntl/tests/pcntl_exec.phpt index 9a2c96ea38..b1225221de 100644 --- a/ext/pcntl/tests/pcntl_exec.phpt +++ b/ext/pcntl/tests/pcntl_exec.phpt @@ -1,8 +1,8 @@ --TEST-- pcntl_exec() --SKIPIF-- -<?php -if (!extension_loaded("pcntl")) print "skip"; +<?php +if (!extension_loaded("pcntl")) print "skip"; if (!getenv("TEST_PHP_EXECUTABLE") || !is_executable(getenv("TEST_PHP_EXECUTABLE"))) die("skip TEST_PHP_EXECUTABLE not set"); ?> --FILE-- diff --git a/ext/pcntl/tests/pcntl_exec_2.phpt b/ext/pcntl/tests/pcntl_exec_2.phpt index 5383593d97..72274ede5f 100644 --- a/ext/pcntl/tests/pcntl_exec_2.phpt +++ b/ext/pcntl/tests/pcntl_exec_2.phpt @@ -3,7 +3,7 @@ pcntl_exec() 2 --SKIPIF-- <?php -if (!extension_loaded("pcntl")) print "skip"; +if (!extension_loaded("pcntl")) print "skip"; if (!getenv("TEST_PHP_EXECUTABLE") || !is_executable(getenv("TEST_PHP_EXECUTABLE"))) die("skip TEST_PHP_EXECUTABLE not set"); ?> @@ -15,7 +15,7 @@ if (getenv("PCNTL_EXEC_TEST_IS_CHILD")) { } echo "ok\n"; pcntl_exec(getenv("TEST_PHP_EXECUTABLE"), array('-n', __FILE__), array( - "PCNTL_EXEC_TEST_IS_CHILD" => "1", + "PCNTL_EXEC_TEST_IS_CHILD" => "1", "FOO" => "BAR", 1 => "long") ); diff --git a/ext/pcntl/tests/pcntl_fork_basic.phpt b/ext/pcntl/tests/pcntl_fork_basic.phpt index b1e2a9bf68..59931df850 100644 --- a/ext/pcntl/tests/pcntl_fork_basic.phpt +++ b/ext/pcntl/tests/pcntl_fork_basic.phpt @@ -15,7 +15,7 @@ echo "*** Test by calling method or function with its expected arguments, first $pid = pcntl_fork(); if ($pid > 0) { - pcntl_wait($status); + pcntl_wait($status); var_dump($pid); } else { var_dump($pid); diff --git a/ext/pcntl/tests/pcntl_fork_variation.phpt b/ext/pcntl/tests/pcntl_fork_variation.phpt index 4eea07181c..c0708a93df 100644 --- a/ext/pcntl/tests/pcntl_fork_variation.phpt +++ b/ext/pcntl/tests/pcntl_fork_variation.phpt @@ -16,23 +16,23 @@ echo "*** Testing the process isolations between a process and its forks ***\n"; $pid = pcntl_fork(); if ($pid > 0) { - pcntl_wait($status); + pcntl_wait($status); echo "father is $pid\n"; - if (!isset($pid2)) + if (!isset($pid2)) { echo "father ($pid) doesn't know its grandsons\n"; } -} +} else { echo "son ($pid)\n"; $pid2 = pcntl_fork(); if ($pid2 > 0) - { - pcntl_wait($status2); + { + pcntl_wait($status2); echo "son is father of $pid2\n"; - } + } else { echo "grandson ($pid2)\n"; diff --git a/ext/pcntl/tests/pcntl_get_last_error.phpt b/ext/pcntl/tests/pcntl_get_last_error.phpt index 4ed66c9610..f1a517051c 100644 --- a/ext/pcntl/tests/pcntl_get_last_error.phpt +++ b/ext/pcntl/tests/pcntl_get_last_error.phpt @@ -2,10 +2,10 @@ Test pcntl_get_last_error() --SKIPIF-- <?php - if (!extension_loaded("pcntl")) print "skip"; + if (!extension_loaded("pcntl")) print "skip"; ?> --FILE-- -<?php +<?php var_dump(pcntl_get_last_error()); $pid = pcntl_wait($status); var_dump($pid); diff --git a/ext/pcntl/tests/pcntl_signal_dispatch.phpt b/ext/pcntl/tests/pcntl_signal_dispatch.phpt index a7a26dbf65..c64910fb36 100644 --- a/ext/pcntl/tests/pcntl_signal_dispatch.phpt +++ b/ext/pcntl/tests/pcntl_signal_dispatch.phpt @@ -2,7 +2,7 @@ pcnt_signal_dispatch() --SKIPIF-- <?php - if (!extension_loaded("pcntl")) print "skip"; + 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"; diff --git a/ext/pcntl/tests/pcntl_wait_rusage1.phpt b/ext/pcntl/tests/pcntl_wait_rusage1.phpt index 6c9cd39540..b23195f914 100644 --- a/ext/pcntl/tests/pcntl_wait_rusage1.phpt +++ b/ext/pcntl/tests/pcntl_wait_rusage1.phpt @@ -25,7 +25,7 @@ if ($pid == -1) { pcntl_wait($status, 0, $rusage); var_dump(gettype($rusage)); var_dump(count($rusage)); - + $rusage = new stdClass; pcntl_wait($status, 0, $rusage); var_dump(gettype($rusage)); diff --git a/ext/pcntl/tests/pcntl_waitpid_rusage1.phpt b/ext/pcntl/tests/pcntl_waitpid_rusage1.phpt index 4ecc664bac..393dd59b9c 100644 --- a/ext/pcntl/tests/pcntl_waitpid_rusage1.phpt +++ b/ext/pcntl/tests/pcntl_waitpid_rusage1.phpt @@ -25,7 +25,7 @@ if ($pid == -1) { pcntl_waitpid($pid, $status, 0, $rusage); var_dump(gettype($rusage)); var_dump(count($rusage)); - + $rusage = new stdClass; pcntl_waitpid($pid, $status, 0, $rusage); var_dump(gettype($rusage)); diff --git a/ext/pcntl/tests/signal_closure_handler.phpt b/ext/pcntl/tests/signal_closure_handler.phpt index 106b928296..0df0061caa 100644 --- a/ext/pcntl/tests/signal_closure_handler.phpt +++ b/ext/pcntl/tests/signal_closure_handler.phpt @@ -2,7 +2,7 @@ Closures as a signal handler --SKIPIF-- <?php - if (!extension_loaded("pcntl")) print "skip"; + 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"; diff --git a/ext/pcre/tests/006.phpt b/ext/pcre/tests/006.phpt index 793581ecd9..3cb6e45545 100644 --- a/ext/pcre/tests/006.phpt +++ b/ext/pcre/tests/006.phpt @@ -17,7 +17,7 @@ var_dump($result); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(58) "[CODE]<td align="$stylevar[right]">[/CODE]" NULL string(58) "[CODE]<td align="$stylevar[right]">[/CODE]" diff --git a/ext/pcre/tests/bug20528.phpt b/ext/pcre/tests/bug20528.phpt index 8182fd9bfe..43e548b26e 100644 --- a/ext/pcre/tests/bug20528.phpt +++ b/ext/pcre/tests/bug20528.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #20528 (preg_split() drops characters (re-opens Bug #15413)) +Bug #20528 (preg_split() drops characters (re-opens Bug #15413)) --FILE-- <?php $data = '(#11/19/2002#)'; diff --git a/ext/pcre/tests/bug21758.phpt b/ext/pcre/tests/bug21758.phpt index db599196f2..6e407d4a17 100644 --- a/ext/pcre/tests/bug21758.phpt +++ b/ext/pcre/tests/bug21758.phpt @@ -4,20 +4,20 @@ Bug #21758 (preg_replace_callback() not working with class methods) <?php class Foo { function __construct() { - + $s = 'preg_replace() is broken'; - + var_dump(preg_replace_callback( '/broken/', array(&$this, 'bar'), $s )); } - + function bar() { return 'working'; } - + } // of Foo $o = new Foo; diff --git a/ext/pcre/tests/bug26927.phpt b/ext/pcre/tests/bug26927.phpt index 5c64deb37c..200a534b76 100644 --- a/ext/pcre/tests/bug26927.phpt +++ b/ext/pcre/tests/bug26927.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #26927 (preg_quote() does not escape \0) +Bug #26927 (preg_quote() does not escape \0) --FILE-- <?php $str = "a\000b"; diff --git a/ext/pcre/tests/bug40909.phpt b/ext/pcre/tests/bug40909.phpt index f66a8f9abb..432069a7ff 100644 --- a/ext/pcre/tests/bug40909.phpt +++ b/ext/pcre/tests/bug40909.phpt @@ -2,7 +2,7 @@ Bug #40909 (pcre 7.0 regression) --FILE-- <?php - + $pattern = "/\s([\w_\.\/]+)(?:=([\'\"]?(?:[\w\d\s\?=\(\)\.,'_#\/\\:;&-]|(?:\\\\\"|\\\')?)+[\'\"]?))?/"; $context = "<simpletag an_attribute=\"simpleValueInside\">"; diff --git a/ext/pcre/tests/invalid_utf8.phpt b/ext/pcre/tests/invalid_utf8.phpt index 56bad834dc..f24042a3bd 100644 --- a/ext/pcre/tests/invalid_utf8.phpt +++ b/ext/pcre/tests/invalid_utf8.phpt @@ -9,14 +9,14 @@ if (@preg_match('/./u', '') === false) { --FILE-- <?php -$string = urldecode("search%e4"); -$result = preg_replace("#(&\#x*)([0-9A-F]+);*#iu","$1$2;",$string); -var_dump($result); +$string = urldecode("search%e4"); +$result = preg_replace("#(&\#x*)([0-9A-F]+);*#iu","$1$2;",$string); +var_dump($result); var_dump(preg_last_error()); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- NULL int(4) Done diff --git a/ext/pcre/tests/pcre.constants.phpt b/ext/pcre/tests/pcre.constants.phpt index 0b103308e1..108f432253 100644 --- a/ext/pcre/tests/pcre.constants.phpt +++ b/ext/pcre/tests/pcre.constants.phpt @@ -3,11 +3,11 @@ Test for pre-defined pcre constants --FILE-- <?php -echo "PCRE constants test\n"; +echo "PCRE constants test\n"; echo "PREG_PATTERN_ORDER= ", PREG_PATTERN_ORDER, "\n"; echo "PREG_OFFSET_CAPTURE= ", PREG_OFFSET_CAPTURE, "\n"; -echo "PREG_SPLIT_NO_EMPTY= ", PREG_SPLIT_NO_EMPTY, "\n"; +echo "PREG_SPLIT_NO_EMPTY= ", PREG_SPLIT_NO_EMPTY, "\n"; echo "PREG_SPLIT_DELIM_CAPTURE= ", PREG_SPLIT_DELIM_CAPTURE, "\n"; echo "PREG_SPLIT_OFFSET_CAPTURE= ", PREG_SPLIT_OFFSET_CAPTURE, "\n"; echo "PREG_GREP_INVERT= ", PREG_GREP_INVERT, "\n"; diff --git a/ext/pcre/tests/preg_match_all_edit_basic.phpt b/ext/pcre/tests/preg_match_all_edit_basic.phpt index b0de5c92ad..1f59bf6aff 100644 --- a/ext/pcre/tests/preg_match_all_edit_basic.phpt +++ b/ext/pcre/tests/preg_match_all_edit_basic.phpt @@ -5,7 +5,7 @@ Test preg_match_all() function : basic functionality /* Prototype : proto int preg_match_all(string pattern, string subject, array subpatterns [, int flags [, int offset]]) * Description: Perform a Perl-style global regular expression match * Source code: ext/pcre/php_pcre.c - * Alias to functions: + * Alias to functions: */ $string = 'Hello, world! This is a test. This is another test. \[4]. 34534 string.'; diff --git a/ext/pcre/tests/preg_match_basic.phpt b/ext/pcre/tests/preg_match_basic.phpt index 8538033f52..c84c763851 100644 --- a/ext/pcre/tests/preg_match_basic.phpt +++ b/ext/pcre/tests/preg_match_basic.phpt @@ -2,7 +2,7 @@ Test preg_match() function : basic functionality --FILE-- <?php -/* +/* * proto int preg_match(string pattern, string subject [, array subpatterns [, int flags [, int offset]]]) * Function is implemented in ext/pcre/php_pcre.c */ diff --git a/ext/pcre/tests/preg_match_basic_002.phpt b/ext/pcre/tests/preg_match_basic_002.phpt index 3bfc9942fe..19c85c0cce 100644 --- a/ext/pcre/tests/preg_match_basic_002.phpt +++ b/ext/pcre/tests/preg_match_basic_002.phpt @@ -6,7 +6,7 @@ preg_match() single line match with multi-line input * Description: Perform a regular expression match * Source code: ext/pcre/php_pcre.c */ - + $string = "My\nName\nIs\nStrange"; preg_match("/M(.*)/", $string, $matches); diff --git a/ext/pcre/tests/preg_match_basic_edit.phpt b/ext/pcre/tests/preg_match_basic_edit.phpt index f79c3628c6..d08c474d61 100644 --- a/ext/pcre/tests/preg_match_basic_edit.phpt +++ b/ext/pcre/tests/preg_match_basic_edit.phpt @@ -5,7 +5,7 @@ Test preg_match() function : basic functionality /* Prototype : proto int preg_match(string pattern, string subject [, array subpatterns [, int flags [, int offset]]]) * Description: Perform a Perl-style regular expression match * Source code: ext/pcre/php_pcre.c - * Alias to functions: + * Alias to functions: */ diff --git a/ext/pcre/tests/preg_match_error.phpt b/ext/pcre/tests/preg_match_error.phpt index ca1f128ada..7d318115f6 100644 --- a/ext/pcre/tests/preg_match_error.phpt +++ b/ext/pcre/tests/preg_match_error.phpt @@ -2,7 +2,7 @@ Test preg_match() function : error conditions - wrong numbers of parameters --FILE-- <?php -/* +/* * proto int preg_match(string pattern, string subject [, array subpatterns [, int flags [, int offset]]]) * Function is implemented in ext/pcre/php_pcre.c */ diff --git a/ext/pcre/tests/preg_match_error1.phpt b/ext/pcre/tests/preg_match_error1.phpt index ec9cf8cec8..ba0aea4912 100644 --- a/ext/pcre/tests/preg_match_error1.phpt +++ b/ext/pcre/tests/preg_match_error1.phpt @@ -2,7 +2,7 @@ Test preg_match() function : error conditions - bad regular expressions --FILE-- <?php -/* +/* * proto int preg_match(string pattern, string subject [, array subpatterns [, int flags [, int offset]]]) * Function is implemented in ext/pcre/php_pcre.c */ diff --git a/ext/pcre/tests/preg_match_error2.phpt b/ext/pcre/tests/preg_match_error2.phpt index f30fb48037..f44b1d0f72 100644 --- a/ext/pcre/tests/preg_match_error2.phpt +++ b/ext/pcre/tests/preg_match_error2.phpt @@ -2,7 +2,7 @@ Test preg_match() function : error conditions - wrong arg types --FILE-- <?php -/* +/* * proto int preg_match(string pattern, string subject [, array subpatterns [, int flags [, int offset]]]) * Function is implemented in ext/pcre/php_pcre.c */ diff --git a/ext/pcre/tests/preg_match_variation1.phpt b/ext/pcre/tests/preg_match_variation1.phpt index a289ee48ee..5fa50ce49c 100644 --- a/ext/pcre/tests/preg_match_variation1.phpt +++ b/ext/pcre/tests/preg_match_variation1.phpt @@ -2,7 +2,7 @@ Test preg_match() function : variation --FILE-- <?php -/* +/* * proto int preg_match(string pattern, string subject [, array subpatterns [, int flags [, int offset]]]) * Function is implemented in ext/pcre/php_pcre.c */ diff --git a/ext/pcre/tests/preg_replace_callback.phpt b/ext/pcre/tests/preg_replace_callback.phpt index 0b0bc27576..a52ef5c962 100644 --- a/ext/pcre/tests/preg_replace_callback.phpt +++ b/ext/pcre/tests/preg_replace_callback.phpt @@ -2,11 +2,11 @@ preg_replace_callback() --FILE-- <?php -$input = "plain [indent] deep [indent] [abcd]deeper[/abcd] [/indent] deep [/indent] plain"; +$input = "plain [indent] deep [indent] [abcd]deeper[/abcd] [/indent] deep [/indent] plain"; function parseTagsRecursive($input) { - + $regex = '#\[indent]((?:[^[]|\[(?!/?indent])|(?R))+)\[/indent]#'; if (is_array($input)) { diff --git a/ext/pcre/tests/preg_replace_callback3.phpt b/ext/pcre/tests/preg_replace_callback3.phpt index 320fe3c77a..f5c87176f9 100644 --- a/ext/pcre/tests/preg_replace_callback3.phpt +++ b/ext/pcre/tests/preg_replace_callback3.phpt @@ -17,7 +17,7 @@ var_dump(preg_replace_callback($a,$a,$a,$a,$a)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: preg_replace_callback() expects at least 3 parameters, 0 given in %s on line %d NULL diff --git a/ext/pcre/tests/preg_replace_callback_array2.phpt b/ext/pcre/tests/preg_replace_callback_array2.phpt index 5908eeb278..f2f20ef645 100644 --- a/ext/pcre/tests/preg_replace_callback_array2.phpt +++ b/ext/pcre/tests/preg_replace_callback_array2.phpt @@ -33,7 +33,7 @@ try { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: preg_replace_callback_array() expects at least 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/pcre/tests/preg_replace_callback_basic.phpt b/ext/pcre/tests/preg_replace_callback_basic.phpt index 45778871db..21560572d5 100644 --- a/ext/pcre/tests/preg_replace_callback_basic.phpt +++ b/ext/pcre/tests/preg_replace_callback_basic.phpt @@ -13,7 +13,7 @@ $replacement = array('zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seve function integer_word($matches) { global $replacement; return $replacement[$matches[0]]; //all examples will be looking for an integer value, if one is found it will be stored in $matches[0] which corresponds to a key in the $replacements array - + } $subject1 = 'there are 7 words in this sentence.'; $new_subject1 = preg_replace_callback('/\d/', "integer_word", $subject1); diff --git a/ext/pcre/tests/preg_replace_edit_basic.phpt b/ext/pcre/tests/preg_replace_edit_basic.phpt index adcee00d9e..0c0adee7ca 100644 --- a/ext/pcre/tests/preg_replace_edit_basic.phpt +++ b/ext/pcre/tests/preg_replace_edit_basic.phpt @@ -5,7 +5,7 @@ Test preg_replace() function : basic /* Prototype : proto string preg_replace(mixed regex, mixed replace, mixed subject [, int limit [, count]]) * Description: Perform Perl-style regular expression replacement. * Source code: ext/pcre/php_pcre.c - * Alias to functions: + * Alias to functions: */ $string = '123456789 - Hello, world - This is a string.'; @@ -14,7 +14,7 @@ var_dump($string); var_dump(preg_replace('<- This is a string$>', 'This shouldn\'t work', $string)); //tries to find '- This is a string' at the end of a string but can't so replaces nothing and prints the unchanged $string. -var_dump(preg_replace('<[0-35-9]>', +var_dump(preg_replace('<[0-35-9]>', '4', $string, //finds any number that's not 4 and replaces it with a 4 '5', $count)); //limits to 5 replacements returns 444444789 var_dump($count); //counts the number of replacements made (5) @@ -26,7 +26,7 @@ var_dump(preg_replace('<\b[hH]\w{2,4}>', var_dump(preg_replace('<(\w)\s*-\s*(\w)>', '\\1. \\2', $string)); //finds dashes with an indefinite amount of whitespace around them and replaces them with a full stop precedeby no spaces and followed by one space -var_dump(preg_replace('<(^[a-z]\w+)@(\w+)\.(\w+)\.([a-z]{2,}$)>', +var_dump(preg_replace('<(^[a-z]\w+)@(\w+)\.(\w+)\.([a-z]{2,}$)>', '\\1 at \\2 dot \\3 dot \\4', 'josmessa@uk.ibm.com')); //finds the e-mail address and replaces the @ and . with "at" and "dot" (uses backreferences) ('josmessa at uk dot ibm dot com') ?> --EXPECT-- diff --git a/ext/pdo/tests/bug_36428.phpt b/ext/pdo/tests/bug_36428.phpt index 703b9d4de0..d21f7071f8 100644 --- a/ext/pdo/tests/bug_36428.phpt +++ b/ext/pdo/tests/bug_36428.phpt @@ -11,7 +11,7 @@ PDOTest::skip(); ?> --FILE-- <?php -if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/'); +if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/'); require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc'; $db = PDOTest::factory(); diff --git a/ext/pdo/tests/bug_38394.phpt b/ext/pdo/tests/bug_38394.phpt index d0dea337d1..e786bdbd15 100644 --- a/ext/pdo/tests/bug_38394.phpt +++ b/ext/pdo/tests/bug_38394.phpt @@ -11,7 +11,7 @@ PDOTest::skip(); ?> --FILE-- <?php -if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/'); +if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/'); require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc'; $db = PDOTest::factory(); diff --git a/ext/pdo/tests/bug_39398.phpt b/ext/pdo/tests/bug_39398.phpt index 633771a951..0ad46f4131 100644 --- a/ext/pdo/tests/bug_39398.phpt +++ b/ext/pdo/tests/bug_39398.phpt @@ -10,7 +10,7 @@ PDOTest::skip(); ?> --FILE-- <?php -if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/'); +if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/'); require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc'; $db = PDOTest::factory(); diff --git a/ext/pdo/tests/bug_40285.phpt b/ext/pdo/tests/bug_40285.phpt index c0a5674389..213777a808 100644 --- a/ext/pdo/tests/bug_40285.phpt +++ b/ext/pdo/tests/bug_40285.phpt @@ -1,7 +1,7 @@ --TEST-- PDO Common: Bug #40285 (The prepare parser goes into an infinite loop on ': or ":) --SKIPIF-- -<?php +<?php if (!extension_loaded('pdo')) die('skip'); $dir = getenv('REDIR_TEST_DIR'); if (false == $dir) die('skip no driver'); @@ -23,5 +23,5 @@ $s->execute(); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- Done diff --git a/ext/pdo/tests/bug_44409.phpt b/ext/pdo/tests/bug_44409.phpt index fe24fdfb86..64d385b26c 100644 --- a/ext/pdo/tests/bug_44409.phpt +++ b/ext/pdo/tests/bug_44409.phpt @@ -19,16 +19,16 @@ $db->exec("INSERT INTO test (dat) VALUES ('Data from DB')"); class bug44409 implements Serializable { - public function __construct() + public function __construct() { - printf("Method called: %s()\n", __METHOD__); - } + printf("Method called: %s()\n", __METHOD__); + } public function serialize() { - return "any data from serizalize()"; + return "any data from serizalize()"; } - + public function unserialize($dat) { printf("Method called: %s(%s)\n", __METHOD__, var_export($dat, true)); diff --git a/ext/pdo/tests/bug_47769.phpt b/ext/pdo/tests/bug_47769.phpt index f713effd5d..c0ac8350ce 100644 --- a/ext/pdo/tests/bug_47769.phpt +++ b/ext/pdo/tests/bug_47769.phpt @@ -16,7 +16,7 @@ class test extends PDO private function isPrivate() { echo "this is a private method.\n"; } - + public function quote($str, $paramtype = NULL) { $this->isProtected(); $this->isPrivate(); diff --git a/ext/pdo/tests/bug_50458.phpt b/ext/pdo/tests/bug_50458.phpt index 431073753f..7dbfec3593 100644 --- a/ext/pdo/tests/bug_50458.phpt +++ b/ext/pdo/tests/bug_50458.phpt @@ -10,7 +10,7 @@ PDOTest::skip(); ?> --FILE-- <?php -if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/'); +if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/'); require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc'; $db = PDOTest::factory(); diff --git a/ext/pdo/tests/pdo_009.phpt b/ext/pdo/tests/pdo_009.phpt index 0e21177477..509a7d44db 100644 --- a/ext/pdo/tests/pdo_009.phpt +++ b/ext/pdo/tests/pdo_009.phpt @@ -15,14 +15,14 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc'; $db = PDOTest::factory(); $db->exec('CREATE TABLE classtypes(id int NOT NULL PRIMARY KEY, name VARCHAR(10) NOT NULL UNIQUE)'); -$db->exec('INSERT INTO classtypes VALUES(0, \'stdClass\')'); -$db->exec('INSERT INTO classtypes VALUES(1, \'Test1\')'); -$db->exec('INSERT INTO classtypes VALUES(2, \'Test2\')'); +$db->exec('INSERT INTO classtypes VALUES(0, \'stdClass\')'); +$db->exec('INSERT INTO classtypes VALUES(1, \'Test1\')'); +$db->exec('INSERT INTO classtypes VALUES(2, \'Test2\')'); $db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, classtype int, val VARCHAR(10))'); -$db->exec('INSERT INTO test VALUES(1, 0, \'A\')'); -$db->exec('INSERT INTO test VALUES(2, 1, \'B\')'); -$db->exec('INSERT INTO test VALUES(3, 2, \'C\')'); -$db->exec('INSERT INTO test VALUES(4, 3, \'D\')'); +$db->exec('INSERT INTO test VALUES(1, 0, \'A\')'); +$db->exec('INSERT INTO test VALUES(2, 1, \'B\')'); +$db->exec('INSERT INTO test VALUES(3, 2, \'C\')'); +$db->exec('INSERT INTO test VALUES(4, 3, \'D\')'); $stmt = $db->prepare('SELECT classtypes.name, test.id AS id, test.val AS val FROM test LEFT JOIN classtypes ON test.classtype=classtypes.id'); diff --git a/ext/pdo/tests/pdo_010.phpt b/ext/pdo/tests/pdo_010.phpt index 812b868eb0..e00f901abe 100644 --- a/ext/pdo/tests/pdo_010.phpt +++ b/ext/pdo/tests/pdo_010.phpt @@ -15,14 +15,14 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc'; $db = PDOTest::factory(); $db->exec('CREATE TABLE classtypes(id int NOT NULL PRIMARY KEY, name VARCHAR(10) NOT NULL UNIQUE)'); -$db->exec('INSERT INTO classtypes VALUES(0, \'stdClass\')'); -$db->exec('INSERT INTO classtypes VALUES(1, \'Test1\')'); -$db->exec('INSERT INTO classtypes VALUES(2, \'Test2\')'); +$db->exec('INSERT INTO classtypes VALUES(0, \'stdClass\')'); +$db->exec('INSERT INTO classtypes VALUES(1, \'Test1\')'); +$db->exec('INSERT INTO classtypes VALUES(2, \'Test2\')'); $db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, classtype int, val VARCHAR(10), grp VARCHAR(10))'); -$db->exec('INSERT INTO test VALUES(1, 0, \'A\', \'Group1\')'); -$db->exec('INSERT INTO test VALUES(2, 1, \'B\', \'Group1\')'); -$db->exec('INSERT INTO test VALUES(3, 2, \'C\', \'Group2\')'); -$db->exec('INSERT INTO test VALUES(4, 3, \'D\', \'Group2\')'); +$db->exec('INSERT INTO test VALUES(1, 0, \'A\', \'Group1\')'); +$db->exec('INSERT INTO test VALUES(2, 1, \'B\', \'Group1\')'); +$db->exec('INSERT INTO test VALUES(3, 2, \'C\', \'Group2\')'); +$db->exec('INSERT INTO test VALUES(4, 3, \'D\', \'Group2\')'); $stmt = $db->prepare('SELECT classtypes.name, test.grp AS grp, test.id AS id, test.val AS val FROM test LEFT JOIN classtypes ON test.classtype=classtypes.id'); diff --git a/ext/pdo/tests/pdo_011.phpt b/ext/pdo/tests/pdo_011.phpt index 4a240426e1..ffeac5bd8d 100644 --- a/ext/pdo/tests/pdo_011.phpt +++ b/ext/pdo/tests/pdo_011.phpt @@ -15,10 +15,10 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc'; $db = PDOTest::factory(); $db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))'); -$db->exec('INSERT INTO test VALUES(1, \'A\', \'Group1\')'); -$db->exec('INSERT INTO test VALUES(2, \'B\', \'Group1\')'); -$db->exec('INSERT INTO test VALUES(3, \'C\', \'Group2\')'); -$db->exec('INSERT INTO test VALUES(4, \'D\', \'Group2\')'); +$db->exec('INSERT INTO test VALUES(1, \'A\', \'Group1\')'); +$db->exec('INSERT INTO test VALUES(2, \'B\', \'Group1\')'); +$db->exec('INSERT INTO test VALUES(3, \'C\', \'Group2\')'); +$db->exec('INSERT INTO test VALUES(4, \'D\', \'Group2\')'); class DerivedStatement extends PDOStatement { diff --git a/ext/pdo/tests/pdo_012.phpt b/ext/pdo/tests/pdo_012.phpt index 471c397c0a..ac87a384b5 100644 --- a/ext/pdo/tests/pdo_012.phpt +++ b/ext/pdo/tests/pdo_012.phpt @@ -15,8 +15,8 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc'; $db = PDOTest::factory(); $db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))'); -$db->exec('INSERT INTO test VALUES(1, \'A\', \'Group1\')'); -$db->exec('INSERT INTO test VALUES(2, \'B\', \'Group2\')'); +$db->exec('INSERT INTO test VALUES(1, \'A\', \'Group1\')'); +$db->exec('INSERT INTO test VALUES(2, \'B\', \'Group2\')'); $SELECT = 'SELECT val, grp FROM test'; diff --git a/ext/pdo/tests/pdo_013.phpt b/ext/pdo/tests/pdo_013.phpt index 009c7e2d65..f4dcea5a2a 100644 --- a/ext/pdo/tests/pdo_013.phpt +++ b/ext/pdo/tests/pdo_013.phpt @@ -15,8 +15,8 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc'; $db = PDOTest::factory(); $db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))'); -$db->exec('INSERT INTO test VALUES(1, \'A\', \'Group1\')'); -$db->exec('INSERT INTO test VALUES(2, \'B\', \'Group2\')'); +$db->exec('INSERT INTO test VALUES(1, \'A\', \'Group1\')'); +$db->exec('INSERT INTO test VALUES(2, \'B\', \'Group2\')'); $SELECT = 'SELECT val, grp FROM test'; diff --git a/ext/pdo/tests/pdo_015.phpt b/ext/pdo/tests/pdo_015.phpt index aea292b97f..ac6a61f1fb 100644 --- a/ext/pdo/tests/pdo_015.phpt +++ b/ext/pdo/tests/pdo_015.phpt @@ -15,8 +15,8 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc'; $db = PDOTest::factory(); $db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(20))'); -$db->exec('INSERT INTO test VALUES(1, \'A\', \'A2\')'); -$db->exec('INSERT INTO test VALUES(2, \'A\', \'B2\')'); +$db->exec('INSERT INTO test VALUES(1, \'A\', \'A2\')'); +$db->exec('INSERT INTO test VALUES(2, \'A\', \'B2\')'); $select1 = $db->prepare('SELECT id, val, val2 FROM test'); $select2 = $db->prepare('SELECT val, val2 FROM test'); diff --git a/ext/pdo/tests/pdo_016.phpt b/ext/pdo/tests/pdo_016.phpt index 12c9517233..abbe93f0bf 100644 --- a/ext/pdo/tests/pdo_016.phpt +++ b/ext/pdo/tests/pdo_016.phpt @@ -47,10 +47,10 @@ while($stmt2->fetch(PDO::FETCH_BOUND)) { echo "===ALONE===\n"; -$stmt3 = $db->prepare('SELECT txt FROM test WHERE idx=:inp'); +$stmt3 = $db->prepare('SELECT txt FROM test WHERE idx=:inp'); $stmt3->bindParam(':inp', $idx); /* by foreign name */ -$stmt4 = $db->prepare('SELECT idx FROM test WHERE txt=:txt'); +$stmt4 = $db->prepare('SELECT idx FROM test WHERE txt=:txt'); $stmt4->bindParam(':txt', $txt); /* using same name */ foreach($cont as $idx => $txt) diff --git a/ext/pdo/tests/pdo_016a.phpt b/ext/pdo/tests/pdo_016a.phpt index 72f4b4224f..4703981173 100644 --- a/ext/pdo/tests/pdo_016a.phpt +++ b/ext/pdo/tests/pdo_016a.phpt @@ -47,10 +47,10 @@ while($stmt2->fetch(PDO::FETCH_BOUND)) { echo "===ALONE===\n"; -$stmt3 = $db->prepare('SELECT txt FROM test WHERE idx=:inp'); +$stmt3 = $db->prepare('SELECT txt FROM test WHERE idx=:inp'); $stmt3->bindParam('inp', $idx); /* by foreign name */ -$stmt4 = $db->prepare('SELECT idx FROM test WHERE txt=:txt'); +$stmt4 = $db->prepare('SELECT idx FROM test WHERE txt=:txt'); $stmt4->bindParam('txt', $txt); /* using same name */ foreach($cont as $idx => $txt) diff --git a/ext/pdo/tests/pdo_019.phpt b/ext/pdo/tests/pdo_019.phpt index f6d75bbd1a..eb3bb22c88 100644 --- a/ext/pdo/tests/pdo_019.phpt +++ b/ext/pdo/tests/pdo_019.phpt @@ -15,10 +15,10 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc'; $db = PDOTest::factory(); $db->exec('CREATE TABLE test(idx int NOT NULL PRIMARY KEY, txt VARCHAR(20))'); -$db->exec('INSERT INTO test VALUES(0, \'String0\')'); -$db->exec('INSERT INTO test VALUES(1, \'String1\')'); -$db->exec('INSERT INTO test VALUES(2, \'String2\')'); -$db->exec('INSERT INTO test VALUES(3, \'String3\')'); +$db->exec('INSERT INTO test VALUES(0, \'String0\')'); +$db->exec('INSERT INTO test VALUES(1, \'String1\')'); +$db->exec('INSERT INTO test VALUES(2, \'String2\')'); +$db->exec('INSERT INTO test VALUES(3, \'String3\')'); var_dump($db->query('SELECT COUNT(*) FROM test')->fetchColumn()); diff --git a/ext/pdo/tests/pdo_020.phpt b/ext/pdo/tests/pdo_020.phpt index dc7e4d1a79..9c35da6adf 100644 --- a/ext/pdo/tests/pdo_020.phpt +++ b/ext/pdo/tests/pdo_020.phpt @@ -15,8 +15,8 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc'; $db = PDOTest::factory(); $db->exec('CREATE TABLE test(id INT NOT NULL PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(16))'); -$db->exec("INSERT INTO test VALUES(1, 'A', 'A')"); -$db->exec("INSERT INTO test VALUES(2, 'B', 'B')"); +$db->exec("INSERT INTO test VALUES(1, 'A', 'A')"); +$db->exec("INSERT INTO test VALUES(2, 'B', 'B')"); $db->exec("INSERT INTO test VALUES(3, 'C', 'C')"); foreach (array('SELECT id, val FROM test', 'SELECT id, val, val2 FROM test', 'SELECT COUNT(*) FROM test') as $sql) { diff --git a/ext/pdo/tests/pdo_023.phpt b/ext/pdo/tests/pdo_023.phpt index 564bcf8c51..8b4df3293b 100644 --- a/ext/pdo/tests/pdo_023.phpt +++ b/ext/pdo/tests/pdo_023.phpt @@ -16,14 +16,14 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc'; class PDOStatementX extends PDOStatement { public $test1 = 1; - + protected function __construct() { $this->test2 = 2; $this->test2 = 22; echo __METHOD__ . "()\n"; } - + function __destruct() { echo __METHOD__ . "()\n"; @@ -33,12 +33,12 @@ class PDOStatementX extends PDOStatement class PDODatabaseX extends PDO { public $test1 = 1; - + function __destruct() { echo __METHOD__ . "()\n"; } - + function test() { $this->test2 = 2; @@ -46,7 +46,7 @@ class PDODatabaseX extends PDO var_dump($this->test2); $this->test2 = 22; } - + function query($sql) { echo __METHOD__ . "()\n"; diff --git a/ext/pdo/tests/pdo_026.phpt b/ext/pdo/tests/pdo_026.phpt index d993f32445..78121c926a 100644 --- a/ext/pdo/tests/pdo_026.phpt +++ b/ext/pdo/tests/pdo_026.phpt @@ -22,13 +22,13 @@ $data = array( class PDOStatementX extends PDOStatement { public $dbh; - + protected function __construct($dbh) { $this->dbh = $dbh; echo __METHOD__ . "()\n"; } - + function __destruct() { echo __METHOD__ . "()\n"; @@ -41,7 +41,7 @@ class PDODatabase extends PDO { echo __METHOD__ . "()\n"; } - + function query($sql) { echo __METHOD__ . "()\n"; diff --git a/ext/pdo/tests/pdo_029.phpt b/ext/pdo/tests/pdo_029.phpt index f3dc1f2fa4..8e495de3bd 100644 --- a/ext/pdo/tests/pdo_029.phpt +++ b/ext/pdo/tests/pdo_029.phpt @@ -10,7 +10,7 @@ PDOTest::skip(); ?> --FILE-- <?php -if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/'); +if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/'); require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc'; $data = array( @@ -22,22 +22,22 @@ $data = array( class PDOStatementX extends PDOStatement { public $dbh; - + protected function __construct($dbh) { $this->dbh = $dbh; echo __METHOD__ . "()\n"; } - + function __destruct() { echo __METHOD__ . "()\n"; } - + function execute($params = array()) { echo __METHOD__ . "()\n"; - parent::execute(); + parent::execute(); } } @@ -47,7 +47,7 @@ class PDODatabase extends PDO { echo __METHOD__ . "()\n"; } - + function query($sql) { echo __METHOD__ . "()\n"; diff --git a/ext/pdo/tests/pdo_030.phpt b/ext/pdo/tests/pdo_030.phpt index 243e94a1e7..a2a9207e77 100644 --- a/ext/pdo/tests/pdo_030.phpt +++ b/ext/pdo/tests/pdo_030.phpt @@ -10,7 +10,7 @@ PDOTest::skip(); ?> --FILE-- <?php -if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/'); +if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/'); require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc'; $data = array( @@ -22,23 +22,23 @@ $data = array( class PDOStatementX extends PDOStatement { public $dbh; - + protected function __construct($dbh) { $this->dbh = $dbh; $this->setFetchMode(PDO::FETCH_ASSOC); echo __METHOD__ . "()\n"; } - + function __destruct() { echo __METHOD__ . "()\n"; } - + function execute($params = array()) { echo __METHOD__ . "()\n"; - parent::execute(); + parent::execute(); } } @@ -48,7 +48,7 @@ class PDODatabase extends PDO { echo __METHOD__ . "()\n"; } - + function query($sql) { echo __METHOD__ . "()\n"; diff --git a/ext/pdo_dblib/tests/bug_54648.phpt b/ext/pdo_dblib/tests/bug_54648.phpt index aa9f292669..93cde8e415 100644 --- a/ext/pdo_dblib/tests/bug_54648.phpt +++ b/ext/pdo_dblib/tests/bug_54648.phpt @@ -8,7 +8,7 @@ require dirname(__FILE__) . '/config.inc'; --FILE-- <?php require dirname(__FILE__) . '/config.inc'; -$db->query('set dateformat ymd'); +$db->query('set dateformat ymd'); $rs = $db->query("select cast('1950-01-18 23:00:00' as smalldatetime) as sdt, cast('2030-01-01 23:59:59' as datetime) as dt"); var_dump($rs->fetchAll(PDO::FETCH_ASSOC)); echo "Done.\n"; diff --git a/ext/pdo_firebird/tests/bug_74462.phpt b/ext/pdo_firebird/tests/bug_74462.phpt index 4a8d2c9c91..52033decca 100644 --- a/ext/pdo_firebird/tests/bug_74462.phpt +++ b/ext/pdo_firebird/tests/bug_74462.phpt @@ -1,7 +1,7 @@ --TEST-- PDO_Firebird: Bug #74462 Returns only NULLs for boolean fields --SKIPIF-- -<?php if (!extension_loaded('interbase') || !extension_loaded('pdo_firebird')) die('skip'); +<?php if (!extension_loaded('interbase') || !extension_loaded('pdo_firebird')) die('skip'); ?> --FILE-- <?php diff --git a/ext/pdo_firebird/tests/bug_76488.phpt b/ext/pdo_firebird/tests/bug_76488.phpt index dba6734c28..028d3cb805 100644 --- a/ext/pdo_firebird/tests/bug_76488.phpt +++ b/ext/pdo_firebird/tests/bug_76488.phpt @@ -20,7 +20,7 @@ from r for ($i = 0; $i < 10; $i++) { $sth = $dbh->prepare($sql); - $sth->execute(); + $sth->execute(); $rows = $sth->fetchAll(); unset($rows); unset($sth); diff --git a/ext/pdo_firebird/tests/common.phpt b/ext/pdo_firebird/tests/common.phpt index 00d4b239ab..adad09df05 100644 --- a/ext/pdo_firebird/tests/common.phpt +++ b/ext/pdo_firebird/tests/common.phpt @@ -9,7 +9,7 @@ if (!extension_loaded('pdo_firebird')) print 'skip'; ?> $config = array( 'TESTS' => 'ext/pdo/tests' ); - + if (false !== getenv('PDO_FIREBIRD_TEST_DSN')) { # user set them from their shell diff --git a/ext/pdo_firebird/tests/connect.phpt b/ext/pdo_firebird/tests/connect.phpt index d8e1a64ade..e66addcc72 100644 --- a/ext/pdo_firebird/tests/connect.phpt +++ b/ext/pdo_firebird/tests/connect.phpt @@ -7,11 +7,11 @@ PDO_Firebird: connect/disconnect <?php require("testdb.inc"); - + $db = new PDO("firebird:dbname=$test_base",$user,$password) or die; unset($db); echo "done\n"; - + ?> --EXPECT-- done diff --git a/ext/pdo_firebird/tests/ddl.phpt b/ext/pdo_firebird/tests/ddl.phpt index 635d636946..6e5a5fc144 100644 --- a/ext/pdo_firebird/tests/ddl.phpt +++ b/ext/pdo_firebird/tests/ddl.phpt @@ -7,29 +7,29 @@ PDO_Firebird: DDL/transactions <?php require("testdb.inc"); - + $db = new PDO("firebird:dbname=$test_base",$user,$password) or die; $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING); - + $db->exec("CREATE TABLE ddl (id INT NOT NULL PRIMARY KEY, text BLOB SUB_TYPE 1)"); $db->exec("CREATE GENERATOR gen_ddl_id"); $db->exec("CREATE TRIGGER ddl_bi FOR ddl BEFORE INSERT AS BEGIN IF (NEW.id IS NULL) THEN NEW.id=GEN_ID(gen_ddl_id,1); END"); - + $db->setAttribute(PDO::ATTR_AUTOCOMMIT,0); - + $db->beginTransaction(); var_dump($db->exec("INSERT INTO ddl (text) VALUES ('bla')")); var_dump($db->exec("UPDATE ddl SET text='blabla'")); $db->rollback(); - + $db->beginTransaction(); var_dump($db->exec("DELETE FROM ddl")); $db->commit(); - + unset($db); echo "done\n"; - + ?> --EXPECT-- int(1) diff --git a/ext/pdo_firebird/tests/execute.phpt b/ext/pdo_firebird/tests/execute.phpt index d6ae88d653..0aa64d5531 100644 --- a/ext/pdo_firebird/tests/execute.phpt +++ b/ext/pdo_firebird/tests/execute.phpt @@ -9,7 +9,7 @@ ibase.timestampformat=%Y-%m-%d %H:%M:%S <?php require("testdb.inc"); - + $db = new PDO("firebird:dbname=$test_base",$user,$password) or die; var_dump($db->getAttribute(PDO::ATTR_CONNECTION_STATUS)); @@ -19,7 +19,7 @@ ibase.timestampformat=%Y-%m-%d %H:%M:%S $db->exec("CREATE TABLE ddl (id SMALLINT NOT NULL PRIMARY KEY, text VARCHAR(32), datetime TIMESTAMP DEFAULT '2000-02-12' NOT NULL)"); $db->exec("INSERT INTO ddl (id,text) VALUES (1,'bla')"); - + $s = $db->prepare("SELECT * FROM ddl WHERE id=? FOR UPDATE"); $id = 0; @@ -29,21 +29,21 @@ ibase.timestampformat=%Y-%m-%d %H:%M:%S $id = 1; $s->execute(); $s->setAttribute(PDO::ATTR_CURSOR_NAME, "c"); - + var_dump($id); var_dump($s->fetch()); var_dump($var); - + var_dump($db->exec("UPDATE ddl SET id=2 WHERE CURRENT OF c")); var_dump($s->fetch()); - - unset($s); + + unset($s); unset($db); echo "done\n"; - + ?> --EXPECT-- bool(true) diff --git a/ext/pdo_mysql/tests/bug41125.phpt b/ext/pdo_mysql/tests/bug41125.phpt index cd913bbf3a..66ecbc7d4d 100644 --- a/ext/pdo_mysql/tests/bug41125.phpt +++ b/ext/pdo_mysql/tests/bug41125.phpt @@ -75,7 +75,7 @@ foreach ($queries as $k => $query) { $stmt = $db->prepare($query); $stmt->bindParam(':id', $id); $stmt->execute(); - + printf("[%d] Query: [[%s]]\n", $k + 1, $query); print implode(' - ', (($r = @$stmt->fetch(PDO::FETCH_NUM)) ? $r : array())) ."\n"; print implode(' - ', $stmt->errorinfo()) ."\n"; diff --git a/ext/pdo_mysql/tests/bug44327.phpt b/ext/pdo_mysql/tests/bug44327.phpt index f5ca9e0d9d..cb2fbda097 100644 --- a/ext/pdo_mysql/tests/bug44327.phpt +++ b/ext/pdo_mysql/tests/bug44327.phpt @@ -12,12 +12,12 @@ $db = MySQLPDOTest::factory(); require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc'); $db = MySQLPDOTest::factory(); - $stmt = $db->prepare("SELECT 1 AS \"one\""); - $stmt->execute(); - $row = $stmt->fetch(PDO::FETCH_LAZY); + $stmt = $db->prepare("SELECT 1 AS \"one\""); + $stmt->execute(); + $row = $stmt->fetch(PDO::FETCH_LAZY); var_dump($row); var_dump($row->{0}); - var_dump($row->one); + var_dump($row->one); var_dump($row->queryString); print "----------------------------------\n"; @@ -34,11 +34,11 @@ $db = MySQLPDOTest::factory(); print "----------------------------------\n"; - $stmt = $db->prepare('foo'); + $stmt = $db->prepare('foo'); @$stmt->execute(); $row = $stmt->fetch(); var_dump($row->queryString); - + ?> --EXPECTF-- object(PDORow)#%d (2) { diff --git a/ext/pdo_mysql/tests/bug46292.phpt b/ext/pdo_mysql/tests/bug46292.phpt index 6a430a4dfb..8885384f1c 100644 --- a/ext/pdo_mysql/tests/bug46292.phpt +++ b/ext/pdo_mysql/tests/bug46292.phpt @@ -7,22 +7,22 @@ require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc'); MySQLPDOTest::skip(); ?> --FILE-- -<?php - +<?php + require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc'); $pdoDb = MySQLPDOTest::factory(); - + class myclass implements Serializable { public function __construct() { printf("%s()\n", __METHOD__); } - + public function serialize() { printf("%s()\n", __METHOD__); return "any data from serialize()"; } - + public function unserialize($dat) { printf("%s(%s)\n", __METHOD__, var_export($dat, true)); return $dat; @@ -33,11 +33,11 @@ MySQLPDOTest::skip(); $pdoDb->setAttribute(PDO::ATTR_EMULATE_PREPARES, false); $pdoDb->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true); - + $pdoDb->query('DROP TABLE IF EXISTS testz'); - + $pdoDb->query('CREATE TABLE testz (name VARCHAR(20) NOT NULL, value INT)'); - + $pdoDb->query("INSERT INTO testz VALUES ('myclass', 1), ('myclass2', 2), ('myclass', NULL), ('myclass3', NULL)"); $stmt = $pdoDb->prepare("SELECT * FROM testz"); diff --git a/ext/pdo_mysql/tests/bug54929.phpt b/ext/pdo_mysql/tests/bug54929.phpt index 0a111d8935..d7b4c7ad7f 100644 --- a/ext/pdo_mysql/tests/bug54929.phpt +++ b/ext/pdo_mysql/tests/bug54929.phpt @@ -18,7 +18,7 @@ $pdodb = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt'); function testQuery($query) { global $pdodb; $stmt = $pdodb->prepare($query); - + if (!$stmt->execute(array("foo"))) { var_dump($stmt->errorInfo()); } else{ diff --git a/ext/pdo_mysql/tests/bug_37445.phpt b/ext/pdo_mysql/tests/bug_37445.phpt index c9400717b4..6a51233cc4 100644 --- a/ext/pdo_mysql/tests/bug_37445.phpt +++ b/ext/pdo_mysql/tests/bug_37445.phpt @@ -1,5 +1,5 @@ --TEST-- -PDO MySQL Bug #37445 (Premature stmt object destruction) +PDO MySQL Bug #37445 (Premature stmt object destruction) --SKIPIF-- <?php if (!extension_loaded('pdo') || !extension_loaded('pdo_mysql')) die('skip not loaded'); diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_blobfromsteam.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_blobfromsteam.phpt index dfdd308e5b..9b02489251 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_stmt_blobfromsteam.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_blobfromsteam.phpt @@ -132,7 +132,7 @@ unlink($file); printf("[001] %s [%s] %s\n", $e->getMessage(), $db->errorCode(), implode(' ', $db->errorInfo())); } - + print "done!"; ?> --CLEAN-- diff --git a/ext/pdo_oci/tests/bug46274.phpt b/ext/pdo_oci/tests/bug46274.phpt index 7b4b3f74f2..b6165b05d5 100644 --- a/ext/pdo_oci/tests/bug46274.phpt +++ b/ext/pdo_oci/tests/bug46274.phpt @@ -2,7 +2,7 @@ Bug #46274 (pdo_pgsql - Segfault when using PDO::ATTR_STRINGIFY_FETCHES and blob) --SKIPIF-- <?php -if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) +if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) die('skip not loaded'); require dirname(__FILE__).'/../../pdo/tests/pdo_test.inc'; PDOTest::skip(); diff --git a/ext/pdo_oci/tests/bug46274_2.phpt b/ext/pdo_oci/tests/bug46274_2.phpt index cbadcef4f8..3430877b9f 100644 --- a/ext/pdo_oci/tests/bug46274_2.phpt +++ b/ext/pdo_oci/tests/bug46274_2.phpt @@ -2,7 +2,7 @@ Bug #46274 (pdo_pgsql - Segfault when using PDO::ATTR_STRINGIFY_FETCHES and blob) --SKIPIF-- <?php -if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) +if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) die('skip not loaded'); require dirname(__FILE__).'/../../pdo/tests/pdo_test.inc'; PDOTest::skip(); diff --git a/ext/pdo_oci/tests/bug54379.phpt b/ext/pdo_oci/tests/bug54379.phpt index b356f7dfc8..6137388931 100644 --- a/ext/pdo_oci/tests/bug54379.phpt +++ b/ext/pdo_oci/tests/bug54379.phpt @@ -2,7 +2,7 @@ Bug #54379 (PDO_OCI: UTF-8 output gets truncated) --SKIPIF-- <?php -if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) +if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) die('skip not loaded'); require dirname(__FILE__).'/../../pdo/tests/pdo_test.inc'; if (!preg_match('/charset=.*utf8/i', getenv('PDOTEST_DSN'))) diff --git a/ext/pdo_oci/tests/bug57702.phpt b/ext/pdo_oci/tests/bug57702.phpt index 4389276195..82b50f9ce0 100644 --- a/ext/pdo_oci/tests/bug57702.phpt +++ b/ext/pdo_oci/tests/bug57702.phpt @@ -25,7 +25,7 @@ $stmt->execute(); function do_insert($db, $id, $data1, $data2) { - $db->beginTransaction(); + $db->beginTransaction(); $stmt = $db->prepare("insert into bug57702 (id, data1, data2) values (:id, empty_blob(), empty_blob()) returning data1, data2 into :blob1, :blob2"); $stmt->bindParam(':id', $id); $stmt->bindParam(':blob1', $blob1, PDO::PARAM_LOB); @@ -34,10 +34,10 @@ function do_insert($db, $id, $data1, $data2) $blob2 = null; $stmt->execute(); - fwrite($blob1, $data1); + fwrite($blob1, $data1); fclose($blob1); - fwrite($blob2, $data2); - fclose($blob2); + fwrite($blob2, $data2); + fclose($blob2); $db->commit(); } @@ -84,7 +84,7 @@ while ($stmt->fetch(PDO::FETCH_BOUND)) { //////////////////// -echo "\nFourth Query\n"; +echo "\nFourth Query\n"; $a = array(); $i = 0; @@ -101,7 +101,7 @@ for ($i = 0; $i < count($a); $i++) { //////////////////// -echo "\nFifth Query\n"; +echo "\nFifth Query\n"; $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false); // Let's use streams @@ -124,7 +124,7 @@ for ($i = 0; $i < count($a); $i++) { //////////////////// -echo "\nSixth Query\n"; +echo "\nSixth Query\n"; $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false); // Let's use streams diff --git a/ext/pdo_oci/tests/checkliveness.phpt b/ext/pdo_oci/tests/checkliveness.phpt index a403a3929e..5f1a11ace3 100644 --- a/ext/pdo_oci/tests/checkliveness.phpt +++ b/ext/pdo_oci/tests/checkliveness.phpt @@ -19,7 +19,7 @@ $attr = getenv('PDOTEST_ATTR'); try { $db = new PDO($dsn, $user, $pass, array(PDO::ATTR_PERSISTENT => true)); -} +} catch (PDOException $e) { echo 'Connection failed: ' . $e->getMessage(); exit; @@ -28,7 +28,7 @@ catch (PDOException $e) { // This triggers the call to check liveness try { $db = new PDO($dsn, $user, $pass, array(PDO::ATTR_PERSISTENT => true)); -} +} catch (PDOException $e) { echo 'Connection failed: ' . $e->getMessage(); exit; diff --git a/ext/pdo_oci/tests/common.phpt b/ext/pdo_oci/tests/common.phpt index 5107828cee..765a01bcba 100644 --- a/ext/pdo_oci/tests/common.phpt +++ b/ext/pdo_oci/tests/common.phpt @@ -9,7 +9,7 @@ if (!extension_loaded('pdo_oci')) print 'skip'; ?> $config = array( 'TESTS' => 'ext/pdo/tests' ); - + if (false !== getenv('PDO_OCI_TEST_DSN')) { # user set them from their shell diff --git a/ext/pdo_oci/tests/pdo_oci_stream_2a.phpt b/ext/pdo_oci/tests/pdo_oci_stream_2a.phpt index 72d2ed93b1..8096fe17f7 100644 --- a/ext/pdo_oci/tests/pdo_oci_stream_2a.phpt +++ b/ext/pdo_oci/tests/pdo_oci_stream_2a.phpt @@ -24,7 +24,7 @@ $stmt->execute(); function do_insert($db, $id, $data1, $data2) { - $db->beginTransaction(); + $db->beginTransaction(); $stmt = $db->prepare("insert into pdo_oci_stream_2 (id, data1, data2) values (:id, empty_blob(), empty_blob()) returning data1, data2 into :blob1, :blob2"); $stmt->bindParam(':id', $id); $stmt->bindParam(':blob1', $blob1, PDO::PARAM_LOB); @@ -33,7 +33,7 @@ function do_insert($db, $id, $data1, $data2) $blob2 = null; $stmt->execute(); - fwrite($blob1, $data1); + fwrite($blob1, $data1); fclose($blob1); fwrite($blob2, $data2); fclose($blob2); diff --git a/ext/pdo_oci/tests/pdo_oci_stream_2b.phpt b/ext/pdo_oci/tests/pdo_oci_stream_2b.phpt index 54a5ef840b..ef5ff3d706 100644 --- a/ext/pdo_oci/tests/pdo_oci_stream_2b.phpt +++ b/ext/pdo_oci/tests/pdo_oci_stream_2b.phpt @@ -27,16 +27,16 @@ $a_val = ord('a'); foreach($db->query("select data1 as d4_1, data2 as d4_2 from pdo_oci_stream_2 order by id") as $row) { $a = $row['d4_1']; $a1 = $row['d4_2']; - + $str1 = stream_get_contents($a); $str2 = stream_get_contents($a1); - + $str1len = strlen($str1); $str2len = strlen($str2); - + $b = ord($str1[0]); $b1 = ord($str2[0]); - + if (($b != ($a_val + $i)) && ($str1len != (4086 + $i)) && ($b1 != ($a_val + $j)) && ($str2len != (4086 + $j))) { printf("There is a bug!\n"); @@ -45,13 +45,13 @@ foreach($db->query("select data1 as d4_1, data2 as d4_2 from pdo_oci_stream_2 or printf("b = %d\n", $b); printf("i = %d\n", $i); printf("str1len = %d\n", $str1len); - + printf("Col2:\n"); printf("a_val = %d\n", $a_val); printf("b1 = %d\n", $b1); printf("j = %d\n", $j); printf("str2len = %d\n", $str1len); - + } $i++; if ($i>9) diff --git a/ext/pdo_oci/tests/pecl_bug_11345.phpt b/ext/pdo_oci/tests/pecl_bug_11345.phpt index b80773a334..8a633f547c 100644 --- a/ext/pdo_oci/tests/pecl_bug_11345.phpt +++ b/ext/pdo_oci/tests/pecl_bug_11345.phpt @@ -15,7 +15,7 @@ PDOTest::skip(); try { $dbh = new PDO('oci:dbname=xxx;charset=yyy', 'abc', 'def'); -} +} catch (PDOException $e) { echo 'Connection failed: ' . $e->getMessage(). "\n"; exit; diff --git a/ext/pdo_odbc/tests/common.phpt b/ext/pdo_odbc/tests/common.phpt index 276f2b78e3..e8c4d07c70 100644 --- a/ext/pdo_odbc/tests/common.phpt +++ b/ext/pdo_odbc/tests/common.phpt @@ -16,7 +16,7 @@ $config = array( 'TESTS' => 'ext/pdo/tests', 'ENV' => array() ); - + // try loading PDO driver using ENV vars and if none given, and on Windows, try using MS Access // and if not, skip the test // @@ -27,7 +27,7 @@ if (false !== getenv('PDOTEST_DSN')) { // 2. it detects if ODBC driver is not installed - to avoid test bug // 3. it detects if ODBC driver is installed - so test will be run // 4. so a specific ODBC driver can be tested - if system has multiple ODBC drivers - + $config['ENV']['PDOTEST_DSN'] = getenv('PDOTEST_DSN'); $config['ENV']['PDOTEST_USER'] = getenv('PDOTEST_USER'); $config['ENV']['PDOTEST_PASS'] = getenv('PDOTEST_PASS'); @@ -53,7 +53,7 @@ if (false !== getenv('PDOTEST_DSN')) { $adox = new COM('ADOX.Catalog'); $adox->Create('Provider=Microsoft.Jet.OLEDB.4.0;Data Source=' . $path); $adox = null; - + } catch (Exception $e) { } } @@ -73,5 +73,5 @@ $DBNAME = 'SAMPLE'; $CONNECTION = "odbc:DSN=$DBNAME;UID=$USER;PWD=$PASSWD;"; */ - + return $config; diff --git a/ext/pdo_pgsql/tests/bug43925.phpt b/ext/pdo_pgsql/tests/bug43925.phpt index e531a2f7d4..6f2d5ee0d5 100644 --- a/ext/pdo_pgsql/tests/bug43925.phpt +++ b/ext/pdo_pgsql/tests/bug43925.phpt @@ -31,10 +31,10 @@ $dbh->query('INSERT INTO nodes (id, root, lft, rgt) VALUES (3, 1, 4, 5);'); $stmt = $dbh->prepare(' SELECT * FROM nodes - WHERE (:rootId > 0 OR lft > :left OR rgt > :left) + WHERE (:rootId > 0 OR lft > :left OR rgt > :left) AND (root = :rootId OR root = :left) - AND (1 > :left OR 1 < :left OR 1 = :left) - AND (:x > 0 OR :x < 10 OR :x > 100) + AND (1 > :left OR 1 < :left OR 1 = :left) + AND (:x > 0 OR :x < 10 OR :x > 100) OR :y = 1 OR :left = 1 '); diff --git a/ext/pdo_pgsql/tests/bug75402.phpt b/ext/pdo_pgsql/tests/bug75402.phpt index 4595ca93f2..8c833cced8 100644 --- a/ext/pdo_pgsql/tests/bug75402.phpt +++ b/ext/pdo_pgsql/tests/bug75402.phpt @@ -47,19 +47,19 @@ $db->query("INSERT INTO bug75402 (\"id\", \"group_id\", \"submitter\", \"operati $sql = "SELECT - ID as \"sID\", - GROUP_ID as \"sGroupID\", - SUBMITTER as \"sOwner\", - OPERATION as \"sOperation\", - DESCRIPTION as \"sInfo\", - STAGE as \"sShortStatus\", - STATUS as \"sStatus\", - PROGRESS as \"sProgress\", - HIDDEN as \"bHidden\", + ID as \"sID\", + GROUP_ID as \"sGroupID\", + SUBMITTER as \"sOwner\", + OPERATION as \"sOperation\", + DESCRIPTION as \"sInfo\", + STAGE as \"sShortStatus\", + STATUS as \"sStatus\", + PROGRESS as \"sProgress\", + HIDDEN as \"bHidden\", to_char(INSERT_DATETIME, 'IYYY.MM.DD HH24:MI:SS') as \"sDatetime\" FROM bug75402 ORDER BY INSERT_DATETIME DESC"; - + if ($db) { $stmt = $db->prepare($sql, array( diff --git a/ext/pdo_sqlite/tests/bug35336.phpt b/ext/pdo_sqlite/tests/bug35336.phpt index ecb4213ad5..1f9fda12b6 100644 --- a/ext/pdo_sqlite/tests/bug35336.phpt +++ b/ext/pdo_sqlite/tests/bug35336.phpt @@ -20,7 +20,7 @@ $rez = $a->query ("SELECT * FROM test")->fetchAll(PDO::FETCH_CLASS, 'EEE'); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- hello world hello world Done diff --git a/ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt b/ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt index a538f56983..c452d4c34f 100644 --- a/ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt +++ b/ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt @@ -33,7 +33,7 @@ var_dump($st->fetchAll(PDO::FETCH_FUNC, 1)); $st = $db->query('SELECT * FROM testing'); var_dump($st->fetchAll(PDO::FETCH_FUNC, array('self', 'foo'))); -class foo { +class foo { public function method($x) { return "--- $x ---"; } @@ -43,15 +43,15 @@ class bar extends foo { $st = $db->query('SELECT * FROM testing'); var_dump($st->fetchAll(PDO::FETCH_FUNC, array($this, 'parent::method'))); } - + static public function test($x, $y) { return $x .'---'. $y; } - + private function test2($x, $y) { return $x; } - + public function test3($x, $y) { return $x .'==='. $y; } diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_get_attribute.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_get_attribute.phpt index d6e095d54a..56ad5c66b9 100644 --- a/ext/pdo_sqlite/tests/pdo_sqlite_get_attribute.phpt +++ b/ext/pdo_sqlite/tests/pdo_sqlite_get_attribute.phpt @@ -4,7 +4,7 @@ PDO_sqlite: Testing getAttribute() <?php if (!extension_loaded('pdo_sqlite')) print 'skip not loaded'; ?> --FILE-- <?php - + $pdo = new PDO('sqlite::memory:'); var_dump($pdo->getAttribute(PDO::ATTR_SERVER_VERSION)); var_dump($pdo->getAttribute(PDO::ATTR_CLIENT_VERSION)); diff --git a/ext/pgsql/tests/02connection.phpt b/ext/pgsql/tests/02connection.phpt index 234427ba19..8db5e2071a 100644 --- a/ext/pgsql/tests/02connection.phpt +++ b/ext/pgsql/tests/02connection.phpt @@ -11,41 +11,41 @@ include('config.inc'); $db = pg_pconnect($conn_str); var_dump($db); -if (pg_connection_status($db) != PGSQL_CONNECTION_OK) +if (pg_connection_status($db) != PGSQL_CONNECTION_OK) { echo "pg_connection_status() error\n"; } -if (!pg_connection_reset($db)) +if (!pg_connection_reset($db)) { echo "pg_connection_reset() error\n"; } -if (pg_connection_busy($db)) +if (pg_connection_busy($db)) { echo "pg_connection_busy() error\n"; } if (function_exists('pg_transaction_status')) { - if (pg_transaction_status($db) != PGSQL_TRANSACTION_IDLE) + if (pg_transaction_status($db) != PGSQL_TRANSACTION_IDLE) { echo "pg_transaction_status() error\n"; } } -if (false === pg_host($db)) +if (false === pg_host($db)) { echo "pg_host() error\n"; } -if (!pg_dbname($db)) +if (!pg_dbname($db)) { echo "pg_dbname() error\n"; } -if (!pg_port($db)) +if (!pg_port($db)) { echo "pg_port() error\n"; } -if (pg_tty($db)) +if (pg_tty($db)) { echo "pg_tty() error\n"; } -if (pg_options($db)) +if (pg_options($db)) { echo "pg_options() error\n"; } diff --git a/ext/pgsql/tests/03sync_query.phpt b/ext/pgsql/tests/03sync_query.phpt index afb6bb4475..eb8fae084d 100644 --- a/ext/pgsql/tests/03sync_query.phpt +++ b/ext/pgsql/tests/03sync_query.phpt @@ -14,19 +14,19 @@ if (!($rows = pg_num_rows($result))) { echo "pg_num_row() error\n"; } -for ($i=0; $i < $rows; $i++) +for ($i=0; $i < $rows; $i++) { pg_fetch_array($result, $i, PGSQL_NUM); } -for ($i=0; $i < $rows; $i++) +for ($i=0; $i < $rows; $i++) { pg_fetch_object($result); } -for ($i=0; $i < $rows; $i++) +for ($i=0; $i < $rows; $i++) { pg_fetch_row($result, $i); } -for ($i=0; $i < $rows; $i++) +for ($i=0; $i < $rows; $i++) { pg_fetch_result($result, $i, 0); } diff --git a/ext/pgsql/tests/04async_query.phpt b/ext/pgsql/tests/04async_query.phpt index 7711240a79..fe67382026 100644 --- a/ext/pgsql/tests/04async_query.phpt +++ b/ext/pgsql/tests/04async_query.phpt @@ -16,7 +16,7 @@ while(pg_connection_busy($db)); // busy wait: intended if (pg_connection_status($db) === PGSQL_CONNECTION_BAD) { echo "pg_connection_status() error\n"; } -if (!($result = pg_get_result($db))) +if (!($result = pg_get_result($db))) { echo "pg_get_result() error\n"; } @@ -24,19 +24,19 @@ if (!($result = pg_get_result($db))) if (!($rows = pg_num_rows($result))) { echo "pg_num_rows() error\n"; } -for ($i=0; $i < $rows; $i++) +for ($i=0; $i < $rows; $i++) { pg_fetch_array($result, $i, PGSQL_NUM); } -for ($i=0; $i < $rows; $i++) +for ($i=0; $i < $rows; $i++) { pg_fetch_object($result); } -for ($i=0; $i < $rows; $i++) +for ($i=0; $i < $rows; $i++) { pg_fetch_row($result, $i); } -for ($i=0; $i < $rows; $i++) +for ($i=0; $i < $rows; $i++) { pg_fetch_result($result, $i, 0); } @@ -50,7 +50,7 @@ pg_field_type($result, 0); pg_field_prtlen($result, 0); pg_field_is_null($result, 0); -if (!pg_send_query($db, "INSERT INTO ".$table_name." VALUES (8888, 'GGG');")) +if (!pg_send_query($db, "INSERT INTO ".$table_name." VALUES (8888, 'GGG');")) { echo "pg_send_query() error\n"; } diff --git a/ext/pgsql/tests/23sync_query_params.phpt b/ext/pgsql/tests/23sync_query_params.phpt index 6959cd75a7..a700ddca17 100644 --- a/ext/pgsql/tests/23sync_query_params.phpt +++ b/ext/pgsql/tests/23sync_query_params.phpt @@ -1,8 +1,8 @@ --TEST-- PostgreSQL sync query params --SKIPIF-- -<?php -include("skipif.inc"); +<?php +include("skipif.inc"); if (!function_exists('pg_query_params')) die('skip function pg_query_params() does not exist'); ?> --FILE-- @@ -19,19 +19,19 @@ if ($version['protocol'] >= 3) { { echo "pg_num_row() error\n"; } - for ($i=0; $i < $rows; $i++) + for ($i=0; $i < $rows; $i++) { pg_fetch_array($result, $i, PGSQL_NUM); } - for ($i=0; $i < $rows; $i++) + for ($i=0; $i < $rows; $i++) { pg_fetch_object($result); } - for ($i=0; $i < $rows; $i++) + for ($i=0; $i < $rows; $i++) { pg_fetch_row($result, $i); } - for ($i=0; $i < $rows; $i++) + for ($i=0; $i < $rows; $i++) { pg_fetch_result($result, $i, 0); } diff --git a/ext/pgsql/tests/24sync_query_prepared.phpt b/ext/pgsql/tests/24sync_query_prepared.phpt index ea8f14661a..ca099eb43b 100644 --- a/ext/pgsql/tests/24sync_query_prepared.phpt +++ b/ext/pgsql/tests/24sync_query_prepared.phpt @@ -22,19 +22,19 @@ if ($version['protocol'] >= 3) { { echo "pg_num_row() error\n"; } - for ($i=0; $i < $rows; $i++) + for ($i=0; $i < $rows; $i++) { pg_fetch_array($result, $i, PGSQL_NUM); } - for ($i=0; $i < $rows; $i++) + for ($i=0; $i < $rows; $i++) { pg_fetch_object($result); } - for ($i=0; $i < $rows; $i++) + for ($i=0; $i < $rows; $i++) { pg_fetch_row($result, $i); } - for ($i=0; $i < $rows; $i++) + for ($i=0; $i < $rows; $i++) { pg_fetch_result($result, $i, 0); } diff --git a/ext/pgsql/tests/25async_query_params.phpt b/ext/pgsql/tests/25async_query_params.phpt index 6e7dafe34b..ae1a1630ef 100644 --- a/ext/pgsql/tests/25async_query_params.phpt +++ b/ext/pgsql/tests/25async_query_params.phpt @@ -21,26 +21,26 @@ if ($version['protocol'] >= 3) { if (pg_connection_status($db) === PGSQL_CONNECTION_BAD) { echo "pg_connection_status() error\n"; } - if (!($result = pg_get_result($db))) + if (!($result = pg_get_result($db))) { echo "pg_get_result() error\n"; } if (!($rows = pg_num_rows($result))) { echo "pg_num_rows() error\n"; } - for ($i=0; $i < $rows; $i++) + for ($i=0; $i < $rows; $i++) { pg_fetch_array($result, $i, PGSQL_NUM); } - for ($i=0; $i < $rows; $i++) + for ($i=0; $i < $rows; $i++) { pg_fetch_object($result); } - for ($i=0; $i < $rows; $i++) + for ($i=0; $i < $rows; $i++) { pg_fetch_row($result, $i); } - for ($i=0; $i < $rows; $i++) + for ($i=0; $i < $rows; $i++) { pg_fetch_result($result, $i, 0); } diff --git a/ext/pgsql/tests/26async_query_prepared.phpt b/ext/pgsql/tests/26async_query_prepared.phpt index bda363b750..33ca7c7bfa 100644 --- a/ext/pgsql/tests/26async_query_prepared.phpt +++ b/ext/pgsql/tests/26async_query_prepared.phpt @@ -21,7 +21,7 @@ if ($version['protocol'] >= 3) { if (pg_connection_status($db) === PGSQL_CONNECTION_BAD) { echo "pg_connection_status() error\n"; } - if (!($result = pg_get_result($db))) + if (!($result = pg_get_result($db))) { echo "pg_get_result() error\n"; } @@ -34,7 +34,7 @@ if ($version['protocol'] >= 3) { if (pg_connection_status($db) === PGSQL_CONNECTION_BAD) { echo "pg_connection_status() error\n"; } - if (!($result = pg_get_result($db))) + if (!($result = pg_get_result($db))) { echo "pg_get_result() error\n"; } @@ -42,19 +42,19 @@ if ($version['protocol'] >= 3) { if (!($rows = pg_num_rows($result))) { echo "pg_num_rows() error\n"; } - for ($i=0; $i < $rows; $i++) + for ($i=0; $i < $rows; $i++) { pg_fetch_array($result, $i, PGSQL_NUM); } - for ($i=0; $i < $rows; $i++) + for ($i=0; $i < $rows; $i++) { pg_fetch_object($result); } - for ($i=0; $i < $rows; $i++) + for ($i=0; $i < $rows; $i++) { pg_fetch_row($result, $i); } - for ($i=0; $i < $rows; $i++) + for ($i=0; $i < $rows; $i++) { pg_fetch_result($result, $i, 0); } @@ -76,7 +76,7 @@ if ($version['protocol'] >= 3) { if (pg_connection_status($db) === PGSQL_CONNECTION_BAD) { echo "pg_connection_status() error\n"; } - if (!($result = pg_get_result($db))) + if (!($result = pg_get_result($db))) { echo "pg_get_result() error\n"; } @@ -90,7 +90,7 @@ if ($version['protocol'] >= 3) { if (pg_connection_status($db) === PGSQL_CONNECTION_BAD) { echo "pg_connection_status() error\n"; } - if (!($result = pg_get_result($db))) + if (!($result = pg_get_result($db))) { echo "pg_get_result() error\n"; } diff --git a/ext/pgsql/tests/27large_object_oid.phpt b/ext/pgsql/tests/27large_object_oid.phpt index 0a469bc20e..c9e33992d7 100644 --- a/ext/pgsql/tests/27large_object_oid.phpt +++ b/ext/pgsql/tests/27large_object_oid.phpt @@ -1,8 +1,8 @@ --TEST-- PostgreSQL create large object with given oid --SKIPIF-- -<?php -include("skipif.inc"); +<?php +include("skipif.inc"); $v = pg_version($conn); if (version_compare("8.3", $v["client"]) > 0) die("skip - requires pg client >= 8.3\n"); if (version_compare("8.3", $v["server"]) > 0) die("skip - requires pg server >= 8.3\n"); diff --git a/ext/pgsql/tests/28large_object_import_oid.phpt b/ext/pgsql/tests/28large_object_import_oid.phpt index 323d179635..9ffb96123e 100644 --- a/ext/pgsql/tests/28large_object_import_oid.phpt +++ b/ext/pgsql/tests/28large_object_import_oid.phpt @@ -1,8 +1,8 @@ --TEST-- PostgreSQL import large object with given oid --SKIPIF-- -<?php -include("skipif.inc"); +<?php +include("skipif.inc"); $v = pg_version($conn); if (version_compare("8.4devel", $v["client"]) > 0) die("skip - requires pg client >= 8.4\n"); if (version_compare("8.4devel", $v["server"]) > 0) die("skip - requires pg server >= 8.4\n"); diff --git a/ext/pgsql/tests/80_bug14383.phpt b/ext/pgsql/tests/80_bug14383.phpt index e73f0fd1fb..97fcfe6dcb 100644 --- a/ext/pgsql/tests/80_bug14383.phpt +++ b/ext/pgsql/tests/80_bug14383.phpt @@ -1,14 +1,14 @@ --TEST-- Bug #14383 (8.0+) (using postgres with DBA causes DBA not to be able to find any keys) --SKIPIF-- -<?php +<?php require_once(dirname(__FILE__).'/../../dba/tests/skipif.inc'); require_once('skipif.inc'); ?> --FILE-- <?php require_once('config.inc'); - + $dbh = @pg_connect($conn_str); if (!$dbh) { die ("Could not connect to the server"); diff --git a/ext/pgsql/tests/80_bug24499.phpt b/ext/pgsql/tests/80_bug24499.phpt index 32e789de8d..a9773bdafe 100644 --- a/ext/pgsql/tests/80_bug24499.phpt +++ b/ext/pgsql/tests/80_bug24499.phpt @@ -1,14 +1,14 @@ --TEST-- Bug #24499 (Notice: Undefined property: stdClass::) --SKIPIF-- -<?php +<?php require_once('skipif.inc'); ?> --FILE-- <?php require_once('config.inc'); - + $dbh = @pg_connect($conn_str); if (!$dbh) { die ("Could not connect to the server"); diff --git a/ext/pgsql/tests/80_bug27597.phpt b/ext/pgsql/tests/80_bug27597.phpt index df9d1c76cf..36e85044d5 100644 --- a/ext/pgsql/tests/80_bug27597.phpt +++ b/ext/pgsql/tests/80_bug27597.phpt @@ -1,14 +1,14 @@ --TEST-- Bug #27597 (pg_fetch_array not returning false) --SKIPIF-- -<?php +<?php require_once('skipif.inc'); ?> --FILE-- <?php require_once(dirname(__FILE__) . '/config.inc'); - + $dbh = @pg_connect($conn_str); if (!$dbh) { die ("Could not connect to the server"); @@ -23,7 +23,7 @@ for ($i=0; $i<4; $i++) { function xi_fetch_array($res, $type = PGSQL_ASSOC) { $a = pg_fetch_array($res, NULL, $type) ; - return $a ; + return $a ; } $res = pg_query("SELECT * FROM id"); diff --git a/ext/pgsql/tests/80_bug32223.phpt b/ext/pgsql/tests/80_bug32223.phpt index b9bbbf86ed..fbe0d5ff97 100644 --- a/ext/pgsql/tests/80_bug32223.phpt +++ b/ext/pgsql/tests/80_bug32223.phpt @@ -1,11 +1,11 @@ --TEST-- Bug #32223 (weird behaviour of pg_last_notice) --SKIPIF-- -<?php +<?php require_once('skipif.inc'); _skip_lc_messages(); - + @pg_query($conn, "CREATE LANGUAGE 'plpgsql' HANDLER plpgsql_call_handler LANCOMPILER 'PL/pgSQL'"); $res = @pg_query($conn, "CREATE OR REPLACE FUNCTION test_notice() RETURNS boolean AS ' begin @@ -22,7 +22,7 @@ pgsql.ignore_notice=0 require_once('config.inc'); require_once('lcmess.inc'); - + $dbh = @pg_connect($conn_str); if (!$dbh) { die ("Could not connect to the server"); diff --git a/ext/pgsql/tests/80_bug32223b.phpt b/ext/pgsql/tests/80_bug32223b.phpt index 418ccfc9ae..9e0e0f7132 100644 --- a/ext/pgsql/tests/80_bug32223b.phpt +++ b/ext/pgsql/tests/80_bug32223b.phpt @@ -1,11 +1,11 @@ --TEST-- Bug #32223 (weird behaviour of pg_last_notice using define) --SKIPIF-- -<?php +<?php require_once('skipif.inc'); _skip_lc_messages(); - + @pg_query($conn, "CREATE LANGUAGE 'plpgsql' HANDLER plpgsql_call_handler LANCOMPILER 'PL/pgSQL'"); $res = @pg_query($conn, "CREATE OR REPLACE FUNCTION test_notice() RETURNS boolean AS ' begin diff --git a/ext/pgsql/tests/80_bug36625.phpt b/ext/pgsql/tests/80_bug36625.phpt index 87dd84adc4..86d40ce4dc 100644 --- a/ext/pgsql/tests/80_bug36625.phpt +++ b/ext/pgsql/tests/80_bug36625.phpt @@ -8,7 +8,7 @@ require_once('skipif.inc'); <?php require_once('config.inc'); - + $dbh = @pg_connect($conn_str); if (!$dbh) { die ('Could not connect to the server'); diff --git a/ext/pgsql/tests/80_bug39971.phpt b/ext/pgsql/tests/80_bug39971.phpt index 49f370b88d..14c7fbd547 100644 --- a/ext/pgsql/tests/80_bug39971.phpt +++ b/ext/pgsql/tests/80_bug39971.phpt @@ -1,14 +1,14 @@ --TEST-- Bug #39971 (8.0+) (pg_insert/pg_update do not allow now() to be used for timestamp fields) --SKIPIF-- -<?php +<?php require_once('skipif.inc'); ?> --FILE-- <?php require_once('config.inc'); - + $dbh = @pg_connect($conn_str); if (!$dbh) { die ("Could not connect to the server"); diff --git a/ext/pgsql/tests/80_bug42783.phpt b/ext/pgsql/tests/80_bug42783.phpt index 575e527db9..91461f4b73 100644 --- a/ext/pgsql/tests/80_bug42783.phpt +++ b/ext/pgsql/tests/80_bug42783.phpt @@ -1,14 +1,14 @@ --TEST-- Bug #42783 (pg_insert() does not support an empty value array) --SKIPIF-- -<?php +<?php require_once('skipif.inc'); ?> --FILE-- <?php require_once('config.inc'); - + $dbh = @pg_connect($conn_str); if (!$dbh) { die ("Could not connect to the server"); diff --git a/ext/pgsql/tests/bug71998.phpt b/ext/pgsql/tests/bug71998.phpt index b9924166f9..d32c47bb43 100644 --- a/ext/pgsql/tests/bug71998.phpt +++ b/ext/pgsql/tests/bug71998.phpt @@ -55,7 +55,7 @@ $i = 0; $errors = 0; foreach ($ips as $ip) { $data = array("id" => ++$i, "remote_addr" => $ip); - $r = @pg_insert($db, 'tmp_statistics', $data); + $r = @pg_insert($db, 'tmp_statistics', $data); if (!$r && in_array($ip, $bad)) { $errors++; diff --git a/ext/phar/tests/026.phpt b/ext/phar/tests/026.phpt index 696fbcf415..e59a07239b 100644 --- a/ext/phar/tests/026.phpt +++ b/ext/phar/tests/026.phpt @@ -11,11 +11,11 @@ $pname = 'phar://' . $fname; $file = "<?php __HALT_COMPILER(); ?>"; $files = array(); -$files['a.php'] = '<?php echo "This is a\n"; require \''.$pname.'/b.php\'; ?>'; -$files['b.php'] = '<?php echo "This is b\n"; require \''.$pname.'/b/c.php\'; ?>'; -$files['b/c.php'] = '<?php echo "This is b/c\n"; require \''.$pname.'/b/d.php\'; ?>'; -$files['b/d.php'] = '<?php echo "This is b/d\n"; require \''.$pname.'/e.php\'; ?>'; -$files['e.php'] = '<?php echo "This is e\n"; ?>'; +$files['a.php'] = '<?php echo "This is a\n"; require \''.$pname.'/b.php\'; ?>'; +$files['b.php'] = '<?php echo "This is b\n"; require \''.$pname.'/b/c.php\'; ?>'; +$files['b/c.php'] = '<?php echo "This is b/c\n"; require \''.$pname.'/b/d.php\'; ?>'; +$files['b/d.php'] = '<?php echo "This is b/d\n"; require \''.$pname.'/e.php\'; ?>'; +$files['e.php'] = '<?php echo "This is e\n"; ?>'; include 'files/phar_test.inc'; diff --git a/ext/phar/tests/028.phpt b/ext/phar/tests/028.phpt index 95aa7b0887..b60926e634 100644 --- a/ext/phar/tests/028.phpt +++ b/ext/phar/tests/028.phpt @@ -12,11 +12,11 @@ $file = '<?php include "' . $pname . '/a.php"; __HALT_COMPILER(); ?>'; $alias = ''; $files = array(); -$files['a.php'] = '<?php echo "This is a\n"; include "'.$pname.'/b.php"; ?>'; -$files['b.php'] = '<?php echo "This is b\n"; include "'.$pname.'/b/c.php"; ?>'; -$files['b/c.php'] = '<?php echo "This is b/c\n"; include "'.$pname.'/b/d.php"; ?>'; -$files['b/d.php'] = '<?php echo "This is b/d\n"; include "'.$pname.'/e.php"; ?>'; -$files['e.php'] = '<?php echo "This is e\n"; ?>'; +$files['a.php'] = '<?php echo "This is a\n"; include "'.$pname.'/b.php"; ?>'; +$files['b.php'] = '<?php echo "This is b\n"; include "'.$pname.'/b/c.php"; ?>'; +$files['b/c.php'] = '<?php echo "This is b/c\n"; include "'.$pname.'/b/d.php"; ?>'; +$files['b/d.php'] = '<?php echo "This is b/d\n"; include "'.$pname.'/e.php"; ?>'; +$files['e.php'] = '<?php echo "This is e\n"; ?>'; include 'files/phar_test.inc'; diff --git a/ext/phar/tests/029.phpt b/ext/phar/tests/029.phpt index 41fcec03e7..58eddb7273 100644 --- a/ext/phar/tests/029.phpt +++ b/ext/phar/tests/029.phpt @@ -14,11 +14,11 @@ $pname = 'phar://hio'; $file = '<?php include "' . $pname . '/a.php"; __HALT_COMPILER(); ?>'; $files = array(); -$files['a.php'] = '<?php echo "This is a\n"; include "'.$pname.'/b.php"; ?>'; -$files['b.php'] = '<?php echo "This is b\n"; include "'.$pname.'/b/c.php"; ?>'; -$files['b/c.php'] = '<?php echo "This is b/c\n"; include "'.$pname.'/b/d.php"; ?>'; -$files['b/d.php'] = '<?php echo "This is b/d\n"; include "'.$pname.'/e.php"; ?>'; -$files['e.php'] = '<?php echo "This is e\n"; ?>'; +$files['a.php'] = '<?php echo "This is a\n"; include "'.$pname.'/b.php"; ?>'; +$files['b.php'] = '<?php echo "This is b\n"; include "'.$pname.'/b/c.php"; ?>'; +$files['b/c.php'] = '<?php echo "This is b/c\n"; include "'.$pname.'/b/d.php"; ?>'; +$files['b/d.php'] = '<?php echo "This is b/d\n"; include "'.$pname.'/e.php"; ?>'; +$files['e.php'] = '<?php echo "This is e\n"; ?>'; include 'files/phar_test.inc'; @@ -39,7 +39,7 @@ catch (Exception $e) ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.1.phar.php'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php'); ?> diff --git a/ext/phar/tests/030.phpt b/ext/phar/tests/030.phpt index 14df993e1b..343be7f084 100644 --- a/ext/phar/tests/030.phpt +++ b/ext/phar/tests/030.phpt @@ -34,7 +34,7 @@ echo $e->getMessage(),"\n"; ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- diff --git a/ext/phar/tests/031.phpt b/ext/phar/tests/031.phpt index d458f068f5..ec44624d3f 100644 --- a/ext/phar/tests/031.phpt +++ b/ext/phar/tests/031.phpt @@ -21,7 +21,7 @@ require $pname; ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/files/031.phar.php'); __halt_compiler(); ?> diff --git a/ext/phar/tests/032.phpt b/ext/phar/tests/032.phpt index 4df6cc32b0..5e5d759c62 100644 --- a/ext/phar/tests/032.phpt +++ b/ext/phar/tests/032.phpt @@ -20,7 +20,7 @@ echo $e->getMessage(); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/files/032.phar.php'); __halt_compiler(); ?> diff --git a/ext/phar/tests/033.phpt b/ext/phar/tests/033.phpt index d53c7f52fa..a0b1f659f5 100644 --- a/ext/phar/tests/033.phpt +++ b/ext/phar/tests/033.phpt @@ -32,7 +32,7 @@ var_dump($a['dir']->isReadable()); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.1.phar.php'); ?> --EXPECT-- diff --git a/ext/phar/tests/033a.phpt b/ext/phar/tests/033a.phpt index e8725bdda6..8dcdfc4074 100644 --- a/ext/phar/tests/033a.phpt +++ b/ext/phar/tests/033a.phpt @@ -27,7 +27,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.1.phar.php'); ?> --EXPECTF-- diff --git a/ext/phar/tests/bug13727.phpt b/ext/phar/tests/bug13727.phpt index e742b955d7..4996c2eb21 100644 --- a/ext/phar/tests/bug13727.phpt +++ b/ext/phar/tests/bug13727.phpt @@ -19,17 +19,17 @@ for ($i = 0; $i < 4*1024; $i++){ mkdir($fileDir, 0777, true); file_put_contents("$fileDir/$i", ""); $p->addFile("$fileDir/$i", "$dirName"); -} +} echo("\n Written Files($i)\n"); ?> ===DONE=== --CLEAN-- -<?php +<?php $dirName = dirname(__FILE__); $fileDir="$dirName/test_data"; for ($i = 0; $i < 4*1024; $i++){ unlink("$fileDir/$i"); -} +} rmdir($fileDir); unlink($dirName . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); __HALT_COMPILER(); diff --git a/ext/phar/tests/bug45218_SLOWTEST.phpt b/ext/phar/tests/bug45218_SLOWTEST.phpt index aa98eb2339..28db3de7b5 100644 --- a/ext/phar/tests/bug45218_SLOWTEST.phpt +++ b/ext/phar/tests/bug45218_SLOWTEST.phpt @@ -53,7 +53,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.txt'); __halt_compiler(); diff --git a/ext/phar/tests/bug46060.phpt b/ext/phar/tests/bug46060.phpt index 1ca346ea19..e4ecf9fd6e 100644 --- a/ext/phar/tests/bug46060.phpt +++ b/ext/phar/tests/bug46060.phpt @@ -21,7 +21,7 @@ var_dump($phar['blah']->isDir(), $phar['test']->isDir()); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.tar'); __HALT_COMPILER(); diff --git a/ext/phar/tests/bug53872.phpt b/ext/phar/tests/bug53872.phpt index 2fc55d9155..a3745a20cb 100644 --- a/ext/phar/tests/bug53872.phpt +++ b/ext/phar/tests/bug53872.phpt @@ -1,9 +1,9 @@ --TEST-- bug#53872 (internal corruption of phar) --SKIPIF-- -<?php -if (!extension_loaded("phar")) die("skip"); -if (!extension_loaded("zlib")) die("skip Test needs ext/zlib"); +<?php +if (!extension_loaded("phar")) die("skip"); +if (!extension_loaded("zlib")) die("skip Test needs ext/zlib"); ?> --INI-- phar.readonly=0 diff --git a/ext/phar/tests/bug64931/bug64931.phpt b/ext/phar/tests/bug64931/bug64931.phpt index 630746cdf8..4439fcf792 100644 --- a/ext/phar/tests/bug64931/bug64931.phpt +++ b/ext/phar/tests/bug64931/bug64931.phpt @@ -5,7 +5,7 @@ Bug #64931 (phar_add_file is too restrictive on filename) --INI-- phar.readonly=0 --FILE-- -<?php +<?php echo "Test\n"; diff --git a/ext/phar/tests/bug69958.phpt b/ext/phar/tests/bug69958.phpt index 96f2198b14..6df1178bef 100644 --- a/ext/phar/tests/bug69958.phpt +++ b/ext/phar/tests/bug69958.phpt @@ -7,7 +7,7 @@ Still has memory leaks, see https://bugs.php.net/bug.php?id=70005 --FILE-- <?php $tarphar = new PharData(__DIR__.'/bug69958.tar'); -$phar = $tarphar->convertToData(Phar::TAR); +$phar = $tarphar->convertToData(Phar::TAR); --EXPECTF-- Fatal error: Uncaught exception 'BadMethodCallException' with message 'phar "%s/bug69958.tar" exists and must be unlinked prior to conversion' in %s/bug69958.php:%d Stack trace: diff --git a/ext/phar/tests/bug70019.phpt b/ext/phar/tests/bug70019.phpt index 4b0cd38260..edd77125e1 100644 --- a/ext/phar/tests/bug70019.phpt +++ b/ext/phar/tests/bug70019.phpt @@ -9,7 +9,7 @@ $phar = new PharData(__DIR__."/bug70019.zip"); if(!is_dir($dir)) { mkdir($dir); } -$phar->extractTo($dir); +$phar->extractTo($dir); var_dump(file_exists("$dir/ThisIsATestFile.txt")); ?> ===DONE=== diff --git a/ext/phar/tests/bug71391.phpt b/ext/phar/tests/bug71391.phpt index b8d84f5375..6965aaaa30 100644 --- a/ext/phar/tests/bug71391.phpt +++ b/ext/phar/tests/bug71391.phpt @@ -11,7 +11,7 @@ $p->delMetaData(); ?> DONE --CLEAN-- -<?php +<?php unlink(__DIR__."/bug71391.test.tar"); ?> --EXPECT-- diff --git a/ext/phar/tests/bug71625.phpt b/ext/phar/tests/bug71625.phpt index 8e6c31f462..afdf56e8ad 100644 --- a/ext/phar/tests/bug71625.phpt +++ b/ext/phar/tests/bug71625.phpt @@ -3,7 +3,7 @@ Phar - Bug #71625 - Crash in php7.dll --INI-- phar.readonly=0 --SKIPIF-- -<?php +<?php if (!extension_loaded("phar") || !extension_loaded("zlib")) die("skip"); if(substr(PHP_OS, 0, 3) != 'WIN' ) { diff --git a/ext/phar/tests/mkdir.phpt b/ext/phar/tests/mkdir.phpt index 45c1d4674f..527d77547c 100644 --- a/ext/phar/tests/mkdir.phpt +++ b/ext/phar/tests/mkdir.phpt @@ -27,7 +27,7 @@ echo $e->getMessage(),"\n"; ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/phar_begin_setstub_commit.phpt b/ext/phar/tests/phar_begin_setstub_commit.phpt index 880bd53f3a..029870a45b 100644 --- a/ext/phar/tests/phar_begin_setstub_commit.phpt +++ b/ext/phar/tests/phar_begin_setstub_commit.phpt @@ -31,7 +31,7 @@ var_dump($p->getStub()); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/brandnewphar.phar'); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_buildfromdirectory1.phpt b/ext/phar/tests/phar_buildfromdirectory1.phpt index 957f246664..93fdf2922d 100644 --- a/ext/phar/tests/phar_buildfromdirectory1.phpt +++ b/ext/phar/tests/phar_buildfromdirectory1.phpt @@ -18,7 +18,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromdirectory1.phar'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/phar_buildfromdirectory2-win.phpt b/ext/phar/tests/phar_buildfromdirectory2-win.phpt index 5ed890a48b..b49b78d7c8 100644 --- a/ext/phar/tests/phar_buildfromdirectory2-win.phpt +++ b/ext/phar/tests/phar_buildfromdirectory2-win.phpt @@ -20,7 +20,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromdirectory2.phar'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/phar_buildfromdirectory2.phpt b/ext/phar/tests/phar_buildfromdirectory2.phpt index a33e50abbb..c98e8c2ffe 100644 --- a/ext/phar/tests/phar_buildfromdirectory2.phpt +++ b/ext/phar/tests/phar_buildfromdirectory2.phpt @@ -20,7 +20,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromdirectory2.phar'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/phar_buildfromdirectory3.phpt b/ext/phar/tests/phar_buildfromdirectory3.phpt index 921e39593d..ba2103a757 100644 --- a/ext/phar/tests/phar_buildfromdirectory3.phpt +++ b/ext/phar/tests/phar_buildfromdirectory3.phpt @@ -18,7 +18,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromdirectory3.phar'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/phar_buildfromdirectory4.phpt b/ext/phar/tests/phar_buildfromdirectory4.phpt index 5ee2c33871..16072ef8f7 100644 --- a/ext/phar/tests/phar_buildfromdirectory4.phpt +++ b/ext/phar/tests/phar_buildfromdirectory4.phpt @@ -29,7 +29,7 @@ var_dump(file_exists(dirname(__FILE__) . '/buildfromdirectory4.phar')); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromdirectory4.phar'); foreach(range(1, 4) as $i) { unlink(dirname(__FILE__) . "/testdir4/file$i.txt"); diff --git a/ext/phar/tests/phar_buildfromdirectory5.phpt b/ext/phar/tests/phar_buildfromdirectory5.phpt index f20c52ab91..6056750669 100644 --- a/ext/phar/tests/phar_buildfromdirectory5.phpt +++ b/ext/phar/tests/phar_buildfromdirectory5.phpt @@ -28,7 +28,7 @@ var_dump(file_exists(dirname(__FILE__) . '/buildfromdirectory5.phar')); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromdirectory5.phar'); foreach(range(1, 4) as $i) { unlink(dirname(__FILE__) . "/testdir5/file$i.txt"); diff --git a/ext/phar/tests/phar_buildfromdirectory6.phpt b/ext/phar/tests/phar_buildfromdirectory6.phpt index 5537ebac23..5015ce42bd 100644 --- a/ext/phar/tests/phar_buildfromdirectory6.phpt +++ b/ext/phar/tests/phar_buildfromdirectory6.phpt @@ -26,7 +26,7 @@ var_dump(file_exists(dirname(__FILE__) . '/buildfromdirectory6.phar')); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromdirectory6.phar'); foreach(range(1, 4) as $i) { unlink(dirname(__FILE__) . "/testdir6/file$i.txt"); diff --git a/ext/phar/tests/phar_buildfromiterator1.phpt b/ext/phar/tests/phar_buildfromiterator1.phpt index 0f656b64f2..7a67ea7073 100644 --- a/ext/phar/tests/phar_buildfromiterator1.phpt +++ b/ext/phar/tests/phar_buildfromiterator1.phpt @@ -18,7 +18,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromiterator1.phar'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/phar_buildfromiterator10.phpt b/ext/phar/tests/phar_buildfromiterator10.phpt index e6b9c025da..69c2704c3f 100644 --- a/ext/phar/tests/phar_buildfromiterator10.phpt +++ b/ext/phar/tests/phar_buildfromiterator10.phpt @@ -24,7 +24,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromiterator10.phar'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/phar_buildfromiterator2.phpt b/ext/phar/tests/phar_buildfromiterator2.phpt index e9dd26e9de..c6669e0555 100644 --- a/ext/phar/tests/phar_buildfromiterator2.phpt +++ b/ext/phar/tests/phar_buildfromiterator2.phpt @@ -17,7 +17,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromiterator2.phar'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/phar_buildfromiterator3.phpt b/ext/phar/tests/phar_buildfromiterator3.phpt index 1603631278..8537fe3ef7 100644 --- a/ext/phar/tests/phar_buildfromiterator3.phpt +++ b/ext/phar/tests/phar_buildfromiterator3.phpt @@ -45,7 +45,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromiterator3.phar'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/phar_buildfromiterator4.phpt b/ext/phar/tests/phar_buildfromiterator4.phpt index 9277db562b..9268d033f2 100644 --- a/ext/phar/tests/phar_buildfromiterator4.phpt +++ b/ext/phar/tests/phar_buildfromiterator4.phpt @@ -53,7 +53,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromiterator4.phar'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/phar_buildfromiterator5.phpt b/ext/phar/tests/phar_buildfromiterator5.phpt index b6fafec6f4..0b9bbde3a9 100644 --- a/ext/phar/tests/phar_buildfromiterator5.phpt +++ b/ext/phar/tests/phar_buildfromiterator5.phpt @@ -46,7 +46,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromiterator5.phar'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/phar_buildfromiterator6.phpt b/ext/phar/tests/phar_buildfromiterator6.phpt index 3a315fae4d..7167e5c743 100644 --- a/ext/phar/tests/phar_buildfromiterator6.phpt +++ b/ext/phar/tests/phar_buildfromiterator6.phpt @@ -46,7 +46,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromiterator6.phar'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/phar_buildfromiterator7.phpt b/ext/phar/tests/phar_buildfromiterator7.phpt index 3dd8fc1b00..029204fe6f 100644 --- a/ext/phar/tests/phar_buildfromiterator7.phpt +++ b/ext/phar/tests/phar_buildfromiterator7.phpt @@ -46,7 +46,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromiterator7.phar'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/phar_buildfromiterator8.phpt b/ext/phar/tests/phar_buildfromiterator8.phpt index de37ee8687..783cad2196 100644 --- a/ext/phar/tests/phar_buildfromiterator8.phpt +++ b/ext/phar/tests/phar_buildfromiterator8.phpt @@ -19,7 +19,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromiterator8.phar'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/phar_buildfromiterator9.phpt b/ext/phar/tests/phar_buildfromiterator9.phpt index 2c9306b6cc..04328dca91 100644 --- a/ext/phar/tests/phar_buildfromiterator9.phpt +++ b/ext/phar/tests/phar_buildfromiterator9.phpt @@ -47,7 +47,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromiterator9.phar'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/phar_commitwrite.phpt b/ext/phar/tests/phar_commitwrite.phpt index cd9e52f36f..86578754d9 100644 --- a/ext/phar/tests/phar_commitwrite.phpt +++ b/ext/phar/tests/phar_commitwrite.phpt @@ -24,7 +24,7 @@ var_dump($p->getStub()); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/brandnewphar.phar'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/phar_convert_repeated.phpt b/ext/phar/tests/phar_convert_repeated.phpt index 351e54af04..4ccf84fa6d 100644 --- a/ext/phar/tests/phar_convert_repeated.phpt +++ b/ext/phar/tests/phar_convert_repeated.phpt @@ -87,7 +87,7 @@ var_dump($phar->getAlias()); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); diff --git a/ext/phar/tests/phar_convert_tar.phpt b/ext/phar/tests/phar_convert_tar.phpt index d4031ec32f..c3f047d977 100644 --- a/ext/phar/tests/phar_convert_tar.phpt +++ b/ext/phar/tests/phar_convert_tar.phpt @@ -39,7 +39,7 @@ var_dump($phar->getStub()); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.tar'); diff --git a/ext/phar/tests/phar_convert_tar2.phpt b/ext/phar/tests/phar_convert_tar2.phpt index f0f0f69825..7160c52fbb 100644 --- a/ext/phar/tests/phar_convert_tar2.phpt +++ b/ext/phar/tests/phar_convert_tar2.phpt @@ -43,7 +43,7 @@ var_dump($phar->getStub()); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.gz'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.tar'); diff --git a/ext/phar/tests/phar_convert_tar3.phpt b/ext/phar/tests/phar_convert_tar3.phpt index 52fd0f555a..7a95805787 100644 --- a/ext/phar/tests/phar_convert_tar3.phpt +++ b/ext/phar/tests/phar_convert_tar3.phpt @@ -43,7 +43,7 @@ var_dump($phar->getStub()); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.bz2'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.tar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); diff --git a/ext/phar/tests/phar_convert_zip.phpt b/ext/phar/tests/phar_convert_zip.phpt index 734551ee9c..b17ccaa35e 100644 --- a/ext/phar/tests/phar_convert_zip.phpt +++ b/ext/phar/tests/phar_convert_zip.phpt @@ -38,7 +38,7 @@ var_dump($phar->getStub()); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip'); diff --git a/ext/phar/tests/phar_create_in_cwd.phpt b/ext/phar/tests/phar_create_in_cwd.phpt index cafc8a1cfb..78dd1b39e7 100644 --- a/ext/phar/tests/phar_create_in_cwd.phpt +++ b/ext/phar/tests/phar_create_in_cwd.phpt @@ -28,7 +28,7 @@ __HALT_COMPILER(); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/brandnewphar.phar'); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_ctx_001.phpt b/ext/phar/tests/phar_ctx_001.phpt index 13b4d6a781..197c7628d8 100644 --- a/ext/phar/tests/phar_ctx_001.phpt +++ b/ext/phar/tests/phar_ctx_001.phpt @@ -60,7 +60,7 @@ var_dump($phar['b']->getMetaData()); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_decompress.phpt b/ext/phar/tests/phar_decompress.phpt index abf385a68f..3344d9bbbd 100644 --- a/ext/phar/tests/phar_decompress.phpt +++ b/ext/phar/tests/phar_decompress.phpt @@ -48,7 +48,7 @@ echo $e->getMessage() . "\n"; ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.zip'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.hooba.phar'); diff --git a/ext/phar/tests/phar_magic.phpt b/ext/phar/tests/phar_magic.phpt index c2b25685f1..cbe0ebf133 100644 --- a/ext/phar/tests/phar_magic.phpt +++ b/ext/phar/tests/phar_magic.phpt @@ -20,7 +20,7 @@ include $fname; ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/phar_oo_009.phpt b/ext/phar/tests/phar_oo_009.phpt index f651a52563..05e1f1efeb 100644 --- a/ext/phar/tests/phar_oo_009.phpt +++ b/ext/phar/tests/phar_oo_009.phpt @@ -35,7 +35,7 @@ foreach($f as $k => $v) ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/files/phar_oo_009.phar.php'); __halt_compiler(); ?> diff --git a/ext/phar/tests/phar_oo_compressallbz2.phpt b/ext/phar/tests/phar_oo_compressallbz2.phpt index f6bf3f23a0..d4aadebce6 100644 --- a/ext/phar/tests/phar_oo_compressallbz2.phpt +++ b/ext/phar/tests/phar_oo_compressallbz2.phpt @@ -43,7 +43,7 @@ var_dump($phar['b']->isCompressed(Phar::BZ2)); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> diff --git a/ext/phar/tests/phar_oo_compressallgz.phpt b/ext/phar/tests/phar_oo_compressallgz.phpt index 8a23e7de84..65d018bdbd 100644 --- a/ext/phar/tests/phar_oo_compressallgz.phpt +++ b/ext/phar/tests/phar_oo_compressallgz.phpt @@ -47,7 +47,7 @@ echo $e->getMessage() . "\n"; ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> diff --git a/ext/phar/tests/phar_oo_compressed_001.phpt b/ext/phar/tests/phar_oo_compressed_001.phpt index 4bd04dec37..032faa1247 100644 --- a/ext/phar/tests/phar_oo_compressed_001.phpt +++ b/ext/phar/tests/phar_oo_compressed_001.phpt @@ -47,7 +47,7 @@ var_dump($phar['d']->isCompressed()); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_oo_compressed_001b.phpt b/ext/phar/tests/phar_oo_compressed_001b.phpt index 97c3cbb7ca..fcf06d4008 100644 --- a/ext/phar/tests/phar_oo_compressed_001b.phpt +++ b/ext/phar/tests/phar_oo_compressed_001b.phpt @@ -47,7 +47,7 @@ var_dump($phar['d']->isCompressed()); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_oo_compressed_002.phpt b/ext/phar/tests/phar_oo_compressed_002.phpt index 1a539ac803..f1ece51617 100644 --- a/ext/phar/tests/phar_oo_compressed_002.phpt +++ b/ext/phar/tests/phar_oo_compressed_002.phpt @@ -50,7 +50,7 @@ var_dump($phar['e']->isCompressed()); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_oo_compressed_002b.phpt b/ext/phar/tests/phar_oo_compressed_002b.phpt index 278137c676..dd935cc5ca 100644 --- a/ext/phar/tests/phar_oo_compressed_002b.phpt +++ b/ext/phar/tests/phar_oo_compressed_002b.phpt @@ -50,7 +50,7 @@ var_dump($phar['e']->isCompressed()); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_oo_getmodified.phpt b/ext/phar/tests/phar_oo_getmodified.phpt index 9ed19966b3..0df479e860 100644 --- a/ext/phar/tests/phar_oo_getmodified.phpt +++ b/ext/phar/tests/phar_oo_getmodified.phpt @@ -26,7 +26,7 @@ var_dump($phar->getModified()); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> diff --git a/ext/phar/tests/phar_oo_iswriteable.phpt b/ext/phar/tests/phar_oo_iswriteable.phpt index 9fbca2c9ea..8da3ca9e78 100644 --- a/ext/phar/tests/phar_oo_iswriteable.phpt +++ b/ext/phar/tests/phar_oo_iswriteable.phpt @@ -58,7 +58,7 @@ chmod($fname2, 0666); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.1.phar.php'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?> diff --git a/ext/phar/tests/phar_oo_uncompressall.phpt b/ext/phar/tests/phar_oo_uncompressall.phpt index ef348563f1..d5d392d14d 100644 --- a/ext/phar/tests/phar_oo_uncompressall.phpt +++ b/ext/phar/tests/phar_oo_uncompressall.phpt @@ -51,7 +51,7 @@ var_dump($phar['a']->isCompressed()); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> diff --git a/ext/phar/tests/phar_setalias.phpt b/ext/phar/tests/phar_setalias.phpt index ef9fa283d5..14990d0300 100644 --- a/ext/phar/tests/phar_setalias.phpt +++ b/ext/phar/tests/phar_setalias.phpt @@ -25,7 +25,7 @@ echo $phar->getAlias() . "\n"; ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phartmp.php'); __HALT_COMPILER(); diff --git a/ext/phar/tests/phar_setalias2.phpt b/ext/phar/tests/phar_setalias2.phpt index 901e4d2ebd..d9c763333f 100644 --- a/ext/phar/tests/phar_setalias2.phpt +++ b/ext/phar/tests/phar_setalias2.phpt @@ -37,7 +37,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phartmp.php'); unlink(dirname(__FILE__) . '/notphar.phar'); diff --git a/ext/phar/tests/phar_setdefaultstub.phpt b/ext/phar/tests/phar_setdefaultstub.phpt index fc7143af7b..1913685313 100644 --- a/ext/phar/tests/phar_setdefaultstub.phpt +++ b/ext/phar/tests/phar_setdefaultstub.phpt @@ -50,7 +50,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> --EXPECT-- diff --git a/ext/phar/tests/phar_setsignaturealgo1.phpt b/ext/phar/tests/phar_setsignaturealgo1.phpt index eacee7bb80..a6d59ff470 100644 --- a/ext/phar/tests/phar_setsignaturealgo1.phpt +++ b/ext/phar/tests/phar_setsignaturealgo1.phpt @@ -37,7 +37,7 @@ echo $e->getMessage(); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/brandnewphar.phar'); ?> --EXPECTF-- diff --git a/ext/phar/tests/phar_stub.phpt b/ext/phar/tests/phar_stub.phpt index ed306816e2..8dfd50ae6e 100644 --- a/ext/phar/tests/phar_stub.phpt +++ b/ext/phar/tests/phar_stub.phpt @@ -77,7 +77,7 @@ fclose($fp); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phartmp.php'); __HALT_COMPILER(); diff --git a/ext/phar/tests/phar_stub_error.phpt b/ext/phar/tests/phar_stub_error.phpt index 99f313bc2f..8e57692ab4 100644 --- a/ext/phar/tests/phar_stub_error.phpt +++ b/ext/phar/tests/phar_stub_error.phpt @@ -40,7 +40,7 @@ var_dump($phar->getStub() == $stub); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/phar_stub_write.phpt b/ext/phar/tests/phar_stub_write.phpt index 9e5d6d5635..dd0f35d295 100644 --- a/ext/phar/tests/phar_stub_write.phpt +++ b/ext/phar/tests/phar_stub_write.phpt @@ -43,7 +43,7 @@ var_dump($phar->getStub() == $sexp); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/phar_stub_write_file.phpt b/ext/phar/tests/phar_stub_write_file.phpt index c5a0a1eba9..3c0d72259f 100644 --- a/ext/phar/tests/phar_stub_write_file.phpt +++ b/ext/phar/tests/phar_stub_write_file.phpt @@ -44,7 +44,7 @@ var_dump($phar->getStub() == $sexp); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/phar_unlinkarchive.phpt b/ext/phar/tests/phar_unlinkarchive.phpt index 2f441bace5..98001fcbf0 100644 --- a/ext/phar/tests/phar_unlinkarchive.phpt +++ b/ext/phar/tests/phar_unlinkarchive.phpt @@ -78,7 +78,7 @@ include $pname . '/evil.php'; ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip'); diff --git a/ext/phar/tests/tar/033.phpt b/ext/phar/tests/tar/033.phpt index 1054cb1f66..b1cbef2acd 100644 --- a/ext/phar/tests/tar/033.phpt +++ b/ext/phar/tests/tar/033.phpt @@ -36,7 +36,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECT-- diff --git a/ext/phar/tests/tar/033a.phpt b/ext/phar/tests/tar/033a.phpt index 09b5446aec..09c2f3add1 100644 --- a/ext/phar/tests/tar/033a.phpt +++ b/ext/phar/tests/tar/033a.phpt @@ -36,7 +36,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- diff --git a/ext/phar/tests/tar/bug67761.phpt b/ext/phar/tests/tar/bug67761.phpt index 860213d28e..0686881118 100644 --- a/ext/phar/tests/tar/bug67761.phpt +++ b/ext/phar/tests/tar/bug67761.phpt @@ -3,7 +3,7 @@ Bug #67761 (Phar::mapPhar fails for Phars inside a path containing ".tar") --SKIPIF-- <?php extension_loaded("phar") or die("SKIP need ext/phar suppport"); ?> --FILE-- -<?php +<?php echo "Test\n"; diff --git a/ext/phar/tests/tar/phar_begin_setstub_commit.phpt b/ext/phar/tests/tar/phar_begin_setstub_commit.phpt index 1ef19ab130..d362637cc6 100644 --- a/ext/phar/tests/tar/phar_begin_setstub_commit.phpt +++ b/ext/phar/tests/tar/phar_begin_setstub_commit.phpt @@ -31,7 +31,7 @@ var_dump($p->getStub()); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/brandnewphar.phar.tar'); ?> --EXPECT-- diff --git a/ext/phar/tests/tar/phar_buildfromiterator4.phpt b/ext/phar/tests/tar/phar_buildfromiterator4.phpt index b7d6d56f64..051b3c2978 100644 --- a/ext/phar/tests/tar/phar_buildfromiterator4.phpt +++ b/ext/phar/tests/tar/phar_buildfromiterator4.phpt @@ -47,7 +47,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromiterator.phar.tar'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/tar/phar_buildfromiterator5.phpt b/ext/phar/tests/tar/phar_buildfromiterator5.phpt index 54972cbb0b..dcb610fb1e 100644 --- a/ext/phar/tests/tar/phar_buildfromiterator5.phpt +++ b/ext/phar/tests/tar/phar_buildfromiterator5.phpt @@ -46,7 +46,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromiterator.phar.tar'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/tar/phar_buildfromiterator6.phpt b/ext/phar/tests/tar/phar_buildfromiterator6.phpt index 408775cd75..927ebec738 100644 --- a/ext/phar/tests/tar/phar_buildfromiterator6.phpt +++ b/ext/phar/tests/tar/phar_buildfromiterator6.phpt @@ -46,7 +46,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromiterator.phar.tar'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/tar/phar_buildfromiterator7.phpt b/ext/phar/tests/tar/phar_buildfromiterator7.phpt index 65084f3724..f123c10e81 100644 --- a/ext/phar/tests/tar/phar_buildfromiterator7.phpt +++ b/ext/phar/tests/tar/phar_buildfromiterator7.phpt @@ -46,7 +46,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromiterator.phar.tar'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/tar/phar_buildfromiterator8.phpt b/ext/phar/tests/tar/phar_buildfromiterator8.phpt index f42640f692..c2fcd1d264 100644 --- a/ext/phar/tests/tar/phar_buildfromiterator8.phpt +++ b/ext/phar/tests/tar/phar_buildfromiterator8.phpt @@ -20,7 +20,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromiterator.phar.tar'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/tar/phar_buildfromiterator9.phpt b/ext/phar/tests/tar/phar_buildfromiterator9.phpt index f9deef4d9f..d6be8fd9bc 100644 --- a/ext/phar/tests/tar/phar_buildfromiterator9.phpt +++ b/ext/phar/tests/tar/phar_buildfromiterator9.phpt @@ -47,7 +47,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromiterator.phar.tar'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/tar/phar_commitwrite.phpt b/ext/phar/tests/tar/phar_commitwrite.phpt index bfbac61a91..cdfc449c1c 100644 --- a/ext/phar/tests/tar/phar_commitwrite.phpt +++ b/ext/phar/tests/tar/phar_commitwrite.phpt @@ -25,7 +25,7 @@ var_dump($p->isFileFormat(Phar::TAR)); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/brandnewphar.phar.tar'); ?> --EXPECT-- diff --git a/ext/phar/tests/tar/phar_convert_phar.phpt b/ext/phar/tests/tar/phar_convert_phar.phpt index c827c218ed..df13006d79 100644 --- a/ext/phar/tests/tar/phar_convert_phar.phpt +++ b/ext/phar/tests/tar/phar_convert_phar.phpt @@ -37,7 +37,7 @@ var_dump(strlen($phar->getStub())); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar'); diff --git a/ext/phar/tests/tar/phar_convert_phar2.phpt b/ext/phar/tests/tar/phar_convert_phar2.phpt index e21a9843a5..1117a75260 100644 --- a/ext/phar/tests/tar/phar_convert_phar2.phpt +++ b/ext/phar/tests/tar/phar_convert_phar2.phpt @@ -39,7 +39,7 @@ var_dump(strlen($phar->getStub())); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.gz'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); diff --git a/ext/phar/tests/tar/phar_convert_phar3.phpt b/ext/phar/tests/tar/phar_convert_phar3.phpt index 39cf120d2d..762473f961 100644 --- a/ext/phar/tests/tar/phar_convert_phar3.phpt +++ b/ext/phar/tests/tar/phar_convert_phar3.phpt @@ -39,7 +39,7 @@ var_dump(strlen($phar->getStub())); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.bz2'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.phar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); diff --git a/ext/phar/tests/tar/phar_convert_phar4.phpt b/ext/phar/tests/tar/phar_convert_phar4.phpt index 3ad27dcbc8..7c4c9ace2a 100644 --- a/ext/phar/tests/tar/phar_convert_phar4.phpt +++ b/ext/phar/tests/tar/phar_convert_phar4.phpt @@ -44,7 +44,7 @@ var_dump($phar->getMetadata()); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.gz'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.phar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); diff --git a/ext/phar/tests/tar/phar_magic.phpt b/ext/phar/tests/tar/phar_magic.phpt index 11a36fd930..19579dd614 100644 --- a/ext/phar/tests/tar/phar_magic.phpt +++ b/ext/phar/tests/tar/phar_magic.phpt @@ -21,7 +21,7 @@ include $fname; ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.php'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/tar/phar_setalias.phpt b/ext/phar/tests/tar/phar_setalias.phpt index a1bc51154c..ffdd508c31 100644 --- a/ext/phar/tests/tar/phar_setalias.phpt +++ b/ext/phar/tests/tar/phar_setalias.phpt @@ -39,7 +39,7 @@ echo $a->getAlias() . "\n"; ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phartmp.tar'); __HALT_COMPILER(); diff --git a/ext/phar/tests/tar/phar_setalias2.phpt b/ext/phar/tests/tar/phar_setalias2.phpt index a44cc397c2..115b986617 100644 --- a/ext/phar/tests/tar/phar_setalias2.phpt +++ b/ext/phar/tests/tar/phar_setalias2.phpt @@ -41,7 +41,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phartmp.tar'); __HALT_COMPILER(); diff --git a/ext/phar/tests/tar/phar_setdefaultstub.phpt b/ext/phar/tests/tar/phar_setdefaultstub.phpt index c1e6642a17..f0db276722 100644 --- a/ext/phar/tests/tar/phar_setdefaultstub.phpt +++ b/ext/phar/tests/tar/phar_setdefaultstub.phpt @@ -55,7 +55,7 @@ var_dump($phar->getStub()); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- diff --git a/ext/phar/tests/tar/phar_stub.phpt b/ext/phar/tests/tar/phar_stub.phpt index e0d728f6f8..3d8e2874ef 100644 --- a/ext/phar/tests/tar/phar_stub.phpt +++ b/ext/phar/tests/tar/phar_stub.phpt @@ -59,7 +59,7 @@ echo $phar->getStub(); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.php'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.tar.php'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phartmp.php'); diff --git a/ext/phar/tests/tar/phar_stub_error.phpt b/ext/phar/tests/tar/phar_stub_error.phpt index 61532b9b42..fc22bcb16b 100644 --- a/ext/phar/tests/tar/phar_stub_error.phpt +++ b/ext/phar/tests/tar/phar_stub_error.phpt @@ -37,7 +37,7 @@ var_dump($phar->getStub() == $stub); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/zip/033a.phpt b/ext/phar/tests/zip/033a.phpt index 429d3bdd98..dc61148532 100644 --- a/ext/phar/tests/zip/033a.phpt +++ b/ext/phar/tests/zip/033a.phpt @@ -36,7 +36,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- diff --git a/ext/phar/tests/zip/getalias.phpt b/ext/phar/tests/zip/getalias.phpt index 9c917633c9..4094e0cd99 100644 --- a/ext/phar/tests/zip/getalias.phpt +++ b/ext/phar/tests/zip/getalias.phpt @@ -44,7 +44,7 @@ var_dump($phar->getAlias()); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/zip/notphar.phpt b/ext/phar/tests/zip/notphar.phpt index ab4ff52e1e..d7b79b0cb4 100644 --- a/ext/phar/tests/zip/notphar.phpt +++ b/ext/phar/tests/zip/notphar.phpt @@ -16,7 +16,7 @@ include $fname; ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/zip/phar_begin_setstub_commit.phpt b/ext/phar/tests/zip/phar_begin_setstub_commit.phpt index fe200949e8..75122a54a3 100644 --- a/ext/phar/tests/zip/phar_begin_setstub_commit.phpt +++ b/ext/phar/tests/zip/phar_begin_setstub_commit.phpt @@ -43,7 +43,7 @@ fclose($a); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/brandnewphar.phar.zip'); unlink(dirname(__FILE__) . '/myfakestub.php'); ?> diff --git a/ext/phar/tests/zip/phar_buildfromiterator4.phpt b/ext/phar/tests/zip/phar_buildfromiterator4.phpt index cc11fe5537..27cf41fc11 100644 --- a/ext/phar/tests/zip/phar_buildfromiterator4.phpt +++ b/ext/phar/tests/zip/phar_buildfromiterator4.phpt @@ -47,7 +47,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromiterator.phar.zip'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/zip/phar_buildfromiterator5.phpt b/ext/phar/tests/zip/phar_buildfromiterator5.phpt index 1d14686d5b..4aca17e6a3 100644 --- a/ext/phar/tests/zip/phar_buildfromiterator5.phpt +++ b/ext/phar/tests/zip/phar_buildfromiterator5.phpt @@ -46,7 +46,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromiterator.phar.zip'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/zip/phar_buildfromiterator6.phpt b/ext/phar/tests/zip/phar_buildfromiterator6.phpt index 936dda9f6d..5eea92dd70 100644 --- a/ext/phar/tests/zip/phar_buildfromiterator6.phpt +++ b/ext/phar/tests/zip/phar_buildfromiterator6.phpt @@ -46,7 +46,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromiterator.phar.zip'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/zip/phar_buildfromiterator7.phpt b/ext/phar/tests/zip/phar_buildfromiterator7.phpt index 777dbf86dd..85a801002d 100644 --- a/ext/phar/tests/zip/phar_buildfromiterator7.phpt +++ b/ext/phar/tests/zip/phar_buildfromiterator7.phpt @@ -46,7 +46,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromiterator.phar.zip'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/zip/phar_buildfromiterator8.phpt b/ext/phar/tests/zip/phar_buildfromiterator8.phpt index d2b1be2087..8c92edf1d7 100644 --- a/ext/phar/tests/zip/phar_buildfromiterator8.phpt +++ b/ext/phar/tests/zip/phar_buildfromiterator8.phpt @@ -20,7 +20,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromiterator.phar.zip'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/zip/phar_buildfromiterator9.phpt b/ext/phar/tests/zip/phar_buildfromiterator9.phpt index 0b56307545..f676783f7c 100644 --- a/ext/phar/tests/zip/phar_buildfromiterator9.phpt +++ b/ext/phar/tests/zip/phar_buildfromiterator9.phpt @@ -47,7 +47,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/buildfromiterator.phar'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/zip/phar_commitwrite.phpt b/ext/phar/tests/zip/phar_commitwrite.phpt index eb3aeae04b..cb7fa0f35c 100644 --- a/ext/phar/tests/zip/phar_commitwrite.phpt +++ b/ext/phar/tests/zip/phar_commitwrite.phpt @@ -25,7 +25,7 @@ var_dump($p->isFileFormat(Phar::ZIP)); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/brandnewphar.phar.zip'); ?> --EXPECT-- diff --git a/ext/phar/tests/zip/phar_convert_phar.phpt b/ext/phar/tests/zip/phar_convert_phar.phpt index 9cf942bd0a..5ae1aae222 100644 --- a/ext/phar/tests/zip/phar_convert_phar.phpt +++ b/ext/phar/tests/zip/phar_convert_phar.phpt @@ -37,7 +37,7 @@ var_dump(strlen($phar->getStub())); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.phar'); diff --git a/ext/phar/tests/zip/phar_magic.phpt b/ext/phar/tests/zip/phar_magic.phpt index 4dfdd2e84d..05b30fb74a 100644 --- a/ext/phar/tests/zip/phar_magic.phpt +++ b/ext/phar/tests/zip/phar_magic.phpt @@ -26,7 +26,7 @@ include $pname; ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/zip/phar_oo_compressallbz2.phpt b/ext/phar/tests/zip/phar_oo_compressallbz2.phpt index 7632bd03b3..e66c2945a8 100644 --- a/ext/phar/tests/zip/phar_oo_compressallbz2.phpt +++ b/ext/phar/tests/zip/phar_oo_compressallbz2.phpt @@ -44,7 +44,7 @@ var_dump($c['a']->isCompressed(Phar::BZ2)); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> diff --git a/ext/phar/tests/zip/phar_oo_compressallgz.phpt b/ext/phar/tests/zip/phar_oo_compressallgz.phpt index 97b9e19d6e..1d995553ea 100644 --- a/ext/phar/tests/zip/phar_oo_compressallgz.phpt +++ b/ext/phar/tests/zip/phar_oo_compressallgz.phpt @@ -36,7 +36,7 @@ var_dump($phar['c']->isCompressed(Phar::GZ)); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); ?> --EXPECT-- diff --git a/ext/phar/tests/zip/phar_setalias2.phpt b/ext/phar/tests/zip/phar_setalias2.phpt index c89f4c777a..255f069c2c 100644 --- a/ext/phar/tests/zip/phar_setalias2.phpt +++ b/ext/phar/tests/zip/phar_setalias2.phpt @@ -38,7 +38,7 @@ try { ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); __HALT_COMPILER(); ?> diff --git a/ext/phar/tests/zip/phar_setdefaultstub.phpt b/ext/phar/tests/zip/phar_setdefaultstub.phpt index e21d764487..28127e42a5 100644 --- a/ext/phar/tests/zip/phar_setdefaultstub.phpt +++ b/ext/phar/tests/zip/phar_setdefaultstub.phpt @@ -55,7 +55,7 @@ var_dump($phar->getStub()); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- diff --git a/ext/phar/tests/zip/phar_stub.phpt b/ext/phar/tests/zip/phar_stub.phpt index a2a6aa6f2a..49b97f24f0 100644 --- a/ext/phar/tests/zip/phar_stub.phpt +++ b/ext/phar/tests/zip/phar_stub.phpt @@ -59,7 +59,7 @@ echo $phar->getStub(); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip.php'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phartmp.php'); diff --git a/ext/phar/tests/zip/phar_stub_error.phpt b/ext/phar/tests/zip/phar_stub_error.phpt index dafb312cf2..ad168d6e82 100644 --- a/ext/phar/tests/zip/phar_stub_error.phpt +++ b/ext/phar/tests/zip/phar_stub_error.phpt @@ -37,7 +37,7 @@ var_dump($phar->getStub() == $stub); ?> ===DONE=== --CLEAN-- -<?php +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); __HALT_COMPILER(); ?> diff --git a/ext/posix/tests/posix_ctermid.phpt b/ext/posix/tests/posix_ctermid.phpt index 551ed7304e..ccf850d776 100644 --- a/ext/posix/tests/posix_ctermid.phpt +++ b/ext/posix/tests/posix_ctermid.phpt @@ -7,12 +7,12 @@ Source code: ext/posix/posix.c Falko Menge, mail at falko-menge dot de PHP Testfest Berlin 2009-05-10 --SKIPIF-- -<?php - if (!extension_loaded('posix')) { +<?php + if (!extension_loaded('posix')) { die('SKIP - POSIX extension not available'); } // needed because of #ifdef HAVE_CTERMID in posix.c - if (!function_exists('posix_ctermid')) { + if (!function_exists('posix_ctermid')) { die('SKIP - Function posix_ctermid() not available'); } ?> diff --git a/ext/posix/tests/posix_ctermid_basic.phpt b/ext/posix/tests/posix_ctermid_basic.phpt index d1d46943ba..467e60e9ba 100644 --- a/ext/posix/tests/posix_ctermid_basic.phpt +++ b/ext/posix/tests/posix_ctermid_basic.phpt @@ -5,8 +5,8 @@ Marco Fabbri mrfabbri@gmail.com Francesco Fullone ff@ideato.it #PHPTestFest Cesena Italia on 2009-06-20 --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --FILE-- <?php diff --git a/ext/posix/tests/posix_errno_basic.phpt b/ext/posix/tests/posix_errno_basic.phpt index 5835a2e1ef..67f31d903e 100644 --- a/ext/posix/tests/posix_errno_basic.phpt +++ b/ext/posix/tests/posix_errno_basic.phpt @@ -5,8 +5,8 @@ Morten Amundsen mor10am@gmail.com Francesco Fullone ff@ideato.it #PHPTestFest Cesena Italia on 2009-06-20 --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --FILE-- <?php diff --git a/ext/posix/tests/posix_errno_variation1.phpt b/ext/posix/tests/posix_errno_variation1.phpt index 0f464a5b89..ed4b44320c 100644 --- a/ext/posix/tests/posix_errno_variation1.phpt +++ b/ext/posix/tests/posix_errno_variation1.phpt @@ -5,9 +5,9 @@ Morten Amundsen mor10am@gmail.com Francesco Fullone ff@ideato.it #PHPTestFest Cesena Italia on 2009-06-20 --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; - if(posix_getuid()==0) print "skip - Cannot run test as root."; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; + if(posix_getuid()==0) print "skip - Cannot run test as root."; ?> --FILE-- <?php diff --git a/ext/posix/tests/posix_errno_variation2.phpt b/ext/posix/tests/posix_errno_variation2.phpt index 93ac96fb71..ff44b70cb6 100644 --- a/ext/posix/tests/posix_errno_variation2.phpt +++ b/ext/posix/tests/posix_errno_variation2.phpt @@ -5,8 +5,8 @@ Morten Amundsen mor10am@gmail.com Francesco Fullone ff@ideato.it #PHPTestFest Cesena Italia on 2009-06-20 --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; if(!extension_loaded("pcntl")) print "skip - PCNTL extension required"; ?> --FILE-- @@ -17,9 +17,9 @@ echo "*** Test by calling function with pid error ***\n"; $pid = 10000; do { - $pid += 1; + $pid += 1; $result = shell_exec("ps -p " . $pid); -} while (strstr($pid, $result)); +} while (strstr($pid, $result)); posix_kill($pid, SIGKILL); var_dump(posix_errno()); diff --git a/ext/posix/tests/posix_get_last_error_error.phpt b/ext/posix/tests/posix_get_last_error_error.phpt index 6cf2161d0c..4ef1d5170d 100644 --- a/ext/posix/tests/posix_get_last_error_error.phpt +++ b/ext/posix/tests/posix_get_last_error_error.phpt @@ -1,8 +1,8 @@ --TEST-- Test posix_get_last_error() function : error conditions --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --FILE-- <?php diff --git a/ext/posix/tests/posix_getcwd.phpt b/ext/posix/tests/posix_getcwd.phpt index 75c8d575ba..20f7b0372e 100644 --- a/ext/posix/tests/posix_getcwd.phpt +++ b/ext/posix/tests/posix_getcwd.phpt @@ -2,7 +2,7 @@ posix_getcwd(): Basic tests --SKIPIF-- <?php -if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); +if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); if (!function_exists('posix_getcwd')) die('skip posix_getcwd() not found'); ?> --FILE-- diff --git a/ext/posix/tests/posix_getcwd_basic.phpt b/ext/posix/tests/posix_getcwd_basic.phpt index 2477c376a8..9186f5e270 100644 --- a/ext/posix/tests/posix_getcwd_basic.phpt +++ b/ext/posix/tests/posix_getcwd_basic.phpt @@ -2,12 +2,12 @@ posix_getcwd(): Basic tests --SKIPIF-- <?php -if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); +if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); if (!function_exists('posix_getcwd')) die('skip posix_getcwd() not found'); ?> --FILE-- <?php -echo "Basic test of POSIX posix_getcwd function\n"; +echo "Basic test of POSIX posix_getcwd function\n"; var_dump(posix_getcwd()); var_dump(posix_getcwd(1)); diff --git a/ext/posix/tests/posix_getegid_basic.phpt b/ext/posix/tests/posix_getegid_basic.phpt index d0016f497f..ab7da5a2c7 100644 --- a/ext/posix/tests/posix_getegid_basic.phpt +++ b/ext/posix/tests/posix_getegid_basic.phpt @@ -4,8 +4,8 @@ Test function posix_getegid() by calling it with its expected arguments Michelangelo van Dam dragonbe@gmail.com #PHPTestFest Dutch PHP Conference 2012 --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --FILE-- <?php diff --git a/ext/posix/tests/posix_geteuid_basic.phpt b/ext/posix/tests/posix_geteuid_basic.phpt index 76e9028043..f25fc34fd2 100644 --- a/ext/posix/tests/posix_geteuid_basic.phpt +++ b/ext/posix/tests/posix_geteuid_basic.phpt @@ -5,8 +5,8 @@ Marco Fabbri mrfabbri@gmail.com Francesco Fullone ff@ideato.it #PHPTestFest Cesena Italia on 2009-06-20 --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --FILE-- <?php diff --git a/ext/posix/tests/posix_geteuid_error1.phpt b/ext/posix/tests/posix_geteuid_error1.phpt index ac4e0d5ddc..941005f028 100644 --- a/ext/posix/tests/posix_geteuid_error1.phpt +++ b/ext/posix/tests/posix_geteuid_error1.phpt @@ -1,8 +1,8 @@ --TEST-- Test function posix_geteuid() by calling it more than or less than its expected arguments --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --CREDITS-- Marco Fabbri mrfabbri@gmail.com diff --git a/ext/posix/tests/posix_getgid_error.phpt b/ext/posix/tests/posix_getgid_error.phpt index bcd7a2fbdf..fdcb8e9697 100644 --- a/ext/posix/tests/posix_getgid_error.phpt +++ b/ext/posix/tests/posix_getgid_error.phpt @@ -1,15 +1,15 @@ --TEST-- Test posix_getgid() function : error conditions --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --FILE-- <?php /* Prototype : proto int posix_getgid(void) - * Description: Get the current group id (POSIX.1, 4.2.1) + * Description: Get the current group id (POSIX.1, 4.2.1) * Source code: ext/posix/posix.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing posix_getgid() : error conditions ***\n"; diff --git a/ext/posix/tests/posix_getgrgid_basic.phpt b/ext/posix/tests/posix_getgrgid_basic.phpt index fdcdf35a42..3b57eaeaf3 100644 --- a/ext/posix/tests/posix_getgrgid_basic.phpt +++ b/ext/posix/tests/posix_getgrgid_basic.phpt @@ -1,18 +1,18 @@ --TEST-- Test posix_getgrgid() function : basic functionality --SKIPIF-- -<?php - if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); +<?php + if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); ?> --FILE-- -<?php - echo "Basic test of POSIX getgid and getgrid fucntions\n"; - +<?php + echo "Basic test of POSIX getgid and getgrid fucntions\n"; + $gid = posix_getgid(); $groupinfo = posix_getgrgid($gid); - + print_r($groupinfo); - + ?> ===DONE=== --EXPECTF-- @@ -27,4 +27,4 @@ Array [gid] => %d ) ===DONE=== - + diff --git a/ext/posix/tests/posix_getgrgid_error.phpt b/ext/posix/tests/posix_getgrgid_error.phpt index 7fcc8926f4..e51823bf65 100644 --- a/ext/posix/tests/posix_getgrgid_error.phpt +++ b/ext/posix/tests/posix_getgrgid_error.phpt @@ -1,15 +1,15 @@ --TEST-- Test posix_getgrgid() function : error conditions --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --FILE-- <?php /* Prototype : proto array posix_getgrgid(long gid) - * Description: Group database access (POSIX.1, 9.2.1) + * Description: Group database access (POSIX.1, 9.2.1) * Source code: ext/posix/posix.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing posix_getgrgid() : error conditions ***\n"; diff --git a/ext/posix/tests/posix_getgrgid_variation.phpt b/ext/posix/tests/posix_getgrgid_variation.phpt index 235e080a6c..80c12be089 100644 --- a/ext/posix/tests/posix_getgrgid_variation.phpt +++ b/ext/posix/tests/posix_getgrgid_variation.phpt @@ -3,14 +3,14 @@ Test posix_getgrgid() function : usage variations - parameter types --SKIPIF-- <?php PHP_INT_SIZE == 4 or die("skip - 32-bit only"); - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --FILE-- <?php /* Prototype : proto array posix_getgrgid(long gid) - * Description: Group database access (POSIX.1, 9.2.1) + * Description: Group database access (POSIX.1, 9.2.1) * Source code: ext/posix/posix.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing posix_getgrgid() : usage variations ***\n"; @@ -71,7 +71,7 @@ $values = array( foreach($values as $value) { echo "\nArg value $value \n"; $result = posix_getgrgid($value); - if ((is_array($result) && (count($result) == 4)) + if ((is_array($result) && (count($result) == 4)) || ($result === false)) { echo "valid output\n"; diff --git a/ext/posix/tests/posix_getgroups_basic.phpt b/ext/posix/tests/posix_getgroups_basic.phpt index f062468b4f..c6294fe127 100644 --- a/ext/posix/tests/posix_getgroups_basic.phpt +++ b/ext/posix/tests/posix_getgroups_basic.phpt @@ -1,21 +1,21 @@ --TEST-- Test posix_getgroups() function : basic functionality --SKIPIF-- -<?php - if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); +<?php + if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); ?> --FILE-- -<?php +<?php echo "Basic test of POSIX getgroups\n"; - + $groups = posix_getgroups(); - + if (!is_array($groups)) { - echo "TEST FAILED - array result expected\n"; + echo "TEST FAILED - array result expected\n"; } else { echo "TEST PASSED\n"; - } - + } + ?> ===DONE=== --EXPECT-- diff --git a/ext/posix/tests/posix_getpgid_basic.phpt b/ext/posix/tests/posix_getpgid_basic.phpt index 3195387b75..a006a36858 100644 --- a/ext/posix/tests/posix_getpgid_basic.phpt +++ b/ext/posix/tests/posix_getpgid_basic.phpt @@ -2,16 +2,16 @@ 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 - echo "Basic test of posix_getpgid function\n"; + echo "Basic test of posix_getpgid function\n"; - $pid = posix_getpid(); + $pid = posix_getpid(); $pgid = posix_getpgid($pid); - var_dump($pgid); + var_dump($pgid); ?> ===DONE==== diff --git a/ext/posix/tests/posix_getpgid_error.phpt b/ext/posix/tests/posix_getpgid_error.phpt index b15a3c39b2..88d68554ee 100644 --- a/ext/posix/tests/posix_getpgid_error.phpt +++ b/ext/posix/tests/posix_getpgid_error.phpt @@ -1,17 +1,17 @@ --TEST-- Test posix_getpgid() function : error conditions --SKIPIF-- -<?php +<?php if((!extension_loaded("posix")) || (!function_exists("posix_getpgid"))) { print "skip - POSIX extension not loaded or posix_getpgid() does not exist"; -} +} ?> --FILE-- <?php /* Prototype : proto int posix_getpgid(void) - * Description: Get the process group id of the specified process (This is not a POSIX function, but a SVR4ism, so we compile conditionally) + * Description: Get the process group id of the specified process (This is not a POSIX function, but a SVR4ism, so we compile conditionally) * Source code: ext/posix/posix.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing posix_getpgid() : error conditions ***\n"; diff --git a/ext/posix/tests/posix_getpgid_variation.phpt b/ext/posix/tests/posix_getpgid_variation.phpt index bbf062d998..3d19256d19 100644 --- a/ext/posix/tests/posix_getpgid_variation.phpt +++ b/ext/posix/tests/posix_getpgid_variation.phpt @@ -1,18 +1,18 @@ --TEST-- Test posix_getpgid() function : variation --SKIPIF-- -<?php +<?php PHP_INT_SIZE == 4 or die("skip - 32-bit only"); if((!extension_loaded("posix")) || (!function_exists("posix_getpgid"))) { print "skip - POSIX extension not loaded or posix_getpgid() does not exist"; -} +} ?> --FILE-- <?php /* Prototype : proto int posix_getpgid(void) - * Description: Get the process group id of the specified process (This is not a POSIX function, but a SVR4ism, so we compile conditionally) + * Description: Get the process group id of the specified process (This is not a POSIX function, but a SVR4ism, so we compile conditionally) * Source code: ext/posix/posix.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing posix_getpgid() : usage variations ***\n"; @@ -63,7 +63,7 @@ $values = array( // unset data $unset_var, - + // object data new stdclass(), ); diff --git a/ext/posix/tests/posix_getpgrp_basic.phpt b/ext/posix/tests/posix_getpgrp_basic.phpt index a737019a2f..185bbbefca 100644 --- a/ext/posix/tests/posix_getpgrp_basic.phpt +++ b/ext/posix/tests/posix_getpgrp_basic.phpt @@ -2,15 +2,15 @@ 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 - echo "Basic test of POSIX getpgrp function\n"; + echo "Basic test of POSIX getpgrp function\n"; $pgrp = posix_getpgrp(); - var_dump($pgrp); + var_dump($pgrp); ?> ===DONE==== diff --git a/ext/posix/tests/posix_getpgrp_error.phpt b/ext/posix/tests/posix_getpgrp_error.phpt index 97f47ce8ca..0229270b63 100644 --- a/ext/posix/tests/posix_getpgrp_error.phpt +++ b/ext/posix/tests/posix_getpgrp_error.phpt @@ -1,15 +1,15 @@ --TEST-- Test posix_getpgrp() function : error conditions --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --FILE-- <?php /* Prototype : proto int posix_getpgrp(void) - * Description: Get current process group id (POSIX.1, 4.3.1) + * Description: Get current process group id (POSIX.1, 4.3.1) * Source code: ext/posix/posix.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing posix_getpgrp() : error conditions ***\n"; diff --git a/ext/posix/tests/posix_getpid_basic.phpt b/ext/posix/tests/posix_getpid_basic.phpt index a1444413ed..0302922be1 100644 --- a/ext/posix/tests/posix_getpid_basic.phpt +++ b/ext/posix/tests/posix_getpid_basic.phpt @@ -2,15 +2,15 @@ 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 - echo "Basic test of POSIX getpid function\n"; + echo "Basic test of POSIX getpid function\n"; $pid = posix_getpid(); - var_dump($pid); + var_dump($pid); ?> ===DONE==== diff --git a/ext/posix/tests/posix_getpid_error.phpt b/ext/posix/tests/posix_getpid_error.phpt index 721bf66996..471a8aa3ea 100644 --- a/ext/posix/tests/posix_getpid_error.phpt +++ b/ext/posix/tests/posix_getpid_error.phpt @@ -1,15 +1,15 @@ --TEST-- Test posix_getpid() function : error conditions --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --FILE-- <?php /* Prototype : proto int posix_getpid(void) - * Description: Get the current process id (POSIX.1, 4.1.1) + * Description: Get the current process id (POSIX.1, 4.1.1) * Source code: ext/posix/posix.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing posix_getpid() : error conditions ***\n"; diff --git a/ext/posix/tests/posix_getppid_basic.phpt b/ext/posix/tests/posix_getppid_basic.phpt index 2da591c177..3cbf5d7a6e 100644 --- a/ext/posix/tests/posix_getppid_basic.phpt +++ b/ext/posix/tests/posix_getppid_basic.phpt @@ -2,15 +2,15 @@ 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 - echo "Basic test of POSIX getppid function\n"; + echo "Basic test of POSIX getppid function\n"; $ppid = posix_getppid(); - var_dump($ppid); + var_dump($ppid); ?> ===DONE==== diff --git a/ext/posix/tests/posix_getppid_error.phpt b/ext/posix/tests/posix_getppid_error.phpt index 366c1ed8dc..9c3919e21c 100644 --- a/ext/posix/tests/posix_getppid_error.phpt +++ b/ext/posix/tests/posix_getppid_error.phpt @@ -1,15 +1,15 @@ --TEST-- Test posix_getppid() function : error conditions --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --FILE-- <?php /* Prototype : proto int posix_getppid(void) - * Description: Get the parent process id (POSIX.1, 4.1.1) + * Description: Get the parent process id (POSIX.1, 4.1.1) * Source code: ext/posix/posix.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing posix_getppid() : error conditions ***\n"; diff --git a/ext/posix/tests/posix_getpwuid_basic.phpt b/ext/posix/tests/posix_getpwuid_basic.phpt index 1bcd59d0e6..7d9b8d1181 100644 --- a/ext/posix/tests/posix_getpwuid_basic.phpt +++ b/ext/posix/tests/posix_getpwuid_basic.phpt @@ -1,18 +1,18 @@ --TEST-- Test posix_getpwuid() function : basic functionality --SKIPIF-- -<?php - if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); +<?php + if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); ?> --FILE-- -<?php +<?php echo "Basic test of POSIX getpwuid\n"; - - + + $pwuid = posix_getpwuid(posix_getuid()); - + print_r($pwuid); - + ?> ===DONE==== --EXPECTREGEX-- diff --git a/ext/posix/tests/posix_getpwuid_error.phpt b/ext/posix/tests/posix_getpwuid_error.phpt index 4920e4e9da..b44584448a 100644 --- a/ext/posix/tests/posix_getpwuid_error.phpt +++ b/ext/posix/tests/posix_getpwuid_error.phpt @@ -1,15 +1,15 @@ --TEST-- Test posix_getpwuid() function : error conditions --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --FILE-- <?php /* Prototype : proto array posix_getpwuid(long uid) - * Description: User database access (POSIX.1, 9.2.2) + * Description: User database access (POSIX.1, 9.2.2) * Source code: ext/posix/posix.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing posix_getpwuid() : error conditions ***\n"; diff --git a/ext/posix/tests/posix_getpwuid_variation.phpt b/ext/posix/tests/posix_getpwuid_variation.phpt index 9bcddea832..27b4ca956f 100644 --- a/ext/posix/tests/posix_getpwuid_variation.phpt +++ b/ext/posix/tests/posix_getpwuid_variation.phpt @@ -3,14 +3,14 @@ Test posix_getpwuid() function : usage variations - parameter types --SKIPIF-- <?php PHP_INT_SIZE == 4 or die("skip - 32-bit only"); - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --FILE-- <?php /* Prototype : proto array posix_getpwuid(long uid) - * Description: User database access (POSIX.1, 9.2.2) + * Description: User database access (POSIX.1, 9.2.2) * Source code: ext/posix/posix.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing posix_getpwuid() : usage variations ***\n"; @@ -61,7 +61,7 @@ $values = array( // unset data $unset_var, - + // object data new stdclass(), ); @@ -71,7 +71,7 @@ $values = array( foreach($values as $value) { echo "\nArg value $value \n"; $result = posix_getpwuid($value); - if ((is_array($result) && (count($result) == 7)) + if ((is_array($result) && (count($result) == 7)) || ($result === false)) { echo "valid output\n"; diff --git a/ext/posix/tests/posix_getrlimit.phpt b/ext/posix/tests/posix_getrlimit.phpt index 61da64a938..8cfc7575a4 100644 --- a/ext/posix/tests/posix_getrlimit.phpt +++ b/ext/posix/tests/posix_getrlimit.phpt @@ -2,7 +2,7 @@ posix_getrlimit(): Basic tests --SKIPIF-- <?php -if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); +if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); if (!function_exists('posix_getrlimit')) die('skip posix_getrlimit() not found'); ?> --FILE-- diff --git a/ext/posix/tests/posix_getrlimit_basic.phpt b/ext/posix/tests/posix_getrlimit_basic.phpt index 7fdd0e7e4b..bace9fd5ee 100644 --- a/ext/posix/tests/posix_getrlimit_basic.phpt +++ b/ext/posix/tests/posix_getrlimit_basic.phpt @@ -2,12 +2,12 @@ posix_getrlimit(): Basic tests --SKIPIF-- <?php -if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); +if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); if (!function_exists('posix_getrlimit')) die('skip posix_getrlimit() not found'); ?> --FILE-- <?php -echo "Basic test of POSIX posix_getrlimit function\n"; +echo "Basic test of POSIX posix_getrlimit function\n"; var_dump(posix_getrlimit()); ?> diff --git a/ext/posix/tests/posix_getsid.phpt b/ext/posix/tests/posix_getsid.phpt index 1f57690d23..6f707d067f 100644 --- a/ext/posix/tests/posix_getsid.phpt +++ b/ext/posix/tests/posix_getsid.phpt @@ -1,14 +1,14 @@ --TEST-- Test posix_getsid() function test --DESCRIPTION-- -Get the current session id of a process pid (POSIX.1, 4.2.1) +Get the current session id of a process pid (POSIX.1, 4.2.1) Source code: ext/posix/posix.c --CREDITS-- Moritz Neuhaeuser, info@xcompile.net PHP Testfest Berlin 2009-05-10 --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "SKIP - POSIX extension not loaded"; +<?php + 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 a53e1df8b3..6fd61e5bca 100644 --- a/ext/posix/tests/posix_getsid_basic.phpt +++ b/ext/posix/tests/posix_getsid_basic.phpt @@ -2,16 +2,16 @@ 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 - echo "Basic test of posix_getsid function\n"; + echo "Basic test of posix_getsid function\n"; - $pid = posix_getpid(); + $pid = posix_getpid(); $sid = posix_getsid($pid); - var_dump($sid); + var_dump($sid); ?> ===DONE==== diff --git a/ext/posix/tests/posix_getsid_error.phpt b/ext/posix/tests/posix_getsid_error.phpt index cb9d384153..148b09470b 100644 --- a/ext/posix/tests/posix_getsid_error.phpt +++ b/ext/posix/tests/posix_getsid_error.phpt @@ -6,9 +6,9 @@ cases: no params, wrong param, wrong param range Moritz Neuhaeuser, info@xcompile.net PHP Testfest Berlin 2009-05-10 --SKIPIF-- -<?php +<?php if(!extension_loaded("posix")) { - die("SKIP - POSIX extension not loaded"); + die("SKIP - POSIX extension not loaded"); } ?> --FILE-- diff --git a/ext/posix/tests/posix_getuid_error.phpt b/ext/posix/tests/posix_getuid_error.phpt index 42a35512a0..a4f6272eed 100644 --- a/ext/posix/tests/posix_getuid_error.phpt +++ b/ext/posix/tests/posix_getuid_error.phpt @@ -1,15 +1,15 @@ --TEST-- Test posix_getuid() function : error conditions --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --FILE-- <?php /* Prototype : proto int posix_getuid(void) - * Description: Get the current user id (POSIX.1, 4.2.1) + * Description: Get the current user id (POSIX.1, 4.2.1) * Source code: ext/posix/posix.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing posix_getuid() : error conditions ***\n"; diff --git a/ext/posix/tests/posix_initgroups.phpt b/ext/posix/tests/posix_initgroups.phpt index 2fdd808f1f..5b0ec8adad 100644 --- a/ext/posix/tests/posix_initgroups.phpt +++ b/ext/posix/tests/posix_initgroups.phpt @@ -2,7 +2,7 @@ posix_initgroups(): Basic tests --SKIPIF-- <?php -if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); +if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); if (!function_exists('posix_initgroups')) die('skip posix_initgroups() not found'); ?> --FILE-- diff --git a/ext/posix/tests/posix_initgroups_basic.phpt b/ext/posix/tests/posix_initgroups_basic.phpt index b97f1dc167..47d75f0745 100644 --- a/ext/posix/tests/posix_initgroups_basic.phpt +++ b/ext/posix/tests/posix_initgroups_basic.phpt @@ -2,12 +2,12 @@ posix_initgroups(): Basic tests --SKIPIF-- <?php -if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); +if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); if (!function_exists('posix_initgroups')) die('skip posix_initgroups() not found'); ?> --FILE-- <?php -echo "Basic test of POSIX posix_initgroups function\n"; +echo "Basic test of POSIX posix_initgroups function\n"; var_dump(posix_initgroups('foo', 'bar')); var_dump(posix_initgroups(NULL, NULL)); diff --git a/ext/posix/tests/posix_isatty.phpt b/ext/posix/tests/posix_isatty.phpt index 0b40dd1d43..011a636e64 100644 --- a/ext/posix/tests/posix_isatty.phpt +++ b/ext/posix/tests/posix_isatty.phpt @@ -2,7 +2,7 @@ posix_isatty(): Basic tests --SKIPIF-- <?php -if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); +if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); if (!function_exists('posix_isatty')) die('skip posix_isatty() not found'); ?> --FILE-- diff --git a/ext/posix/tests/posix_kill_basic.phpt b/ext/posix/tests/posix_kill_basic.phpt index b68d3cb5db..c45a2624d1 100644 --- a/ext/posix/tests/posix_kill_basic.phpt +++ b/ext/posix/tests/posix_kill_basic.phpt @@ -1,32 +1,32 @@ --TEST-- Test posix_kill(), posix_get_last_error and posix_strerror() functions : basic functionality --SKIPIF-- -<?php - if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); +<?php + if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); ?> --FILE-- -<?php - echo "Basic test of POSIX getpgid(), kill(), get_last_error() and strerror() functions\n"; - +<?php + echo "Basic test of POSIX getpgid(), kill(), get_last_error() and strerror() functions\n"; + // Don't rely on PCNTL extension being around $SIGKILL = 9; - + // TODO Once we have PS open working beef up this test to create a process and kill it // for now start at a low pid and find first pid which does not exist. $pid = 999; do { - $pid += 1; + $pid += 1; $result = shell_exec("ps -p " . $pid); - } while (stripos($result, (string)$pid) != FALSE); - + } while (stripos($result, (string)$pid) != FALSE); + echo "Kill pid=" . $pid . "\n"; var_dump(posix_kill($pid,$SIGKILL)); - - $errno = posix_get_last_error(); - + + $errno = posix_get_last_error(); + var_dump($errno); var_dump(posix_strerror($errno)); - + ?> ===DONE==== --EXPECTF-- @@ -36,4 +36,4 @@ bool(false) int(%d) string(%d) %s%rNo such process|Operation not permitted%r%s ===DONE==== - + diff --git a/ext/posix/tests/posix_kill_error.phpt b/ext/posix/tests/posix_kill_error.phpt index 082b21d6ad..2ca9392139 100644 --- a/ext/posix/tests/posix_kill_error.phpt +++ b/ext/posix/tests/posix_kill_error.phpt @@ -1,15 +1,15 @@ --TEST-- Test posix_kill() function : error conditions --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --FILE-- <?php /* Prototype : proto bool posix_kill(int pid, int sig) - * Description: Send a signal to a process (POSIX.1, 3.3.2) + * Description: Send a signal to a process (POSIX.1, 3.3.2) * Source code: ext/posix/posix.c - * Alias to functions: + * Alias to functions: */ diff --git a/ext/posix/tests/posix_kill_variation1.phpt b/ext/posix/tests/posix_kill_variation1.phpt index 1a3fa20d79..25a123cf04 100644 --- a/ext/posix/tests/posix_kill_variation1.phpt +++ b/ext/posix/tests/posix_kill_variation1.phpt @@ -3,14 +3,14 @@ Test posix_kill() function : usage variations - first parameter type --SKIPIF-- <?php PHP_INT_SIZE == 4 or die("skip - 32-bit only"); - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --FILE-- <?php /* Prototype : proto bool posix_kill(int pid, int sig) - * Description: Send a signal to a process (POSIX.1, 3.3.2) + * Description: Send a signal to a process (POSIX.1, 3.3.2) * Source code: ext/posix/posix.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing posix_kill() : usage variations ***\n"; @@ -62,7 +62,7 @@ $values = array( // unset data $unset_var, - + // object data new stdclass(), ); diff --git a/ext/posix/tests/posix_kill_variation2.phpt b/ext/posix/tests/posix_kill_variation2.phpt index d3fe6e78da..8ca0d9f3c2 100644 --- a/ext/posix/tests/posix_kill_variation2.phpt +++ b/ext/posix/tests/posix_kill_variation2.phpt @@ -1,16 +1,16 @@ --TEST-- Test posix_kill() function : usage variations - second parameter type --SKIPIF-- -<?php +<?php PHP_INT_SIZE == 4 or die("skip - 32-bit only"); - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --FILE-- <?php /* Prototype : proto bool posix_kill(int pid, int sig) - * Description: Send a signal to a process (POSIX.1, 3.3.2) + * Description: Send a signal to a process (POSIX.1, 3.3.2) * Source code: ext/posix/posix.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing posix_kill() : usage variations ***\n"; @@ -62,7 +62,7 @@ $values = array( // unset data $unset_var, - + // object data new stdclass(), ); diff --git a/ext/posix/tests/posix_mknod.phpt b/ext/posix/tests/posix_mknod.phpt index 4044fb98d9..a238f18186 100644 --- a/ext/posix/tests/posix_mknod.phpt +++ b/ext/posix/tests/posix_mknod.phpt @@ -2,7 +2,7 @@ posix_mknod(): Basic tests --SKIPIF-- <?php -if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); +if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); if (!function_exists('posix_mknod')) die('skip posix_mknod() not found'); ?> --FILE-- diff --git a/ext/posix/tests/posix_mknod_basic.phpt b/ext/posix/tests/posix_mknod_basic.phpt index bc35156460..e95aa301fd 100644 --- a/ext/posix/tests/posix_mknod_basic.phpt +++ b/ext/posix/tests/posix_mknod_basic.phpt @@ -2,12 +2,12 @@ posix_mknod(): Basic tests --SKIPIF-- <?php -if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); +if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); if (!function_exists('posix_mknod')) die('skip posix_mknod() not found'); ?> --FILE-- <?php -echo "Basic test of POSIX posix_mknod function\n"; +echo "Basic test of POSIX posix_mknod function\n"; var_dump(posix_mknod(NULL, NULL, NULL, NULL)); ?> diff --git a/ext/posix/tests/posix_setegid_basic.phpt b/ext/posix/tests/posix_setegid_basic.phpt index 0bf8ed5480..1fe6e8a097 100644 --- a/ext/posix/tests/posix_setegid_basic.phpt +++ b/ext/posix/tests/posix_setegid_basic.phpt @@ -1,8 +1,8 @@ --TEST-- Test function posix_setegid() by calling it with its expected arguments --SKIPIF-- -<?php - if(!extension_loaded("posix")) die("skip - POSIX extension not loaded"); +<?php + if(!extension_loaded("posix")) die("skip - POSIX extension not loaded"); ?> --FILE-- <?php diff --git a/ext/posix/tests/posix_seteuid_basic.phpt b/ext/posix/tests/posix_seteuid_basic.phpt index 7a185828f6..1f3c7d31d0 100644 --- a/ext/posix/tests/posix_seteuid_basic.phpt +++ b/ext/posix/tests/posix_seteuid_basic.phpt @@ -5,8 +5,8 @@ Marco Fabbri mrfabbri@gmail.com Francesco Fullone ff@ideato.it #PHPTestFest Cesena Italia on 2009-06-20 --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --FILE-- <?php diff --git a/ext/posix/tests/posix_seteuid_error.phpt b/ext/posix/tests/posix_seteuid_error.phpt index b10e41075e..1ac3a38226 100644 --- a/ext/posix/tests/posix_seteuid_error.phpt +++ b/ext/posix/tests/posix_seteuid_error.phpt @@ -1,8 +1,8 @@ --TEST-- Test function posix_seteuid() by calling it more than or less than its expected arguments --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --CREDITS-- Marco Fabbri mrfabbri@gmail.com diff --git a/ext/posix/tests/posix_seteuid_error2.phpt b/ext/posix/tests/posix_seteuid_error2.phpt index 1073d8c44a..b56046d326 100644 --- a/ext/posix/tests/posix_seteuid_error2.phpt +++ b/ext/posix/tests/posix_seteuid_error2.phpt @@ -1,8 +1,8 @@ --TEST-- Test function posix_seteuid() by substituting argument 1 with object values. --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --CREDITS-- Marco Fabbri mrfabbri@gmail.com diff --git a/ext/posix/tests/posix_seteuid_variation1.phpt b/ext/posix/tests/posix_seteuid_variation1.phpt index d205c9917c..6131b928a0 100644 --- a/ext/posix/tests/posix_seteuid_variation1.phpt +++ b/ext/posix/tests/posix_seteuid_variation1.phpt @@ -1,8 +1,8 @@ --TEST-- Test function posix_seteuid() by substituting argument 1 with array values. --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --CREDITS-- Marco Fabbri mrfabbri@gmail.com diff --git a/ext/posix/tests/posix_seteuid_variation2.phpt b/ext/posix/tests/posix_seteuid_variation2.phpt index b466bbb5c4..8ed116824f 100644 --- a/ext/posix/tests/posix_seteuid_variation2.phpt +++ b/ext/posix/tests/posix_seteuid_variation2.phpt @@ -1,8 +1,8 @@ --TEST-- Test function posix_seteuid() by substituting argument 1 with boolean values. --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; if(posix_geteuid() == 0) print "skip - Cannot run test as root."; ?> --CREDITS-- diff --git a/ext/posix/tests/posix_seteuid_variation3.phpt b/ext/posix/tests/posix_seteuid_variation3.phpt index 1d89c8b913..d4c16514e3 100644 --- a/ext/posix/tests/posix_seteuid_variation3.phpt +++ b/ext/posix/tests/posix_seteuid_variation3.phpt @@ -1,8 +1,8 @@ --TEST-- Test function posix_seteuid() by substituting argument 1 with emptyUnsetUndefNull values. --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; if(posix_geteuid() == 0) print "skip - Cannot run test as root."; ?> --CREDITS-- diff --git a/ext/posix/tests/posix_seteuid_variation4.phpt b/ext/posix/tests/posix_seteuid_variation4.phpt index 455c5e2533..4224bafa82 100644 --- a/ext/posix/tests/posix_seteuid_variation4.phpt +++ b/ext/posix/tests/posix_seteuid_variation4.phpt @@ -1,9 +1,9 @@ --TEST-- Test function posix_seteuid() by substituting argument 1 with float values. --SKIPIF-- -<?php +<?php PHP_INT_SIZE == 4 or die("skip - 32-bit only"); - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; if(posix_geteuid() == 0) print "skip - Cannot run test as root."; ?> --CREDITS-- diff --git a/ext/posix/tests/posix_seteuid_variation5.phpt b/ext/posix/tests/posix_seteuid_variation5.phpt index dac4e475f2..d33051ff94 100644 --- a/ext/posix/tests/posix_seteuid_variation5.phpt +++ b/ext/posix/tests/posix_seteuid_variation5.phpt @@ -1,8 +1,8 @@ --TEST-- Test function posix_seteuid() by substituting argument 1 with int values. --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; if(posix_geteuid() == 0) print "skip - Cannot run test as root."; ?> --CREDITS-- diff --git a/ext/posix/tests/posix_seteuid_variation6.phpt b/ext/posix/tests/posix_seteuid_variation6.phpt index e514b7cd74..9c0c3868f5 100644 --- a/ext/posix/tests/posix_seteuid_variation6.phpt +++ b/ext/posix/tests/posix_seteuid_variation6.phpt @@ -1,8 +1,8 @@ --TEST-- Test function posix_seteuid() by substituting argument 1 with string values. --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --CREDITS-- Marco Fabbri mrfabbri@gmail.com diff --git a/ext/posix/tests/posix_setgid_basic.phpt b/ext/posix/tests/posix_setgid_basic.phpt index 28958c6bc5..3b7d1f9a45 100644 --- a/ext/posix/tests/posix_setgid_basic.phpt +++ b/ext/posix/tests/posix_setgid_basic.phpt @@ -2,7 +2,7 @@ Test function posix_setgid() by calling it with its expected arguments --SKIPIF-- <?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --CREDITS-- Marco Fabbri mrfabbri@gmail.com diff --git a/ext/posix/tests/posix_setgid_error.phpt b/ext/posix/tests/posix_setgid_error.phpt index 83d727c58a..169bd9f9ab 100644 --- a/ext/posix/tests/posix_setgid_error.phpt +++ b/ext/posix/tests/posix_setgid_error.phpt @@ -1,8 +1,8 @@ --TEST-- Test function posix_setgid() by calling it more than or less than its expected arguments. --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> Marco Fabbri mrfabbri@gmail.com Francesco Fullone ff@ideato.it diff --git a/ext/posix/tests/posix_setgid_variation1.phpt b/ext/posix/tests/posix_setgid_variation1.phpt index 7aadaf3657..bb4b9b3f8b 100644 --- a/ext/posix/tests/posix_setgid_variation1.phpt +++ b/ext/posix/tests/posix_setgid_variation1.phpt @@ -1,8 +1,8 @@ --TEST-- Test function posix_setgid() by substituting argument 1 with array values. --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --CREDITS-- Marco Fabbri mrfabbri@gmail.com diff --git a/ext/posix/tests/posix_setgid_variation2.phpt b/ext/posix/tests/posix_setgid_variation2.phpt index 6832abb923..fb578f80ca 100644 --- a/ext/posix/tests/posix_setgid_variation2.phpt +++ b/ext/posix/tests/posix_setgid_variation2.phpt @@ -1,8 +1,8 @@ --TEST-- Test function posix_setgid() by substituting argument 1 with boolean values. --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; if(posix_geteuid() == 0) print "skip - Cannot run test as root."; ?> --CREDITS-- @@ -37,4 +37,4 @@ bool(false) bool(false) bool(false) ===DONE=== - + diff --git a/ext/posix/tests/posix_setgid_variation4.phpt b/ext/posix/tests/posix_setgid_variation4.phpt index 4292c0dfc5..1c791e9b0a 100644 --- a/ext/posix/tests/posix_setgid_variation4.phpt +++ b/ext/posix/tests/posix_setgid_variation4.phpt @@ -1,9 +1,9 @@ --TEST-- Test function posix_setgid() by substituting argument 1 with float values. --SKIPIF-- -<?php +<?php PHP_INT_SIZE == 4 or die("skip - 32-bit only"); - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; if(posix_geteuid() == 0) print "skip - Cannot run test as root."; ?> --CREDITS-- @@ -44,4 +44,4 @@ Warning: posix_setgid() expects parameter 1 to be int, float given in %s on line bool(false) bool(false) ===DONE=== - + diff --git a/ext/posix/tests/posix_setgid_variation5.phpt b/ext/posix/tests/posix_setgid_variation5.phpt index 721ca3c475..baa4383dc3 100644 --- a/ext/posix/tests/posix_setgid_variation5.phpt +++ b/ext/posix/tests/posix_setgid_variation5.phpt @@ -1,8 +1,8 @@ --TEST-- Test function posix_setgid() by substituting argument 1 with int values. --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; if(posix_geteuid() == 0) print "skip - Cannot run test as root."; ?> --CREDITS-- @@ -35,4 +35,4 @@ bool(false) bool(false) bool(false) ===DONE=== - + diff --git a/ext/posix/tests/posix_setgid_variation6.phpt b/ext/posix/tests/posix_setgid_variation6.phpt index abee8ed222..d8c86b046f 100644 --- a/ext/posix/tests/posix_setgid_variation6.phpt +++ b/ext/posix/tests/posix_setgid_variation6.phpt @@ -2,7 +2,7 @@ Test function posix_setgid() by substituting argument 1 with object values. --SKIPIF-- <?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --CREDITS-- Marco Fabbri mrfabbri@gmail.com diff --git a/ext/posix/tests/posix_setrlimit.phpt b/ext/posix/tests/posix_setrlimit.phpt index 818ac73b9e..fef2fa4c85 100644 --- a/ext/posix/tests/posix_setrlimit.phpt +++ b/ext/posix/tests/posix_setrlimit.phpt @@ -2,7 +2,7 @@ posix_setrlimit(): Basic tests --SKIPIF-- <?php -if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); +if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); if (!function_exists('posix_setrlimit')) die('skip posix_setrlimit() not found'); ?> --FILE-- diff --git a/ext/posix/tests/posix_setuid_basic.phpt b/ext/posix/tests/posix_setuid_basic.phpt index 8539e47e7a..0d8d928653 100644 --- a/ext/posix/tests/posix_setuid_basic.phpt +++ b/ext/posix/tests/posix_setuid_basic.phpt @@ -5,8 +5,8 @@ Marco Fabbri mrfabbri@gmail.com Francesco Fullone ff@ideato.it #PHPTestFest Cesena Italia on 2009-06-20 --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --FILE-- <?php diff --git a/ext/posix/tests/posix_setuid_error.phpt b/ext/posix/tests/posix_setuid_error.phpt index 8aa51586a4..f1522e663c 100644 --- a/ext/posix/tests/posix_setuid_error.phpt +++ b/ext/posix/tests/posix_setuid_error.phpt @@ -1,8 +1,8 @@ --TEST-- Test function posix_setuid() by calling it more than or less than its expected arguments --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --CREDITS-- Marco Fabbri mrfabbri@gmail.com diff --git a/ext/posix/tests/posix_setuid_error2.phpt b/ext/posix/tests/posix_setuid_error2.phpt index 577b9d3102..7775f09b0c 100644 --- a/ext/posix/tests/posix_setuid_error2.phpt +++ b/ext/posix/tests/posix_setuid_error2.phpt @@ -1,8 +1,8 @@ --TEST-- Test function posix_setuid() by substituting argument 1 with object values. --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --CREDITS-- Marco Fabbri mrfabbri@gmail.com diff --git a/ext/posix/tests/posix_setuid_variation1.phpt b/ext/posix/tests/posix_setuid_variation1.phpt index 44e02e0a27..42ad939b61 100644 --- a/ext/posix/tests/posix_setuid_variation1.phpt +++ b/ext/posix/tests/posix_setuid_variation1.phpt @@ -1,8 +1,8 @@ --TEST-- Test function posix_setuid() by substituting argument 1 with array values. --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --CREDITS-- Marco Fabbri mrfabbri@gmail.com diff --git a/ext/posix/tests/posix_setuid_variation2.phpt b/ext/posix/tests/posix_setuid_variation2.phpt index bf0c5f448d..6756f42b0d 100644 --- a/ext/posix/tests/posix_setuid_variation2.phpt +++ b/ext/posix/tests/posix_setuid_variation2.phpt @@ -1,8 +1,8 @@ --TEST-- Test function posix_setuid() by substituting argument 1 with boolean values. --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; if(posix_geteuid() == 0) print "skip - Cannot run test as root."; ?> --CREDITS-- diff --git a/ext/posix/tests/posix_setuid_variation3.phpt b/ext/posix/tests/posix_setuid_variation3.phpt index f562002485..0336865062 100644 --- a/ext/posix/tests/posix_setuid_variation3.phpt +++ b/ext/posix/tests/posix_setuid_variation3.phpt @@ -1,8 +1,8 @@ --TEST-- Test function posix_setuid() by substituting argument 1 with emptyUnsetUndefNull values. --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; if(posix_geteuid() == 0) print "skip - Cannot run test as root."; ?> --CREDITS-- diff --git a/ext/posix/tests/posix_setuid_variation4.phpt b/ext/posix/tests/posix_setuid_variation4.phpt index 419f675bf5..7423ba324e 100644 --- a/ext/posix/tests/posix_setuid_variation4.phpt +++ b/ext/posix/tests/posix_setuid_variation4.phpt @@ -1,9 +1,9 @@ --TEST-- Test function posix_setuid() by substituting argument 1 with float values. --SKIPIF-- -<?php +<?php PHP_INT_SIZE == 4 or die("skip - 32-bit only"); - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; if(posix_geteuid() == 0) print "skip - Cannot run test as root."; ?> --CREDITS-- diff --git a/ext/posix/tests/posix_setuid_variation5.phpt b/ext/posix/tests/posix_setuid_variation5.phpt index 1bb485f40f..79925e5066 100644 --- a/ext/posix/tests/posix_setuid_variation5.phpt +++ b/ext/posix/tests/posix_setuid_variation5.phpt @@ -1,8 +1,8 @@ --TEST-- Test function posix_setuid() by substituting argument 1 with int values. --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; if(posix_geteuid() == 0) print "skip - Cannot run test as root."; ?> --CREDITS-- diff --git a/ext/posix/tests/posix_setuid_variation6.phpt b/ext/posix/tests/posix_setuid_variation6.phpt index e902b07ddc..9fd6ffe71c 100644 --- a/ext/posix/tests/posix_setuid_variation6.phpt +++ b/ext/posix/tests/posix_setuid_variation6.phpt @@ -1,8 +1,8 @@ --TEST-- Test function posix_setuid() by substituting argument 1 with string values. --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --CREDITS-- Marco Fabbri mrfabbri@gmail.com diff --git a/ext/posix/tests/posix_strerror_error.phpt b/ext/posix/tests/posix_strerror_error.phpt index 3803f465b2..a016f19dd4 100644 --- a/ext/posix/tests/posix_strerror_error.phpt +++ b/ext/posix/tests/posix_strerror_error.phpt @@ -1,15 +1,15 @@ --TEST-- Test posix_strerror() function : error conditions --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --FILE-- <?php /* Prototype : proto string posix_strerror(int errno) * Description: Retrieve the system error message associated with the given errno. * Source code: ext/posix/posix.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing posix_strerror() : error conditions ***\n"; diff --git a/ext/posix/tests/posix_strerror_variation1.phpt b/ext/posix/tests/posix_strerror_variation1.phpt index 43ef566893..0e1feb9de8 100644 --- a/ext/posix/tests/posix_strerror_variation1.phpt +++ b/ext/posix/tests/posix_strerror_variation1.phpt @@ -3,14 +3,14 @@ Test posix_strerror() function : usage variations --SKIPIF-- <?php PHP_INT_SIZE == 4 or die("skip - 32-bit only"); - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --FILE-- <?php /* Prototype : proto string posix_strerror(int errno) * Description: Retrieve the system error message associated with the given errno. * Source code: ext/posix/posix.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing posix_strerror() : usage variations ***\n"; @@ -61,7 +61,7 @@ $values = array( // unset data $unset_var, - + // object data new stdclass(), ); diff --git a/ext/posix/tests/posix_times.phpt b/ext/posix/tests/posix_times.phpt index 6ad3407ccb..f75caa7920 100644 --- a/ext/posix/tests/posix_times.phpt +++ b/ext/posix/tests/posix_times.phpt @@ -7,8 +7,8 @@ Source code: ext/posix/posix.c Falko Menge, mail at falko-menge dot de PHP Testfest Berlin 2009-05-10 --SKIPIF-- -<?php - if (!extension_loaded('posix')) { +<?php + 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 5da6434b14..78c53bdb1f 100644 --- a/ext/posix/tests/posix_times_basic.phpt +++ b/ext/posix/tests/posix_times_basic.phpt @@ -1,23 +1,23 @@ --TEST-- Test posix_times() function : basic functionality --SKIPIF-- -<?php - if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); +<?php + if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); ?> --FILE-- -<?php - echo "Basic test of POSIX times function\n"; - +<?php + echo "Basic test of POSIX times function\n"; + $times = posix_times(); - - var_dump($times); - - + + var_dump($times); + + if ($times == FALSE) { $errno= posix_get_last_error(); - var_dump(posix_strerror($errno)); + var_dump(posix_strerror($errno)); } - + ?> ===DONE==== --EXPECTF-- diff --git a/ext/posix/tests/posix_times_error.phpt b/ext/posix/tests/posix_times_error.phpt index b705047358..242f4499b3 100644 --- a/ext/posix/tests/posix_times_error.phpt +++ b/ext/posix/tests/posix_times_error.phpt @@ -1,15 +1,15 @@ --TEST-- Test posix_times() function : error conditions --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --FILE-- <?php /* Prototype : proto array posix_times(void) - * Description: Get process times (POSIX.1, 4.5.2) + * Description: Get process times (POSIX.1, 4.5.2) * Source code: ext/posix/posix.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing posix_times() : error conditions ***\n"; diff --git a/ext/posix/tests/posix_ttyname.phpt b/ext/posix/tests/posix_ttyname.phpt index 8164b1d44c..a1f806bd50 100644 --- a/ext/posix/tests/posix_ttyname.phpt +++ b/ext/posix/tests/posix_ttyname.phpt @@ -7,8 +7,8 @@ Source code: ext/posix/posix.c Falko Menge, mail at falko-menge dot de PHP Testfest Berlin 2009-05-10 --SKIPIF-- -<?php - if (!extension_loaded('posix')) { +<?php + if (!extension_loaded('posix')) { die('SKIP - POSIX extension not available'); } ?> diff --git a/ext/posix/tests/posix_ttyname_error.phpt b/ext/posix/tests/posix_ttyname_error.phpt index f7b011e773..effa709717 100644 --- a/ext/posix/tests/posix_ttyname_error.phpt +++ b/ext/posix/tests/posix_ttyname_error.phpt @@ -17,7 +17,7 @@ if (!extension_loaded('posix')) { echo "*** Test by calling method or function with incorrect numbers of arguments ***\n"; $fd = 'foo'; -$extra_arg = 'bar'; +$extra_arg = 'bar'; var_dump(posix_ttyname( $fd, $extra_arg ) ); diff --git a/ext/posix/tests/posix_ttyname_error_wrongparams.phpt b/ext/posix/tests/posix_ttyname_error_wrongparams.phpt index ef0842b74c..158a2d0ca7 100644 --- a/ext/posix/tests/posix_ttyname_error_wrongparams.phpt +++ b/ext/posix/tests/posix_ttyname_error_wrongparams.phpt @@ -7,11 +7,11 @@ Source code: ext/posix/posix.c Falko Menge, mail at falko-menge dot de PHP Testfest Berlin 2009-05-10 --SKIPIF-- -<?php - if (!extension_loaded('posix')) { +<?php + if (!extension_loaded('posix')) { die('SKIP - POSIX extension not available'); } - if (!extension_loaded('gd')) { + if (!extension_loaded('gd')) { die('SKIP - GD extension not available'); } if (!function_exists('imagecreate')) { diff --git a/ext/posix/tests/posix_uname_basic.phpt b/ext/posix/tests/posix_uname_basic.phpt index 6bd5b100ee..1ea3fe8fbb 100644 --- a/ext/posix/tests/posix_uname_basic.phpt +++ b/ext/posix/tests/posix_uname_basic.phpt @@ -2,14 +2,14 @@ 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 - echo "Basic test of POSIX uname function\n"; + echo "Basic test of POSIX uname function\n"; - $uname = posix_uname(); - unset($uname['domainname']); + $uname = posix_uname(); + unset($uname['domainname']); print_r($uname); ?> diff --git a/ext/posix/tests/posix_uname_error.phpt b/ext/posix/tests/posix_uname_error.phpt index b44f4ae8ca..df5056b828 100644 --- a/ext/posix/tests/posix_uname_error.phpt +++ b/ext/posix/tests/posix_uname_error.phpt @@ -1,15 +1,15 @@ --TEST-- Test posix_uname() function : error conditions --SKIPIF-- -<?php - if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; +<?php + if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --FILE-- <?php /* Prototype : proto array posix_uname(void) - * Description: Get system name (POSIX.1, 4.4.1) + * Description: Get system name (POSIX.1, 4.4.1) * Source code: ext/posix/posix.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing posix_uname() : error conditions ***\n"; diff --git a/ext/pspell/tests/001.phpt b/ext/pspell/tests/001.phpt index bda6709c3b..000671cf8f 100644 --- a/ext/pspell/tests/001.phpt +++ b/ext/pspell/tests/001.phpt @@ -1,7 +1,7 @@ --TEST-- pspell basic tests (warning: may fail with pspell/aspell < GNU Aspell 0.50.3) --SKIPIF-- -<?php +<?php if (!extension_loaded("pspell")) die("skip"); if (!@pspell_new ("en", "", "", "", (PSPELL_FAST|PSPELL_RUN_TOGETHER))) { die("skip English dictionary is not available"); @@ -29,7 +29,7 @@ for($i=0,$u=count($array);$i<$u;++$i) { echo $array[$i].' : '; if (!pspell_check($pspell, $array[$i])) { echo "..false\n"; - echo "Possible spellings: " . join(',',pspell_suggest ($pspell, $array[$i])) . "\n"; + echo "Possible spellings: " . join(',',pspell_suggest ($pspell, $array[$i])) . "\n"; } else { echo "true\n"; } diff --git a/ext/readline/tests/bug72538.phpt b/ext/readline/tests/bug72538.phpt index 7de37f2e6e..978dc00a8c 100644 --- a/ext/readline/tests/bug72538.phpt +++ b/ext/readline/tests/bug72538.phpt @@ -1,12 +1,12 @@ --TEST-- Bug #72538 (readline_redisplay crashes php) --SKIPIF-- -<?php if (!extension_loaded("readline")) die("skip"); +<?php if (!extension_loaded("readline")) die("skip"); if (READLINE_LIB != "libedit") die("skip libedit only"); if (!function_exists("readline_redisplay")) die("skip readline_redisplay not available"); ?> --FILE-- -<?php +<?php readline_redisplay(); diff --git a/ext/readline/tests/libedit_info_001-win32.phpt b/ext/readline/tests/libedit_info_001-win32.phpt index d91bfbafb1..d14c7a2f46 100644 --- a/ext/readline/tests/libedit_info_001-win32.phpt +++ b/ext/readline/tests/libedit_info_001-win32.phpt @@ -1,7 +1,7 @@ --TEST-- readline_info(): Basic test --SKIPIF-- -<?php if (!extension_loaded("readline")) die("skip"); +<?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'); diff --git a/ext/readline/tests/libedit_info_001.phpt b/ext/readline/tests/libedit_info_001.phpt index 33dc144add..4c77e7a97c 100644 --- a/ext/readline/tests/libedit_info_001.phpt +++ b/ext/readline/tests/libedit_info_001.phpt @@ -1,7 +1,7 @@ --TEST-- readline_info(): Basic test --SKIPIF-- -<?php if (!extension_loaded("readline")) die("skip"); +<?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'); diff --git a/ext/reflection/tests/002.phpt b/ext/reflection/tests/002.phpt index 3a51990cf6..d0fcb32bea 100644 --- a/ext/reflection/tests/002.phpt +++ b/ext/reflection/tests/002.phpt @@ -6,7 +6,7 @@ Reflection properties are read only class ReflectionMethodEx extends ReflectionMethod { public $foo = "xyz"; - + function __construct($c,$m) { echo __METHOD__ . "\n"; diff --git a/ext/reflection/tests/006.phpt b/ext/reflection/tests/006.phpt index 89c438765a..ab22f5c5c9 100644 --- a/ext/reflection/tests/006.phpt +++ b/ext/reflection/tests/006.phpt @@ -12,7 +12,7 @@ Class Test static public $pub = 'pub'; static protected $pro = 'pro'; static private $pri = 'pri'; - + static function testing() { $ref = new ReflectionClass('Test'); diff --git a/ext/reflection/tests/007.phpt b/ext/reflection/tests/007.phpt index 8dfc2e8bcc..2b4f3df43f 100644 --- a/ext/reflection/tests/007.phpt +++ b/ext/reflection/tests/007.phpt @@ -29,7 +29,7 @@ function test($class) { echo "Exception: " . $e->getMessage() . "\n"; } - + echo "====>newInstance(25)\n"; try { @@ -49,7 +49,7 @@ function test($class) { var_dump($e->getMessage()); } - + echo "\n"; } diff --git a/ext/reflection/tests/008.phpt b/ext/reflection/tests/008.phpt index a5c3ef13e1..80a4a39218 100644 --- a/ext/reflection/tests/008.phpt +++ b/ext/reflection/tests/008.phpt @@ -12,10 +12,10 @@ foreach ($a as $val) { var_dump($e->getMessage()); } } - + $a = array("", 1, ""); $b = array("", "", 1); - + foreach ($a as $key=>$val) { try { new ReflectionMethod($val, $b[$key]); @@ -26,7 +26,7 @@ foreach ($a as $key=>$val) { echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(20) "Invalid method name " string(21) "Invalid method name 1" string(21) "Class does not exist" diff --git a/ext/reflection/tests/009.phpt b/ext/reflection/tests/009.phpt index c6a252cfca..09df90c8c3 100644 --- a/ext/reflection/tests/009.phpt +++ b/ext/reflection/tests/009.phpt @@ -47,7 +47,7 @@ var_dump($func->getNumberOfRequiredParameters()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- /** hoho */ diff --git a/ext/reflection/tests/ReflectionClass_FileInfo_basic.phpt b/ext/reflection/tests/ReflectionClass_FileInfo_basic.phpt index da276e68cf..05565efae3 100644 --- a/ext/reflection/tests/ReflectionClass_FileInfo_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_FileInfo_basic.phpt @@ -1,6 +1,6 @@ --TEST-- ReflectionClass::getFileName(), ReflectionClass::getStartLine(), ReflectionClass::getEndLine() ---FILE-- +--FILE-- <?php //New instance of class C - defined below $rc = new ReflectionClass("C"); diff --git a/ext/reflection/tests/ReflectionClass_FileInfo_error.phpt b/ext/reflection/tests/ReflectionClass_FileInfo_error.phpt index b42be136cd..a4e5f95564 100644 --- a/ext/reflection/tests/ReflectionClass_FileInfo_error.phpt +++ b/ext/reflection/tests/ReflectionClass_FileInfo_error.phpt @@ -1,6 +1,6 @@ --TEST-- ReflectionClass::getFileName(), ReflectionClass::getStartLine(), ReflectionClass::getEndLine() - bad params ---FILE-- +--FILE-- <?php Class C { } @@ -10,7 +10,7 @@ $methods = array("getFileName", "getStartLine", "getEndLine"); foreach ($methods as $method) { var_dump($rc->$method()); var_dump($rc->$method(null)); - var_dump($rc->$method('X', 0)); + var_dump($rc->$method('X', 0)); } ?> --EXPECTF-- diff --git a/ext/reflection/tests/ReflectionClass_constructor_002.phpt b/ext/reflection/tests/ReflectionClass_constructor_002.phpt index 3685c639de..64c299592d 100644 --- a/ext/reflection/tests/ReflectionClass_constructor_002.phpt +++ b/ext/reflection/tests/ReflectionClass_constructor_002.phpt @@ -5,43 +5,43 @@ ReflectionClass::__constructor() - bad arguments try { var_dump(new ReflectionClass()); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump(new ReflectionClass(null)); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump(new ReflectionClass(true)); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump(new ReflectionClass(1)); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump(new ReflectionClass(array(1,2,3))); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump(new ReflectionClass("stdClass", 1)); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump(new ReflectionClass("X")); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } ?> diff --git a/ext/reflection/tests/ReflectionClass_export_basic1.phpt b/ext/reflection/tests/ReflectionClass_export_basic1.phpt index 8729731f56..83c514adab 100644 --- a/ext/reflection/tests/ReflectionClass_export_basic1.phpt +++ b/ext/reflection/tests/ReflectionClass_export_basic1.phpt @@ -2,7 +2,7 @@ ReflectionClass::export() - various parameters --FILE-- <?php -Class A { +Class A { public function privf(Exception $a) {} public function pubf(A $a, $b, diff --git a/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt b/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt index c572796ae8..5db9d8f3d3 100644 --- a/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt @@ -48,7 +48,7 @@ class D1 extends C { class D2 extends C { } -$classes = array('NewCtor', 'ExtendsNewCtor', 'OldCtor', 'ExtendsOldCtor', +$classes = array('NewCtor', 'ExtendsNewCtor', 'OldCtor', 'ExtendsOldCtor', 'OldAndNewCtor', 'NewAndOldCtor', 'B', 'C', 'D1', 'D2', 'X', 'Y'); foreach ($classes as $class) { @@ -59,9 +59,9 @@ foreach ($classes as $class) { } else { echo "No constructor for $class\n"; } - -} - + +} + ?> --EXPECTF-- Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; OldCtor has a deprecated constructor in %s on line %d diff --git a/ext/reflection/tests/ReflectionClass_getDefaultProperties_001.phpt b/ext/reflection/tests/ReflectionClass_getDefaultProperties_001.phpt index d29436b734..3778adb403 100644 --- a/ext/reflection/tests/ReflectionClass_getDefaultProperties_001.phpt +++ b/ext/reflection/tests/ReflectionClass_getDefaultProperties_001.phpt @@ -1,5 +1,5 @@ --TEST-- -ReflectionClass::getDefaultProperties(), ReflectionClass::getStaticProperties() +ReflectionClass::getDefaultProperties(), ReflectionClass::getStaticProperties() --CREDITS-- Robin Fernandes <robinf@php.net> Steve Seear <stevseea@php.net> @@ -11,15 +11,15 @@ class A { static public $statPubC = "stat pubC in A"; static protected $statProtC = "stat protC in A"; static private $statPrivC = "stat privC in A"; - + static public $statPubA = "stat pubA in A"; static protected $statProtA = "stat protA in A"; static private $statPrivA = "stat privA in A"; - + public $pubC = "pubC in A"; protected $protC = "protC in A"; private $privC = "privC in A"; - + public $pubA = "pubA in A"; protected $protA = "protA in A"; private $privA = "privA in A"; @@ -32,22 +32,22 @@ class B extends A { static public $statPubB = "stat pubB in B"; static protected $statProtB = "stat protB in B"; - static private $statPrivB = "stat privB in B"; - + static private $statPrivB = "stat privB in B"; + public $pubC = "pubC in B"; protected $protC = "protC in B"; private $privC = "privC in B"; public $pubB = "pubB in B"; protected $protB = "protB in B"; - private $privB = "privB in B"; + private $privB = "privB in B"; } class C extends B { static public $statPubC = "stat pubC in C"; static protected $statProtC = "stat protC in C"; static private $statPrivC = "stat privC in C"; - + public $pubC = "pubC in C"; protected $protC = "protC in C"; private $privC = "privC in C"; @@ -60,7 +60,7 @@ class X { public $pubC = "pubC in X"; protected $protC = "protC in X"; - private $privC = "privC in X"; + private $privC = "privC in X"; } $classes = array('A', 'B', 'C', 'X'); @@ -68,7 +68,7 @@ foreach ($classes as $class) { $rc = new ReflectionClass($class); echo "\n\n---- Static properties in $class ----\n"; print_r($rc->getStaticProperties()); - echo "\n\n---- Default properties in $class ----\n"; + echo "\n\n---- Default properties in $class ----\n"; print_r($rc->getDefaultProperties()); } diff --git a/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt b/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt index 624829f014..8edc6a93a6 100644 --- a/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt +++ b/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt @@ -49,8 +49,8 @@ final class G extends C implements I {} {} $classes = array('A', 'B', 'C', 'D', 'E', 'F', 'G', 'I'); foreach ($classes as $class) { echo "\n\n---> Doc comment for class $class:\n"; - $rc = new ReflectionClass($class); - var_dump($rc->getDocComment()); + $rc = new ReflectionClass($class); + var_dump($rc->getDocComment()); } diff --git a/ext/reflection/tests/ReflectionClass_getExtensionName_variation.phpt b/ext/reflection/tests/ReflectionClass_getExtensionName_variation.phpt index 998355cc7c..4f78343081 100644 --- a/ext/reflection/tests/ReflectionClass_getExtensionName_variation.phpt +++ b/ext/reflection/tests/ReflectionClass_getExtensionName_variation.phpt @@ -7,7 +7,7 @@ Rein Velt <rein@velt.org> <?php class myClass - { + { public $varX; public $varY; } diff --git a/ext/reflection/tests/ReflectionClass_getExtension_variation.phpt b/ext/reflection/tests/ReflectionClass_getExtension_variation.phpt index 5409504716..f3697792db 100644 --- a/ext/reflection/tests/ReflectionClass_getExtension_variation.phpt +++ b/ext/reflection/tests/ReflectionClass_getExtension_variation.phpt @@ -7,7 +7,7 @@ Rein Velt <rein@velt.org> <?php class myClass - { + { public $varX; public $varY; } diff --git a/ext/reflection/tests/ReflectionClass_getInterfaces_001.phpt b/ext/reflection/tests/ReflectionClass_getInterfaces_001.phpt index 147d868c94..6f7561c462 100644 --- a/ext/reflection/tests/ReflectionClass_getInterfaces_001.phpt +++ b/ext/reflection/tests/ReflectionClass_getInterfaces_001.phpt @@ -28,7 +28,7 @@ class C5 extends C4 implements I7 {} class C6 implements I1, I2, I3, I4, I5, I6, I7 {} -$classes = array( 'A0', 'A1', 'B0', 'B1', +$classes = array( 'A0', 'A1', 'B0', 'B1', 'I0', 'I1', 'I2', 'I3', 'I4', 'I5', 'I6', 'I7', 'C0', 'C1', 'C2', 'C3', 'C4', 'C5', 'C6' ); diff --git a/ext/reflection/tests/ReflectionClass_getMethod_001.phpt b/ext/reflection/tests/ReflectionClass_getMethod_001.phpt index 780b558cc7..59887991ec 100644 --- a/ext/reflection/tests/ReflectionClass_getMethod_001.phpt +++ b/ext/reflection/tests/ReflectionClass_getMethod_001.phpt @@ -7,14 +7,14 @@ Steve Seear <stevseea@php.net> <?php class pubf { public function f() {} - static public function s() {} + static public function s() {} } class subpubf extends pubf { } class protf { protected function f() {} - static protected function s() {} + static protected function s() {} } class subprotf extends protf { } @@ -26,7 +26,7 @@ class privf { class subprivf extends privf { } -$classes = array("pubf", "subpubf", "protf", "subprotf", +$classes = array("pubf", "subpubf", "protf", "subprotf", "privf", "subprivf"); foreach($classes as $class) { echo "Reflecting on class $class: \n"; @@ -34,14 +34,14 @@ foreach($classes as $class) { echo " --> Check for f(): "; var_dump($rc->getMethod("f")); echo " --> Check for s(): "; - var_dump($rc->getMethod("s")); + var_dump($rc->getMethod("s")); echo " --> Check for F(): "; - var_dump($rc->getMethod("F")); + var_dump($rc->getMethod("F")); echo " --> Check for doesntExist(): "; try { var_dump($rc->getMethod("doesntExist")); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } } ?> diff --git a/ext/reflection/tests/ReflectionClass_getMethod_002.phpt b/ext/reflection/tests/ReflectionClass_getMethod_002.phpt index 2baabdedad..f70e779e9f 100644 --- a/ext/reflection/tests/ReflectionClass_getMethod_002.phpt +++ b/ext/reflection/tests/ReflectionClass_getMethod_002.phpt @@ -14,42 +14,42 @@ echo "Check invalid params:\n"; try { var_dump($rc->getMethod()); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getMethod("f", "f")); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getMethod(null)); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getMethod(1)); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getMethod(1.5)); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getMethod(true)); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getMethod(array(1,2,3))); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getMethod(new C)); } catch (Exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } diff --git a/ext/reflection/tests/ReflectionClass_getMethods_001.phpt b/ext/reflection/tests/ReflectionClass_getMethods_001.phpt index 7d4b6774c2..dca9adb56d 100644 --- a/ext/reflection/tests/ReflectionClass_getMethods_001.phpt +++ b/ext/reflection/tests/ReflectionClass_getMethods_001.phpt @@ -7,14 +7,14 @@ Steve Seear <stevseea@php.net> <?php class pubf { public function f() {} - static public function s() {} + static public function s() {} } class subpubf extends pubf { } class protf { protected function f() {} - static protected function s() {} + static protected function s() {} } class subprotf extends protf { } @@ -26,7 +26,7 @@ class privf { class subprivf extends privf { } -$classes = array("pubf", "subpubf", "protf", "subprotf", +$classes = array("pubf", "subpubf", "protf", "subprotf", "privf", "subprivf"); foreach($classes as $class) { echo "Reflecting on class $class: \n"; diff --git a/ext/reflection/tests/ReflectionClass_getName_basic.phpt b/ext/reflection/tests/ReflectionClass_getName_basic.phpt index e99d30840b..37cec4bc81 100644 --- a/ext/reflection/tests/ReflectionClass_getName_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_getName_basic.phpt @@ -18,7 +18,7 @@ $r3 = new ReflectionClass("TrickClass"); var_dump($r1->getName(), $r2->getName(), $r3->getName()); -?> +?> --EXPECT-- string(8) "stdClass" string(8) "stdClass" diff --git a/ext/reflection/tests/ReflectionClass_getName_error.phpt b/ext/reflection/tests/ReflectionClass_getName_error.phpt index 06cc4155be..145704e7bc 100644 --- a/ext/reflection/tests/ReflectionClass_getName_error.phpt +++ b/ext/reflection/tests/ReflectionClass_getName_error.phpt @@ -7,7 +7,7 @@ $r1 = new ReflectionClass("stdClass"); var_dump($r1->getName('X')); var_dump($r1->getName('X', true)); -?> +?> --EXPECTF-- Warning: ReflectionClass::getName() expects exactly 0 parameters, 1 given in %s on line %d NULL diff --git a/ext/reflection/tests/ReflectionClass_getProperties_001.phpt b/ext/reflection/tests/ReflectionClass_getProperties_001.phpt index ed0b160b93..3554af3890 100644 --- a/ext/reflection/tests/ReflectionClass_getProperties_001.phpt +++ b/ext/reflection/tests/ReflectionClass_getProperties_001.phpt @@ -14,7 +14,7 @@ class subpubf extends pubf { class protf { protected $a; - static protected $s; + static protected $s; } class subprotf extends protf { } @@ -26,7 +26,7 @@ class privf { class subprivf extends privf { } -$classes = array("pubf", "subpubf", "protf", "subprotf", +$classes = array("pubf", "subpubf", "protf", "subprotf", "privf", "subprivf"); foreach($classes as $class) { echo "Reflecting on class $class: \n"; diff --git a/ext/reflection/tests/ReflectionClass_getProperty_001.phpt b/ext/reflection/tests/ReflectionClass_getProperty_001.phpt index fca68ed30f..830608e0ca 100644 --- a/ext/reflection/tests/ReflectionClass_getProperty_001.phpt +++ b/ext/reflection/tests/ReflectionClass_getProperty_001.phpt @@ -26,7 +26,7 @@ class privf { class subprivf extends privf { } -$classes = array("pubf", "subpubf", "protf", "subprotf", +$classes = array("pubf", "subpubf", "protf", "subprotf", "privf", "subprivf"); foreach($classes as $class) { echo "Reflecting on class $class: \n"; @@ -35,25 +35,25 @@ foreach($classes as $class) { echo " --> Check for s: "; var_dump($rc->getProperty("s")); } catch (exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { echo " --> Check for a: "; var_dump($rc->getProperty("a")); } catch (exception $e) { - echo $e->getMessage() . "\n"; - } + echo $e->getMessage() . "\n"; + } try { echo " --> Check for A: "; var_dump($rc->getProperty("A")); } catch (exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { echo " --> Check for doesntExist: "; var_dump($rc->getProperty("doesntExist")); } catch (exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } } diff --git a/ext/reflection/tests/ReflectionClass_getProperty_002.phpt b/ext/reflection/tests/ReflectionClass_getProperty_002.phpt index be7bb53bc8..cf4aca51ea 100644 --- a/ext/reflection/tests/ReflectionClass_getProperty_002.phpt +++ b/ext/reflection/tests/ReflectionClass_getProperty_002.phpt @@ -14,42 +14,42 @@ echo "Check invalid params:\n"; try { var_dump($rc->getProperty()); } catch (exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getProperty("a", "a")); } catch (exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getProperty(null)); } catch (exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getProperty(1)); } catch (exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getProperty(1.5)); } catch (exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getProperty(true)); } catch (exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getProperty(array(1,2,3))); } catch (exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } try { var_dump($rc->getProperty(new C)); } catch (exception $e) { - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } ?> --EXPECTF-- diff --git a/ext/reflection/tests/ReflectionClass_getProperty_003.phpt b/ext/reflection/tests/ReflectionClass_getProperty_003.phpt index e30ea4abac..61d63362dc 100644 --- a/ext/reflection/tests/ReflectionClass_getProperty_003.phpt +++ b/ext/reflection/tests/ReflectionClass_getProperty_003.phpt @@ -9,10 +9,10 @@ class A { static public $pubC = "pubC in A"; static protected $protC = "protC in A"; static private $privC = "privC in A"; - + static public $pubA = "pubA in A"; static protected $protA = "protA in A"; - static private $privA = "privA in A"; + static private $privA = "privA in A"; } class B extends A { @@ -22,7 +22,7 @@ class B extends A { static public $pubB = "pubB in B"; static protected $protB = "protB in B"; - static private $privB = "privB in B"; + static private $privB = "privB in B"; } class C extends B { @@ -34,7 +34,7 @@ class C extends B { class X { static public $pubC = "pubC in X"; static protected $protC = "protC in X"; - static private $privC = "privC in X"; + static private $privC = "privC in X"; } $myC = new C; @@ -52,10 +52,10 @@ function showInfo($name) { try { var_dump($rp); var_dump($rp->getValue($myC)); - } catch (Exception $e) { + } catch (Exception $e) { echo $e->getMessage() . "\n"; return; - } + } } diff --git a/ext/reflection/tests/ReflectionClass_getProperty_004.phpt b/ext/reflection/tests/ReflectionClass_getProperty_004.phpt index e2bb6566ea..ce2aa57871 100644 --- a/ext/reflection/tests/ReflectionClass_getProperty_004.phpt +++ b/ext/reflection/tests/ReflectionClass_getProperty_004.phpt @@ -9,10 +9,10 @@ class A { public $pubC = "pubC in A"; protected $protC = "protC in A"; private $privC = "privC in A"; - + public $pubA = "pubA in A"; protected $protA = "protA in A"; - private $privA = "privA in A"; + private $privA = "privA in A"; } class B extends A { @@ -22,7 +22,7 @@ class B extends A { public $pubB = "pubB in B"; protected $protB = "protB in B"; - private $privB = "privB in B"; + private $privB = "privB in B"; } class C extends B { @@ -34,7 +34,7 @@ class C extends B { class X { public $pubC = "pubC in X"; protected $protC = "protC in X"; - private $privC = "privC in X"; + private $privC = "privC in X"; } $myC = new C; @@ -52,10 +52,10 @@ function showInfo($name) { try { var_dump($rp); var_dump($rp->getValue($myC)); - } catch (Exception $e) { + } catch (Exception $e) { echo $e->getMessage() . "\n"; return; - } + } } diff --git a/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001.phpt b/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001.phpt index ab8afb8cb9..365ec89ff1 100644 --- a/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001.phpt +++ b/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001.phpt @@ -1,5 +1,5 @@ --TEST-- -ReflectionClass::getStaticPropertyValue() +ReflectionClass::getStaticPropertyValue() --CREDITS-- Robin Fernandes <robinf@php.net> Steve Seear <stevseea@php.net> @@ -42,7 +42,7 @@ try { try { var_dump($rcA->getStaticPropertyValue("privateOverridden")); - echo "you should not see this"; + echo "you should not see this"; } catch (Exception $e) { echo $e->getMessage() . "\n"; } diff --git a/ext/reflection/tests/ReflectionClass_hasConstant_001.phpt b/ext/reflection/tests/ReflectionClass_hasConstant_001.phpt index 1c4cfc6106..d26fad591d 100644 --- a/ext/reflection/tests/ReflectionClass_hasConstant_001.phpt +++ b/ext/reflection/tests/ReflectionClass_hasConstant_001.phpt @@ -22,7 +22,7 @@ echo "Check absent constant: "; var_dump($rc->hasConstant("doesntExist")); -$rd = new ReflectionClass("D"); +$rd = new ReflectionClass("D"); echo "Check inherited constant: "; var_dump($rd->hasConstant("myConst")); echo "Check absent constant: "; diff --git a/ext/reflection/tests/ReflectionClass_hasConstant_basic.phpt b/ext/reflection/tests/ReflectionClass_hasConstant_basic.phpt index aa3af85c1e..69e2a2dac6 100644 --- a/ext/reflection/tests/ReflectionClass_hasConstant_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_hasConstant_basic.phpt @@ -3,7 +3,7 @@ ReflectionClass::hasConstant() --CREDITS-- Marc Veldman <marc@ibuildings.nl> #testfest roosendaal on 2008-05-10 ---FILE-- +--FILE-- <?php //New instance of class C - defined below $rc = new ReflectionClass("C"); diff --git a/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt b/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt index 9a8e252cc7..79009d3bdb 100644 --- a/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt +++ b/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt @@ -34,9 +34,9 @@ foreach($classes as $class) { echo " --> Check for f(): "; var_dump($rc->hasMethod("f")); echo " --> Check for s(): "; - var_dump($rc->hasMethod("s")); + var_dump($rc->hasMethod("s")); echo " --> Check for F(): "; - var_dump($rc->hasMethod("F")); + var_dump($rc->hasMethod("F")); echo " --> Check for doesntExist(): "; var_dump($rc->hasMethod("doesntExist")); } diff --git a/ext/reflection/tests/ReflectionClass_hasMethod_basic.phpt b/ext/reflection/tests/ReflectionClass_hasMethod_basic.phpt index 1c8d08175d..d3ce9155a9 100644 --- a/ext/reflection/tests/ReflectionClass_hasMethod_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_hasMethod_basic.phpt @@ -3,7 +3,7 @@ ReflectionClass::hasMethod() --CREDITS-- Marc Veldman <marc@ibuildings.nl> #testfest roosendaal on 2008-05-10 ---FILE-- +--FILE-- <?php //New instance of class C - defined below $rc = new ReflectionClass("C"); diff --git a/ext/reflection/tests/ReflectionClass_hasProperty_001.phpt b/ext/reflection/tests/ReflectionClass_hasProperty_001.phpt index 3101a7a6ae..a644b2e641 100644 --- a/ext/reflection/tests/ReflectionClass_hasProperty_001.phpt +++ b/ext/reflection/tests/ReflectionClass_hasProperty_001.phpt @@ -26,17 +26,17 @@ class privf { class subprivf extends privf { } -$classes = array("pubf", "subpubf", "protf", "subprotf", +$classes = array("pubf", "subpubf", "protf", "subprotf", "privf", "subprivf"); foreach($classes as $class) { echo "Reflecting on class $class: \n"; $rc = new ReflectionClass($class); echo " --> Check for s: "; - var_dump($rc->hasProperty("s")); + var_dump($rc->hasProperty("s")); echo " --> Check for a: "; var_dump($rc->hasProperty("a")); echo " --> Check for A: "; - var_dump($rc->hasProperty("A")); + var_dump($rc->hasProperty("A")); echo " --> Check for doesntExist: "; var_dump($rc->hasProperty("doesntExist")); } diff --git a/ext/reflection/tests/ReflectionClass_hasProperty_basic.phpt b/ext/reflection/tests/ReflectionClass_hasProperty_basic.phpt index e21656b7b2..751da5e6ea 100644 --- a/ext/reflection/tests/ReflectionClass_hasProperty_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_hasProperty_basic.phpt @@ -3,7 +3,7 @@ ReflectionClass::hasProperty() --CREDITS-- Marc Veldman <marc@ibuildings.nl> #testfest roosendaal on 2008-05-10 ---FILE-- +--FILE-- <?php //New instance of class C - defined below $rc = new ReflectionClass("C"); diff --git a/ext/reflection/tests/ReflectionClass_implementsInterface_001.phpt b/ext/reflection/tests/ReflectionClass_implementsInterface_001.phpt index 9c2fdedddb..91398867ec 100644 --- a/ext/reflection/tests/ReflectionClass_implementsInterface_001.phpt +++ b/ext/reflection/tests/ReflectionClass_implementsInterface_001.phpt @@ -12,7 +12,7 @@ class B extends A {} interface I2 extends I1 {} class C implements I2 {} -$classNames = array('A', 'B', 'C', 'I1', 'I2'); +$classNames = array('A', 'B', 'C', 'I1', 'I2'); foreach ($classNames as $className) { $rcs[$className] = new ReflectionClass($className); @@ -26,7 +26,7 @@ foreach ($rcs as $childName => $child) { var_dump($child->implementsInterface($parent)); } catch (Exception $e) { echo $e->getMessage() . "\n"; - } + } echo " - Using string argument: "; try { var_dump($child->implementsInterface($parentName)); diff --git a/ext/reflection/tests/ReflectionClass_isInstance_basic.phpt b/ext/reflection/tests/ReflectionClass_isInstance_basic.phpt index 8bf2841043..a108718894 100644 --- a/ext/reflection/tests/ReflectionClass_isInstance_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_isInstance_basic.phpt @@ -22,7 +22,7 @@ foreach ($classes as $class) { foreach ($instances as $name => $instance) { echo "is $name a $class? "; - var_dump($rc->isInstance($instance)); + var_dump($rc->isInstance($instance)); } } diff --git a/ext/reflection/tests/ReflectionClass_isInstantiable_basic.phpt b/ext/reflection/tests/ReflectionClass_isInstantiable_basic.phpt index 5b8c92010e..ef179721dc 100644 --- a/ext/reflection/tests/ReflectionClass_isInstantiable_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_isInstantiable_basic.phpt @@ -27,7 +27,7 @@ $classes = array("C", "iface", "ifaceImpl", "abstractClass", "D"); foreach($classes as $class ) { $reflectionClass = new ReflectionClass($class); echo "Is $class instantiable? "; - var_dump($reflectionClass->IsInstantiable()); + var_dump($reflectionClass->IsInstantiable()); } diff --git a/ext/reflection/tests/ReflectionClass_isInstantiable_variation.phpt b/ext/reflection/tests/ReflectionClass_isInstantiable_variation.phpt index e334a90a72..1378edd3d2 100644 --- a/ext/reflection/tests/ReflectionClass_isInstantiable_variation.phpt +++ b/ext/reflection/tests/ReflectionClass_isInstantiable_variation.phpt @@ -36,7 +36,7 @@ $classes = array("noCtor", "publicCtorNew", "protectedCtorNew", "privateCtorNew" foreach($classes as $class ) { $reflectionClass = new ReflectionClass($class); echo "Is $class instantiable? "; - var_dump($reflectionClass->IsInstantiable()); + var_dump($reflectionClass->IsInstantiable()); } ?> diff --git a/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt b/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt index 42dc647a02..8a0098ad8d 100644 --- a/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt +++ b/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt @@ -26,7 +26,7 @@ Class ExtendsIteratorAggregateImpl extends IterarorAggregateImpl { Class A { } -$classes = array('Traversable', 'Iterator', 'IteratorAggregate', 'ExtendsIterator', 'ExtendsIteratorAggregate', +$classes = array('Traversable', 'Iterator', 'IteratorAggregate', 'ExtendsIterator', 'ExtendsIteratorAggregate', 'IteratorImpl', 'IterarorAggregateImpl', 'ExtendsIteratorImpl', 'ExtendsIteratorAggregateImpl', 'A'); foreach($classes as $class) { diff --git a/ext/reflection/tests/ReflectionClass_isSubclassOf_basic.phpt b/ext/reflection/tests/ReflectionClass_isSubclassOf_basic.phpt index 538a26c5a5..c05ec27ccd 100644 --- a/ext/reflection/tests/ReflectionClass_isSubclassOf_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_isSubclassOf_basic.phpt @@ -9,7 +9,7 @@ class C extends B {} interface I {} class X implements I {} -$classNames = array('A', 'B', 'C', 'I', 'X'); +$classNames = array('A', 'B', 'C', 'I', 'X'); foreach ($classNames as $className) { $rcs[$className] = new ReflectionClass($className); @@ -21,7 +21,7 @@ foreach ($rcs as $childName => $child) { echo " - Using object argument: "; var_dump($child->isSubclassOf($parent)); echo " - Using string argument: "; - var_dump($child->isSubclassOf($parentName)); + var_dump($child->isSubclassOf($parentName)); } } ?> diff --git a/ext/reflection/tests/ReflectionClass_newInstanceArgs_001.phpt b/ext/reflection/tests/ReflectionClass_newInstanceArgs_001.phpt index 3ad654dd84..068710311d 100644 --- a/ext/reflection/tests/ReflectionClass_newInstanceArgs_001.phpt +++ b/ext/reflection/tests/ReflectionClass_newInstanceArgs_001.phpt @@ -7,8 +7,8 @@ Steve Seear <stevseea@php.net> <?php class A { public function A() { - echo "In constructor of class A\n"; - } + echo "In constructor of class A\n"; + } } class B { @@ -19,16 +19,16 @@ class B { class C { protected function __construct() { - echo "In constructor of class C\n"; + echo "In constructor of class C\n"; } } class D { private function __construct() { - echo "In constructor of class D\n"; + echo "In constructor of class D\n"; } } -class E { +class E { } diff --git a/ext/reflection/tests/ReflectionClass_newInstance_001.phpt b/ext/reflection/tests/ReflectionClass_newInstance_001.phpt index e29cc8734f..c91d2ee958 100644 --- a/ext/reflection/tests/ReflectionClass_newInstance_001.phpt +++ b/ext/reflection/tests/ReflectionClass_newInstance_001.phpt @@ -7,8 +7,8 @@ Steve Seear <stevseea@php.net> <?php class A { public function A() { - echo "In constructor of class A\n"; - } + echo "In constructor of class A\n"; + } } class B { @@ -19,16 +19,16 @@ class B { class C { protected function __construct() { - echo "In constructor of class C\n"; + echo "In constructor of class C\n"; } } class D { private function __construct() { - echo "In constructor of class D\n"; + echo "In constructor of class D\n"; } } -class E { +class E { } diff --git a/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001.phpt b/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001.phpt index 0004f3ff5a..bfefce369e 100644 --- a/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001.phpt +++ b/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001.phpt @@ -1,5 +1,5 @@ --TEST-- -ReflectionClass::setStaticPropertyValue() +ReflectionClass::setStaticPropertyValue() --CREDITS-- Robin Fernandes <robinf@php.net> Steve Seear <stevseea@php.net> @@ -43,7 +43,7 @@ try { try { var_dump($rcA->setStaticPropertyValue("privateOverridden", "new value 9")); - echo "you should not see this"; + echo "you should not see this"; } catch (Exception $e) { echo $e->getMessage() . "\n"; } diff --git a/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt b/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt index e78a28a551..2b7927e7ac 100644 --- a/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt +++ b/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt @@ -5,7 +5,7 @@ Test ReflectionFunction::getClosure() function : basic functionality /* Prototype : public mixed ReflectionFunction::getClosure() * Description: Returns a dynamically created closure for the function * Source code: ext/reflection/php_reflection.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ReflectionFunction::getClosure() : basic functionality ***\n"; diff --git a/ext/reflection/tests/ReflectionFunction_isDeprecated_basic.phpt b/ext/reflection/tests/ReflectionFunction_isDeprecated_basic.phpt index f8d476ae46..818d57e5f0 100644 --- a/ext/reflection/tests/ReflectionFunction_isDeprecated_basic.phpt +++ b/ext/reflection/tests/ReflectionFunction_isDeprecated_basic.phpt @@ -3,7 +3,7 @@ ReflectionFunction::isDeprecated --CREDITS-- Stefan Koopmanschap <stefan@phpgg.nl> TestFest PHP|Tek ---FILE-- +--FILE-- <?php // We currently don't have any deprecated functions :/ $rc = new ReflectionFunction('var_dump'); diff --git a/ext/reflection/tests/ReflectionMethod_basic1.phpt b/ext/reflection/tests/ReflectionMethod_basic1.phpt index 75ab957690..d403d2d2be 100644 --- a/ext/reflection/tests/ReflectionMethod_basic1.phpt +++ b/ext/reflection/tests/ReflectionMethod_basic1.phpt @@ -31,17 +31,17 @@ class TestClass public function foo() { echo "Called foo()\n"; } - + static function stat() { echo "Called stat()\n"; } - + private function priv() { echo "Called priv()\n"; } - + protected function prot() {} - + public function __destruct() {} } diff --git a/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt b/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt index c7d63446e5..f0a414d56b 100644 --- a/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt +++ b/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt @@ -5,7 +5,7 @@ Test ReflectionMethod::getClosure() function : basic functionality /* Prototype : public mixed ReflectionFunction::getClosure() * Description: Returns a dynamically created closure for the method * Source code: ext/reflection/php_reflection.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ReflectionMethod::getClosure() : basic functionality ***\n"; diff --git a/ext/reflection/tests/ReflectionMethod_getDeclaringClass_basic.phpt b/ext/reflection/tests/ReflectionMethod_getDeclaringClass_basic.phpt index 6afc70032a..8e34d61731 100644 --- a/ext/reflection/tests/ReflectionMethod_getDeclaringClass_basic.phpt +++ b/ext/reflection/tests/ReflectionMethod_getDeclaringClass_basic.phpt @@ -17,7 +17,7 @@ var_dump($methodInfo->getDeclaringClass()); $methodInfo = new ReflectionMethod('B', 'bar'); var_dump($methodInfo->getDeclaringClass()); -?> +?> --EXPECTF-- object(ReflectionClass)#%d (1) { ["name"]=> diff --git a/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt b/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt index e79092421d..e011f259b2 100644 --- a/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt +++ b/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt @@ -26,7 +26,7 @@ class A { * My Doc Comment for A::finalStatPubf */ final static public function finalStatPubf() {} - + } diff --git a/ext/reflection/tests/ReflectionMethod_invokeArgs_error1.phpt b/ext/reflection/tests/ReflectionMethod_invokeArgs_error1.phpt index eec5a3e618..dbd128e18c 100644 --- a/ext/reflection/tests/ReflectionMethod_invokeArgs_error1.phpt +++ b/ext/reflection/tests/ReflectionMethod_invokeArgs_error1.phpt @@ -19,7 +19,7 @@ $methodWithArgs = new ReflectionMethod('TestClass', 'methodWithArgs'); $testClassInstance = new TestClass(); echo "\nMethod with args:\n"; -var_dump($methodWithArgs->invokeArgs($testClassInstance, array())); +var_dump($methodWithArgs->invokeArgs($testClassInstance, array())); ?> --EXPECTF-- diff --git a/ext/reflection/tests/ReflectionObject_FileInfo_basic.phpt b/ext/reflection/tests/ReflectionObject_FileInfo_basic.phpt index 00214dcdc5..82c68bbabe 100644 --- a/ext/reflection/tests/ReflectionObject_FileInfo_basic.phpt +++ b/ext/reflection/tests/ReflectionObject_FileInfo_basic.phpt @@ -1,6 +1,6 @@ --TEST-- ReflectionObject::getFileName(), ReflectionObject::getStartLine(), ReflectionObject::getEndLine() - basic function ---FILE-- +--FILE-- <?php $rc = new ReflectionObject(new C); var_dump($rc->getFileName()); diff --git a/ext/reflection/tests/ReflectionObject_FileInfo_error.phpt b/ext/reflection/tests/ReflectionObject_FileInfo_error.phpt index d30e677178..623ba7b480 100644 --- a/ext/reflection/tests/ReflectionObject_FileInfo_error.phpt +++ b/ext/reflection/tests/ReflectionObject_FileInfo_error.phpt @@ -1,6 +1,6 @@ --TEST-- ReflectionObject::getFileName(), ReflectionObject::getStartLine(), ReflectionObject::getEndLine() -invalid aparams ---FILE-- +--FILE-- <?php Class C { } @@ -10,7 +10,7 @@ $methods = array("getFileName", "getStartLine", "getEndLine"); foreach ($methods as $method) { var_dump($rc->$method()); var_dump($rc->$method(null)); - var_dump($rc->$method('X', 0)); + var_dump($rc->$method('X', 0)); } ?> --EXPECTF-- diff --git a/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt b/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt index 2fb43562bb..aecc9b97d2 100644 --- a/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt +++ b/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt @@ -48,7 +48,7 @@ class D1 extends C { class D2 extends C { } -$classes = array('NewCtor', 'ExtendsNewCtor', 'OldCtor', 'ExtendsOldCtor', +$classes = array('NewCtor', 'ExtendsNewCtor', 'OldCtor', 'ExtendsOldCtor', 'OldAndNewCtor', 'NewAndOldCtor', 'B', 'C', 'D1', 'D2', 'X', 'Y'); foreach ($classes as $class) { @@ -59,9 +59,9 @@ foreach ($classes as $class) { } else { echo "No constructor for $class\n"; } - -} - + +} + ?> --EXPECTF-- Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; OldCtor has a deprecated constructor in %s on line %d diff --git a/ext/reflection/tests/ReflectionObject_getName_error1.phpt b/ext/reflection/tests/ReflectionObject_getName_error1.phpt index 0d88c84398..9f50209b6b 100644 --- a/ext/reflection/tests/ReflectionObject_getName_error1.phpt +++ b/ext/reflection/tests/ReflectionObject_getName_error1.phpt @@ -3,7 +3,7 @@ ReflectionObject::getName - forbid static invocation --FILE-- <?php ReflectionObject::getName(); -?> +?> --EXPECTF-- Fatal error: Uncaught Error: Non-static method ReflectionClass::getName() cannot be called statically in %s:2 Stack trace: diff --git a/ext/reflection/tests/ReflectionObject_isInstance_basic.phpt b/ext/reflection/tests/ReflectionObject_isInstance_basic.phpt index 48778f83c2..ff310df09b 100644 --- a/ext/reflection/tests/ReflectionObject_isInstance_basic.phpt +++ b/ext/reflection/tests/ReflectionObject_isInstance_basic.phpt @@ -16,7 +16,7 @@ foreach ($classes as $class) { $ro = new ReflectionObject(new $class); foreach ($instances as $name => $instance) { echo "is $name a $class? "; - var_dump($ro->isInstance($instance)); + var_dump($ro->isInstance($instance)); } } diff --git a/ext/reflection/tests/ReflectionObject_isInstantiable_basic.phpt b/ext/reflection/tests/ReflectionObject_isInstantiable_basic.phpt index c362704b1c..982580fc56 100644 --- a/ext/reflection/tests/ReflectionObject_isInstantiable_basic.phpt +++ b/ext/reflection/tests/ReflectionObject_isInstantiable_basic.phpt @@ -27,7 +27,7 @@ $classes = array("C", "ifaceImpl", "D"); foreach($classes as $class ) { $ro = new ReflectionObject(new $class); echo "Is $class instantiable? "; - var_dump($ro->IsInstantiable()); + var_dump($ro->IsInstantiable()); } ?> --EXPECT-- diff --git a/ext/reflection/tests/ReflectionObject_isInstantiable_error.phpt b/ext/reflection/tests/ReflectionObject_isInstantiable_error.phpt index c77c039d4d..f6d4c9d3d2 100644 --- a/ext/reflection/tests/ReflectionObject_isInstantiable_error.phpt +++ b/ext/reflection/tests/ReflectionObject_isInstantiable_error.phpt @@ -6,7 +6,7 @@ class privateCtorOld { private function privateCtorOld() {} public static function reflectionObjectFactory() { return new ReflectionObject(new self); - } + } } $reflectionObject = privateCtorOld::reflectionObjectFactory(); diff --git a/ext/reflection/tests/ReflectionObject_isInstantiable_variation.phpt b/ext/reflection/tests/ReflectionObject_isInstantiable_variation.phpt index 1e5be59299..167b6b0ff3 100644 --- a/ext/reflection/tests/ReflectionObject_isInstantiable_variation.phpt +++ b/ext/reflection/tests/ReflectionObject_isInstantiable_variation.phpt @@ -6,49 +6,49 @@ ReflectionObject::IsInstantiable() - variation - constructors class noCtor { public static function reflectionObjectFactory() { return new ReflectionObject(new self); - } + } } class publicCtorNew { public function __construct() {} public static function reflectionObjectFactory() { return new ReflectionObject(new self); - } + } } class protectedCtorNew { protected function __construct() {} public static function reflectionObjectFactory() { return new ReflectionObject(new self); - } + } } class privateCtorNew { private function __construct() {} public static function reflectionObjectFactory() { return new ReflectionObject(new self); - } + } } class publicCtorOld { public function publicCtorOld() {} public static function reflectionObjectFactory() { return new ReflectionObject(new self); - } + } } class protectedCtorOld { protected function protectedCtorOld() {} public static function reflectionObjectFactory() { return new ReflectionObject(new self); - } + } } class privateCtorOld { private function privateCtorOld() {} public static function reflectionObjectFactory() { return new ReflectionObject(new self); - } + } } @@ -65,7 +65,7 @@ $reflectionObjects = array( foreach($reflectionObjects as $reflectionObject ) { $name = $reflectionObject->getName(); echo "Is $name instantiable? "; - var_dump($reflectionObject->IsInstantiable()); + var_dump($reflectionObject->IsInstantiable()); } ?> --EXPECTF-- diff --git a/ext/reflection/tests/ReflectionObject_isSubclassOf_basic.phpt b/ext/reflection/tests/ReflectionObject_isSubclassOf_basic.phpt index 59832c2d02..25c29c7534 100644 --- a/ext/reflection/tests/ReflectionObject_isSubclassOf_basic.phpt +++ b/ext/reflection/tests/ReflectionObject_isSubclassOf_basic.phpt @@ -9,7 +9,7 @@ class C extends B {} interface I {} class X implements I {} -$classNames = array('A', 'B', 'C', 'I', 'X'); +$classNames = array('A', 'B', 'C', 'I', 'X'); //Create ReflectionClasses foreach ($classNames as $className) { @@ -33,7 +33,7 @@ foreach ($ros as $childName => $child) { var_dump($child->isSubclassOf($ros[$parentName])); } echo " - Using string argument: "; - var_dump($child->isSubclassOf($parentName)); + var_dump($child->isSubclassOf($parentName)); } } ?> diff --git a/ext/reflection/tests/ReflectionParameter_001.phpt b/ext/reflection/tests/ReflectionParameter_001.phpt index dae3ac7235..71dc69ca4e 100644 --- a/ext/reflection/tests/ReflectionParameter_001.phpt +++ b/ext/reflection/tests/ReflectionParameter_001.phpt @@ -9,11 +9,11 @@ class ReflectTestClass { public static function twoArgFunction($theIncrement, $anotherParam) { return ++$theIncrement; } - + public function oneArgNonStatic($theParam) { $theParam--; } - + public function noArgs() { echo "No arg function\n"; } diff --git a/ext/reflection/tests/ReflectionParameter_002.phpt b/ext/reflection/tests/ReflectionParameter_002.phpt index 3b7df6f95b..349e6f0ca9 100644 --- a/ext/reflection/tests/ReflectionParameter_002.phpt +++ b/ext/reflection/tests/ReflectionParameter_002.phpt @@ -9,7 +9,7 @@ class ReflectTestClass { public static function staticMethod(&$paramOne, $anotherParam) { return ++$theIncrement; } - + public function instanceMethod($firstParam, &$secondParam) { $firstParam = "Hello\n"; } diff --git a/ext/reflection/tests/ReflectionParameter_003.phpt b/ext/reflection/tests/ReflectionParameter_003.phpt index f7ced9ad00..cc092bffcc 100644 --- a/ext/reflection/tests/ReflectionParameter_003.phpt +++ b/ext/reflection/tests/ReflectionParameter_003.phpt @@ -7,13 +7,13 @@ Steve Seear <stevseea@php.net> <?php class ReflectTestClass { - public static function staticMethod($paramOne, $anotherParam = "bob", + public static function staticMethod($paramOne, $anotherParam = "bob", &$thirdParam = "jack", $arrayParam = array('one')) { echo "hello from test\n"; echo "third is $thirdParam\n"; return ++$theIncrement; } - + } $jane = "jane"; @@ -36,7 +36,7 @@ foreach($refParameters as $parameter) { } else { echo "this parameter has no default value\n"; } - + /* $val = 0; try { @@ -47,7 +47,7 @@ foreach($refParameters as $parameter) { echo "\n"; } */ - + echo "\n"; } diff --git a/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt b/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt index 654a76aae0..eb6d4644a0 100644 --- a/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt +++ b/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt @@ -1,6 +1,6 @@ --TEST-- ReflectionParameter::__construct(): Invalid method as constructor ---FILE-- +--FILE-- <?php // Invalid class name diff --git a/ext/reflection/tests/ReflectionProperty_basic2.phpt b/ext/reflection/tests/ReflectionProperty_basic2.phpt index 8db0e2013f..09495f744b 100644 --- a/ext/reflection/tests/ReflectionProperty_basic2.phpt +++ b/ext/reflection/tests/ReflectionProperty_basic2.phpt @@ -35,7 +35,7 @@ reflectProperty("TestClass", "stat"); reflectProperty("TestClass", "prot"); reflectProperty("TestClass", "priv"); -?> +?> --EXPECTF-- ********************************** Reflecting on property TestClass::pub diff --git a/ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt b/ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt index 65339e308a..d744fc8995 100644 --- a/ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt +++ b/ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt @@ -5,14 +5,14 @@ ReflectionProperty::__construct(): ensure inherited private props can't be acces class C { private $p = 1; - + static function testFromC() { try { $rp = new ReflectionProperty("D", "p"); var_dump($rp); } catch (Exception $e) { echo $e->getMessage(); - } + } } } @@ -23,7 +23,7 @@ class D extends C{ var_dump($rp); } catch (Exception $e) { echo $e->getMessage(); - } + } } } diff --git a/ext/reflection/tests/ReflectionProperty_getDeclaringClass_variation1.phpt b/ext/reflection/tests/ReflectionProperty_getDeclaringClass_variation1.phpt index bf525e1c4f..c7c9366471 100644 --- a/ext/reflection/tests/ReflectionProperty_getDeclaringClass_variation1.phpt +++ b/ext/reflection/tests/ReflectionProperty_getDeclaringClass_variation1.phpt @@ -16,7 +16,7 @@ var_dump($propInfo->getDeclaringClass()); echo "Wrong number of params:\n"; $propInfo->getDeclaringClass(1); -?> +?> --EXPECTF-- object(ReflectionClass)#%d (1) { ["name"]=> diff --git a/ext/reflection/tests/ReflectionProperty_getModifiers.001.phpt b/ext/reflection/tests/ReflectionProperty_getModifiers.001.phpt index e8b9b6ed0d..e2ff294261 100644 --- a/ext/reflection/tests/ReflectionProperty_getModifiers.001.phpt +++ b/ext/reflection/tests/ReflectionProperty_getModifiers.001.phpt @@ -8,13 +8,13 @@ Steve Seear <stevseea@php.net> function reflectProperty($class, $property) { $propInfo = new ReflectionProperty($class, $property); - + echo "**********************************\n"; echo "Reflecting on property $class::$property\n\n"; - + echo "getModifiers():\n"; var_dump($propInfo->getModifiers()); - + echo "\n**********************************\n"; } diff --git a/ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt b/ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt index 22ee117cc8..2aa630d9d0 100644 --- a/ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt +++ b/ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt @@ -28,7 +28,7 @@ echo "Wrong number of params:\n"; $propInfo = new ReflectionProperty('TestClass', 'pub'); $propInfo->isDefault(1); -?> +?> --EXPECTF-- ********************************** Reflecting on property TestClass::pub diff --git a/ext/reflection/tests/bug29268.phpt b/ext/reflection/tests/bug29268.phpt index 0ab7e332b2..9166bd3aa9 100644 --- a/ext/reflection/tests/bug29268.phpt +++ b/ext/reflection/tests/bug29268.phpt @@ -13,7 +13,7 @@ class B{ } $ref = new reflectionMethod('B','doit'); -$parameters = $ref->getParameters(); +$parameters = $ref->getParameters(); foreach($parameters as $parameter) { $class = $parameter->getClass(); diff --git a/ext/reflection/tests/bug29523.phpt b/ext/reflection/tests/bug29523.phpt index e74403c6a6..fafc93ef40 100644 --- a/ext/reflection/tests/bug29523.phpt +++ b/ext/reflection/tests/bug29523.phpt @@ -11,7 +11,7 @@ function optionalTest(TestClass $a, TestClass $b, $c = 3) { } -$function = new ReflectionFunction('optionalTest'); +$function = new ReflectionFunction('optionalTest'); $numberOfNotOptionalParameters = 0; $numberOfOptionalParameters = 0; foreach($function->getParameters() as $parameter) diff --git a/ext/reflection/tests/bug36337.phpt b/ext/reflection/tests/bug36337.phpt index 369d5bef1a..ebe64431a7 100644 --- a/ext/reflection/tests/bug36337.phpt +++ b/ext/reflection/tests/bug36337.phpt @@ -23,6 +23,6 @@ $x = new myEnum(); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- bool(false) Done diff --git a/ext/reflection/tests/bug36434.phpt b/ext/reflection/tests/bug36434.phpt index 9598a40b7b..502ac741a9 100644 --- a/ext/reflection/tests/bug36434.phpt +++ b/ext/reflection/tests/bug36434.phpt @@ -26,6 +26,6 @@ foreach ($r->GetProperties() as $p) } ?> ---EXPECT-- +--EXPECT-- bar foo ancester ancester diff --git a/ext/reflection/tests/bug37964.phpt b/ext/reflection/tests/bug37964.phpt index 935119314f..f3c161da8d 100644 --- a/ext/reflection/tests/bug37964.phpt +++ b/ext/reflection/tests/bug37964.phpt @@ -5,7 +5,7 @@ Reflection Bug #37964 (Reflection shows private methods of parent class) abstract class foobar { private function test2() { - } + } } class foo extends foobar { private $foo = 1; diff --git a/ext/reflection/tests/bug38194.phpt b/ext/reflection/tests/bug38194.phpt index 1430ba45ae..dfbfb67147 100644 --- a/ext/reflection/tests/bug38194.phpt +++ b/ext/reflection/tests/bug38194.phpt @@ -3,7 +3,7 @@ Reflection Bug #38194 (ReflectionClass::isSubclassOf() returns TRUE for the clas --FILE-- <?php class ObjectOne { } - + $objectClass = new ReflectionClass('ObjectOne'); var_dump($objectClass->isSubclassOf($objectClass)); ?> diff --git a/ext/reflection/tests/bug38217.phpt b/ext/reflection/tests/bug38217.phpt index b02c8210e5..46f2dc3e0e 100644 --- a/ext/reflection/tests/bug38217.phpt +++ b/ext/reflection/tests/bug38217.phpt @@ -28,7 +28,7 @@ var_dump($class->newInstanceArgs(array('test'))); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- object(ObjectOne)#%d (0) { } Exception: Too few arguments to function ObjectTwo::__construct(), 0 passed and exactly 1 expected diff --git a/ext/reflection/tests/bug38653.phpt b/ext/reflection/tests/bug38653.phpt index 09a309e67c..64b1aad15b 100644 --- a/ext/reflection/tests/bug38653.phpt +++ b/ext/reflection/tests/bug38653.phpt @@ -20,7 +20,7 @@ var_dump($foo->getConstant("no such const")); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- int(10) string(0) "" string(4) "test" diff --git a/ext/reflection/tests/bug39001.phpt b/ext/reflection/tests/bug39001.phpt index 79d2d8352e..ec4b7a5d1b 100644 --- a/ext/reflection/tests/bug39001.phpt +++ b/ext/reflection/tests/bug39001.phpt @@ -21,7 +21,7 @@ var_dump($r->getProperty('protectedVar')->getDeclaringClass()->getName()); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(7) "CParent" string(7) "CParent" Done diff --git a/ext/reflection/tests/bug39067.phpt b/ext/reflection/tests/bug39067.phpt index 20fdb68ddd..f549f794e0 100644 --- a/ext/reflection/tests/bug39067.phpt +++ b/ext/reflection/tests/bug39067.phpt @@ -37,7 +37,7 @@ var_dump($rc->getProperty('x')->getDeclaringClass()->getName()); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(1) "C" string(1) "B" string(1) "A" diff --git a/ext/reflection/tests/bug39884.phpt b/ext/reflection/tests/bug39884.phpt index dbc57ee521..1d0e04b0b9 100644 --- a/ext/reflection/tests/bug39884.phpt +++ b/ext/reflection/tests/bug39884.phpt @@ -15,7 +15,7 @@ $test1->paramTest($test2); $refParam = new ReflectionParameter(array('stubParamTest', 'paramTest'), 'param'); var_dump($refParam->getClass()); ?> ---EXPECT-- +--EXPECT-- object(ReflectionClass)#4 (1) { ["name"]=> string(13) "stubParamTest" diff --git a/ext/reflection/tests/bug40431.phpt b/ext/reflection/tests/bug40431.phpt index 0c96e70faf..637b1457cd 100644 --- a/ext/reflection/tests/bug40431.phpt +++ b/ext/reflection/tests/bug40431.phpt @@ -76,7 +76,7 @@ var_dump($props[0]->isProtected()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- === 1st test === array(1) { [0]=> diff --git a/ext/reflection/tests/bug40794.phpt b/ext/reflection/tests/bug40794.phpt index ea3e3967ca..c1830ddcd2 100644 --- a/ext/reflection/tests/bug40794.phpt +++ b/ext/reflection/tests/bug40794.phpt @@ -20,7 +20,7 @@ var_dump($array); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(3) { ["prop1"]=> string(1) "1" diff --git a/ext/reflection/tests/bug41061.phpt b/ext/reflection/tests/bug41061.phpt index 771cd408d9..d907907dcf 100644 --- a/ext/reflection/tests/bug41061.phpt +++ b/ext/reflection/tests/bug41061.phpt @@ -5,7 +5,7 @@ Reflection Bug #41061 ("visibility error" in ReflectionFunction::export()) function foo() { } - + class bar { private function foo() { } diff --git a/ext/reflection/tests/bug41884.phpt b/ext/reflection/tests/bug41884.phpt index 31aa7c94e3..25d2b7cb74 100644 --- a/ext/reflection/tests/bug41884.phpt +++ b/ext/reflection/tests/bug41884.phpt @@ -15,7 +15,7 @@ var_dump($class->getDefaultProperties()); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(2) { ["fooStatic"]=> string(3) "foo" diff --git a/ext/reflection/tests/bug42976.phpt b/ext/reflection/tests/bug42976.phpt index 21aff8d4cc..7edf06474c 100644 --- a/ext/reflection/tests/bug42976.phpt +++ b/ext/reflection/tests/bug42976.phpt @@ -23,7 +23,7 @@ var_dump($x); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(9) "x.changed" Warning: Parameter 1 to C::__construct() expected to be a reference, value given in %sbug42976.php on line 15 diff --git a/ext/reflection/tests/bug45571.phpt b/ext/reflection/tests/bug45571.phpt index 4df542ede1..2aa5698879 100644 --- a/ext/reflection/tests/bug45571.phpt +++ b/ext/reflection/tests/bug45571.phpt @@ -7,7 +7,7 @@ Class A { static private $a = 0; static protected $b = 1; static public $c = 2; - + private function f() {} private static function sf() {} } diff --git a/ext/reflection/tests/bug45765.phpt b/ext/reflection/tests/bug45765.phpt index 7963a03eea..80cb39d0ac 100644 --- a/ext/reflection/tests/bug45765.phpt +++ b/ext/reflection/tests/bug45765.phpt @@ -9,16 +9,16 @@ class foo2 { class foo extends foo2 { const BAR = "foo's bar"; - + function test($a = self::BAR) { } - + function test2($a = parent::BAR) { } function test3($a = foo::BAR) { } - + function test4($a = foo2::BAR) { } } diff --git a/ext/reflection/tests/bug46064.phpt b/ext/reflection/tests/bug46064.phpt index 510e71b00a..d8ee411905 100644 --- a/ext/reflection/tests/bug46064.phpt +++ b/ext/reflection/tests/bug46064.phpt @@ -36,7 +36,7 @@ class bar extends test { public function __construct() { $this->foobar = 2; $this->a = 200; - + $p = new reflectionproperty($this, 'foobar'); var_dump($p->getValue($this), $p->isDefault(), $p->isPublic()); } diff --git a/ext/reflection/tests/bug46064_2.phpt b/ext/reflection/tests/bug46064_2.phpt index 0b74708dff..6ac72bbd27 100644 --- a/ext/reflection/tests/bug46064_2.phpt +++ b/ext/reflection/tests/bug46064_2.phpt @@ -3,7 +3,7 @@ Bug #46064.2 (Exception when creating ReflectionProperty object on dynamicly cre --FILE-- <?php -class foo { +class foo { } $x = new foo; @@ -25,7 +25,7 @@ class test extends bar { public function __construct() { parent::__construct(); - + $p = new reflectionobject($this); var_dump($h = $p->getProperty('a')); var_dump($h->isDefault(), $h->isProtected(), $h->isPrivate(), $h->isPublic(), $h->isStatic()); diff --git a/ext/reflection/tests/bug47254.phpt b/ext/reflection/tests/bug47254.phpt index 38cdcd62b4..e3ce114c9c 100644 --- a/ext/reflection/tests/bug47254.phpt +++ b/ext/reflection/tests/bug47254.phpt @@ -9,7 +9,7 @@ Testfest 2009 Munich class A { protected function a() {} - + } class B extends A diff --git a/ext/reflection/tests/bug49719.phpt b/ext/reflection/tests/bug49719.phpt index b62e1b2ec5..6211b6b543 100644 --- a/ext/reflection/tests/bug49719.phpt +++ b/ext/reflection/tests/bug49719.phpt @@ -13,10 +13,10 @@ class B extends A { try { $b = new B; $ref = new ReflectionClass($b); - + var_dump(property_exists('b', 'a')); var_dump(property_exists($b, 'a')); - var_dump($ref->hasProperty('a')); + var_dump($ref->hasProperty('a')); var_dump($ref->getProperty('a')); } catch (Exception $e) { var_dump($e->getMessage()); diff --git a/ext/reflection/tests/bug71767.phpt b/ext/reflection/tests/bug71767.phpt index ed83e486d8..c20073c67a 100644 --- a/ext/reflection/tests/bug71767.phpt +++ b/ext/reflection/tests/bug71767.phpt @@ -16,7 +16,7 @@ class Foo { /** wrong docblock */ $arg ) { - + } } diff --git a/ext/reflection/tests/bug72174.phpt b/ext/reflection/tests/bug72174.phpt index 94416d6153..dacfc0e55e 100644 --- a/ext/reflection/tests/bug72174.phpt +++ b/ext/reflection/tests/bug72174.phpt @@ -17,7 +17,7 @@ class Foo var_dump(__METHOD__); return true; } - + public function __get($name) { var_dump(__METHOD__); diff --git a/ext/reflection/tests/bug72661.phpt b/ext/reflection/tests/bug72661.phpt index 40d14922b8..b1cb764beb 100644 --- a/ext/reflection/tests/bug72661.phpt +++ b/ext/reflection/tests/bug72661.phpt @@ -2,7 +2,7 @@ Bug #72661 (ReflectionType::__toString crashes with iterable) --FILE-- <?php -function test(iterable $arg) { } +function test(iterable $arg) { } var_dump((string)(new ReflectionParameter("test", 0))->getType()); ?> diff --git a/ext/reflection/tests/bug74949.phpt b/ext/reflection/tests/bug74949.phpt index d69597efb8..2970c5911f 100644 --- a/ext/reflection/tests/bug74949.phpt +++ b/ext/reflection/tests/bug74949.phpt @@ -14,7 +14,7 @@ echo $r, "\n"; try { echo $r->getPrototype(); } catch (Exception $e) { - echo $e->getMessage(), "\n"; + echo $e->getMessage(), "\n"; } ?> --EXPECT-- diff --git a/ext/reflection/tests/closures_001.phpt b/ext/reflection/tests/closures_001.phpt index c79f20f79c..57c1b4e3f6 100644 --- a/ext/reflection/tests/closures_001.phpt +++ b/ext/reflection/tests/closures_001.phpt @@ -1,6 +1,6 @@ --TEST-- Reflection on closures ---FILE-- +--FILE-- <?php $closure = function($a, $b = 0) { }; diff --git a/ext/reflection/tests/closures_002.phpt b/ext/reflection/tests/closures_002.phpt index 65eb5c86f7..ed973b56c1 100644 --- a/ext/reflection/tests/closures_002.phpt +++ b/ext/reflection/tests/closures_002.phpt @@ -1,6 +1,6 @@ --TEST-- Reflection on invokable objects ---FILE-- +--FILE-- <?php class Test { diff --git a/ext/reflection/tests/closures_003.phpt b/ext/reflection/tests/closures_003.phpt index 6e8dc71fcb..57245cacde 100644 --- a/ext/reflection/tests/closures_003.phpt +++ b/ext/reflection/tests/closures_003.phpt @@ -1,6 +1,6 @@ --TEST-- Reflection on closures: Segfaults with getParameters() and getDeclaringFunction() ---FILE-- +--FILE-- <?php $closure = function($a, $b = 0) { }; diff --git a/ext/reflection/tests/closures_003_v1.phpt b/ext/reflection/tests/closures_003_v1.phpt index c67d9571e1..cf853a00fd 100644 --- a/ext/reflection/tests/closures_003_v1.phpt +++ b/ext/reflection/tests/closures_003_v1.phpt @@ -1,6 +1,6 @@ --TEST-- Reflection on closures: Segfaults with getParameters() and getDeclaringFunction() ---FILE-- +--FILE-- <?php $closure = function($a, $b = 0) { }; diff --git a/ext/reflection/tests/closures_004.phpt b/ext/reflection/tests/closures_004.phpt index a09447bc05..e2b52c5429 100644 --- a/ext/reflection/tests/closures_004.phpt +++ b/ext/reflection/tests/closures_004.phpt @@ -1,6 +1,6 @@ --TEST-- Reflection on closures: Segfault with getClosure() on closure itself ---FILE-- +--FILE-- <?php $closure = function() { echo "Invoked!\n"; }; diff --git a/ext/reflection/tests/property_exists.phpt b/ext/reflection/tests/property_exists.phpt index c74b775bb7..d7ecefb775 100644 --- a/ext/reflection/tests/property_exists.phpt +++ b/ext/reflection/tests/property_exists.phpt @@ -8,15 +8,15 @@ class A public $a = 1; protected $b = 2; private $c = 3; - + public $empty; public $init = 1; - + function __toString() { return 'obj(' . get_class($this) . ')'; } - + static function test($oc, $props) { echo '===' . __CLASS__ . "===\n"; @@ -30,7 +30,7 @@ class A class B extends A { private $c = 4; - + static function test($oc, $props) { echo '===' . __CLASS__ . "===\n"; @@ -44,7 +44,7 @@ class B extends A class C extends B { private $d = 5; - + static function test($oc, $props) { echo '===' . __CLASS__ . "===\n"; diff --git a/ext/reflection/tests/static_properties_002.phpt b/ext/reflection/tests/static_properties_002.phpt index 204c5e0e15..0e3baa9530 100644 --- a/ext/reflection/tests/static_properties_002.phpt +++ b/ext/reflection/tests/static_properties_002.phpt @@ -5,11 +5,11 @@ Reflection and inheriting static properties class base { static protected $prop = 2; - + static function show() { echo __METHOD__ . '(' . self::$prop . ")\n"; } - + static function inc() { base::$prop++; echo __METHOD__ . "()\n"; @@ -18,7 +18,7 @@ class base { class derived extends base { static public $prop = 2; - + static function show() { echo __METHOD__ . '(' . self::$prop . ")\n"; } diff --git a/ext/reflection/tests/traits002.phpt b/ext/reflection/tests/traits002.phpt index b55b288aa0..3a4b294961 100644 --- a/ext/reflection/tests/traits002.phpt +++ b/ext/reflection/tests/traits002.phpt @@ -7,7 +7,7 @@ abstract class foo { } trait bar { - + } reflectionclass::export('foo'); diff --git a/ext/reflection/tests/traits003.phpt b/ext/reflection/tests/traits003.phpt index c569a8e723..7f87859908 100644 --- a/ext/reflection/tests/traits003.phpt +++ b/ext/reflection/tests/traits003.phpt @@ -7,11 +7,11 @@ abstract class foo { } trait bar { - + } final class baz { - + } $x = new ReflectionClass('foo'); diff --git a/ext/session/tests/006.phpt b/ext/session/tests/006.phpt index c38987edff..68cea7314a 100644 --- a/ext/session/tests/006.phpt +++ b/ext/session/tests/006.phpt @@ -26,7 +26,7 @@ class b { $this->a = &$a; } } - + $a = new a(); $b = new b($a); diff --git a/ext/session/tests/026.phpt b/ext/session/tests/026.phpt index cc9a8de22c..b61039ee0c 100644 --- a/ext/session/tests/026.phpt +++ b/ext/session/tests/026.phpt @@ -19,14 +19,14 @@ session_start(); class a { public $test = "hallo"; } - + class b { public $a; function __construct(&$a) { $this->a = &$a; } } - + $a = new a(); $b = new b($a); diff --git a/ext/session/tests/bug24592.phpt b/ext/session/tests/bug24592.phpt index 9f6c395317..3e651cdeec 100644 --- a/ext/session/tests/bug24592.phpt +++ b/ext/session/tests/bug24592.phpt @@ -8,15 +8,15 @@ session.save_handler=files --FILE-- <?php @session_start(); - + $foo = $_SESSION['foo']; $bar = $_SESSION['bar']; - + var_dump($foo, $bar, $_SESSION); $_SESSION['foo'] = $foo; $_SESSION['bar'] = $bar; - + var_dump($_SESSION); ?> --EXPECTF-- diff --git a/ext/session/tests/bug31454.phpt b/ext/session/tests/bug31454.phpt index dd60996214..89b7048477 100644 --- a/ext/session/tests/bug31454.phpt +++ b/ext/session/tests/bug31454.phpt @@ -12,7 +12,7 @@ session_set_save_handler( array(&$arf, 'write'), array(&$arf, 'destroy'), array(&$arf, 'gc')); - + echo "Done\n"; ?> --EXPECTF-- diff --git a/ext/session/tests/bug61728.phpt b/ext/session/tests/bug61728.phpt index b0ed3a1a17..ceabd3ad83 100644 --- a/ext/session/tests/bug61728.phpt +++ b/ext/session/tests/bug61728.phpt @@ -3,7 +3,7 @@ Bug #61728 (PHP crash when calling ob_start in request_shutdown phase) --SKIPIF-- <?php include('skipif.inc'); ?> --FILE-- -<?php +<?php function output_html($ext) { return strlen($ext); } diff --git a/ext/session/tests/rfc1867_invalid_settings.phpt b/ext/session/tests/rfc1867_invalid_settings.phpt index 1a989e979b..526e0cbdd8 100644 --- a/ext/session/tests/rfc1867_invalid_settings.phpt +++ b/ext/session/tests/rfc1867_invalid_settings.phpt @@ -4,7 +4,7 @@ session rfc1867 invalid settings session.upload_progress.freq=-1 error_log= --SKIPIF-- -<?php +<?php include('skipif.inc'); ?> --FILE-- diff --git a/ext/session/tests/rfc1867_invalid_settings_2.phpt b/ext/session/tests/rfc1867_invalid_settings_2.phpt index 9246e1dbbc..15281942a0 100644 --- a/ext/session/tests/rfc1867_invalid_settings_2.phpt +++ b/ext/session/tests/rfc1867_invalid_settings_2.phpt @@ -4,7 +4,7 @@ session rfc1867 invalid settings 2 session.upload_progress.freq=200% error_log= --SKIPIF-- -<?php +<?php include('skipif.inc'); ?> --FILE-- diff --git a/ext/session/tests/session_cache_expire_basic.phpt b/ext/session/tests/session_cache_expire_basic.phpt index 6da766cd86..e6e274e03c 100644 --- a/ext/session/tests/session_cache_expire_basic.phpt +++ b/ext/session/tests/session_cache_expire_basic.phpt @@ -7,7 +7,7 @@ Test session_cache_expire() function : basic functionality ob_start(); -/* +/* * Prototype : int session_cache_expire([int $new_cache_expire]) * Description : Return current cache expire * Source code : ext/session/session.c diff --git a/ext/session/tests/session_cache_expire_error.phpt b/ext/session/tests/session_cache_expire_error.phpt index 486ba787e5..19324e2c5b 100644 --- a/ext/session/tests/session_cache_expire_error.phpt +++ b/ext/session/tests/session_cache_expire_error.phpt @@ -7,7 +7,7 @@ Test session_cache_expire() function : error functionality ob_start(); -/* +/* * Prototype : int session_cache_expire([int $new_cache_expire]) * Description : Return current cache expire * Source code : ext/session/session.c @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // Empty strings /*16*/ "", '', @@ -66,7 +66,7 @@ $inputs = array( /*18*/ "Nothing", 'Nothing', $heredoc, - + // Object data /*21*/ new classA(), diff --git a/ext/session/tests/session_cache_expire_variation1.phpt b/ext/session/tests/session_cache_expire_variation1.phpt index 8c5f2692ee..78e101bb0e 100644 --- a/ext/session/tests/session_cache_expire_variation1.phpt +++ b/ext/session/tests/session_cache_expire_variation1.phpt @@ -9,7 +9,7 @@ session.cache_expire=360 ob_start(); -/* +/* * Prototype : int session_cache_expire([int $new_cache_expire]) * Description : Return current cache expire * Source code : ext/session/session.c diff --git a/ext/session/tests/session_cache_expire_variation2.phpt b/ext/session/tests/session_cache_expire_variation2.phpt index 20835e6365..4f827f1207 100644 --- a/ext/session/tests/session_cache_expire_variation2.phpt +++ b/ext/session/tests/session_cache_expire_variation2.phpt @@ -7,7 +7,7 @@ Test session_cache_expire() function : variation ob_start(); -/* +/* * Prototype : int session_cache_expire([int $new_cache_expire]) * Description : Return current cache expire * Source code : ext/session/session.c diff --git a/ext/session/tests/session_cache_expire_variation3.phpt b/ext/session/tests/session_cache_expire_variation3.phpt index 8e107956d4..04649a13bc 100644 --- a/ext/session/tests/session_cache_expire_variation3.phpt +++ b/ext/session/tests/session_cache_expire_variation3.phpt @@ -7,7 +7,7 @@ Test session_cache_expire() function : variation ob_start(); -/* +/* * Prototype : int session_cache_expire([int $new_cache_expire]) * Description : Return current cache expire * Source code : ext/session/session.c diff --git a/ext/session/tests/session_cache_limiter_basic.phpt b/ext/session/tests/session_cache_limiter_basic.phpt index bfc2f68427..121a634c59 100644 --- a/ext/session/tests/session_cache_limiter_basic.phpt +++ b/ext/session/tests/session_cache_limiter_basic.phpt @@ -7,7 +7,7 @@ Test session_cache_limiter() function : basic functionality ob_start(); -/* +/* * Prototype : string session_cache_limiter([string $cache_limiter]) * Description : Get and/or set the current cache limiter * Source code : ext/session/session.c diff --git a/ext/session/tests/session_cache_limiter_error.phpt b/ext/session/tests/session_cache_limiter_error.phpt index df689d65fb..f2805b9eab 100644 --- a/ext/session/tests/session_cache_limiter_error.phpt +++ b/ext/session/tests/session_cache_limiter_error.phpt @@ -7,7 +7,7 @@ Test session_cache_limiter() function : error functionality ob_start(); -/* +/* * Prototype : string session_cache_limiter([string $cache_limiter]) * Description : Get and/or set the current cache limiter * Source code : ext/session/session.c @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // Empty strings /*16*/ "", '', @@ -66,7 +66,7 @@ $inputs = array( /*18*/ "Nothing", 'Nothing', $heredoc, - + // Object data /*21*/ new classA(), diff --git a/ext/session/tests/session_cache_limiter_variation1.phpt b/ext/session/tests/session_cache_limiter_variation1.phpt index 5af208a909..892383a4fd 100644 --- a/ext/session/tests/session_cache_limiter_variation1.phpt +++ b/ext/session/tests/session_cache_limiter_variation1.phpt @@ -9,7 +9,7 @@ session.cache_limiter=nocache ob_start(); -/* +/* * Prototype : string session_cache_limiter([string $cache_limiter]) * Description : Get and/or set the current cache limiter * Source code : ext/session/session.c diff --git a/ext/session/tests/session_cache_limiter_variation2.phpt b/ext/session/tests/session_cache_limiter_variation2.phpt index eb63d99dac..64cc20c184 100644 --- a/ext/session/tests/session_cache_limiter_variation2.phpt +++ b/ext/session/tests/session_cache_limiter_variation2.phpt @@ -7,7 +7,7 @@ Test session_cache_limiter() function : variation ob_start(); -/* +/* * Prototype : string session_cache_limiter([string $cache_limiter]) * Description : Get and/or set the current cache limiter * Source code : ext/session/session.c diff --git a/ext/session/tests/session_cache_limiter_variation3.phpt b/ext/session/tests/session_cache_limiter_variation3.phpt index 11d452d46a..65c6b26699 100644 --- a/ext/session/tests/session_cache_limiter_variation3.phpt +++ b/ext/session/tests/session_cache_limiter_variation3.phpt @@ -7,7 +7,7 @@ Test session_cache_limiter() function : variation ob_start(); -/* +/* * Prototype : string session_cache_limiter([string $cache_limiter]) * Description : Get and/or set the current cache limiter * Source code : ext/session/session.c diff --git a/ext/session/tests/session_commit_basic.phpt b/ext/session/tests/session_commit_basic.phpt index f032ad469e..4e4fde0b88 100644 --- a/ext/session/tests/session_commit_basic.phpt +++ b/ext/session/tests/session_commit_basic.phpt @@ -7,7 +7,7 @@ Test session_commit() function : basic functionality ob_start(); -/* +/* * Prototype : bool session_commit(void) * Description : Write session data and end session * Source code : ext/session/session.c diff --git a/ext/session/tests/session_commit_error.phpt b/ext/session/tests/session_commit_error.phpt index 79fa72e67b..a035332dff 100644 --- a/ext/session/tests/session_commit_error.phpt +++ b/ext/session/tests/session_commit_error.phpt @@ -7,7 +7,7 @@ Test session_commit() function : error functionality ob_start(); -/* +/* * Prototype : bool session_commit(void) * Description : Write session data and end session * Source code : ext/session/session.c @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // Empty strings /*16*/ "", '', @@ -66,7 +66,7 @@ $inputs = array( /*18*/ "Nothing", 'Nothing', $heredoc, - + // Object data /*21*/ new classA(), diff --git a/ext/session/tests/session_commit_variation1.phpt b/ext/session/tests/session_commit_variation1.phpt index ab045e00fa..0cdcc27983 100644 --- a/ext/session/tests/session_commit_variation1.phpt +++ b/ext/session/tests/session_commit_variation1.phpt @@ -7,7 +7,7 @@ Test session_commit() function : variation ob_start(); -/* +/* * Prototype : bool session_commit(void) * Description : Write session data and end session * Source code : ext/session/session.c diff --git a/ext/session/tests/session_commit_variation2.phpt b/ext/session/tests/session_commit_variation2.phpt index 4d1107281e..4bc0c62395 100644 --- a/ext/session/tests/session_commit_variation2.phpt +++ b/ext/session/tests/session_commit_variation2.phpt @@ -7,7 +7,7 @@ Test session_commit() function : variation ob_start(); -/* +/* * Prototype : bool session_commit(void) * Description : Write session data and end session * Source code : ext/session/session.c diff --git a/ext/session/tests/session_commit_variation3.phpt b/ext/session/tests/session_commit_variation3.phpt index 9442faf238..8d9db6c94c 100644 --- a/ext/session/tests/session_commit_variation3.phpt +++ b/ext/session/tests/session_commit_variation3.phpt @@ -9,7 +9,7 @@ session.auto_start=1 ob_start(); -/* +/* * Prototype : bool session_commit(void) * Description : Write session data and end session * Source code : ext/session/session.c diff --git a/ext/session/tests/session_decode_basic.phpt b/ext/session/tests/session_decode_basic.phpt index 07144aa4f5..dfffe74877 100644 --- a/ext/session/tests/session_decode_basic.phpt +++ b/ext/session/tests/session_decode_basic.phpt @@ -7,7 +7,7 @@ Test session_decode() function : basic functionality ob_start(); -/* +/* * Prototype : string session_decode(void) * Description : Decodes session data from a string * Source code : ext/session/session.c @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // Empty strings /*16*/ "", '', @@ -66,7 +66,7 @@ $inputs = array( /*18*/ "Nothing", 'Nothing', $heredoc, - + // Object data /*21*/ new classA(), diff --git a/ext/session/tests/session_decode_basic_serialize.phpt b/ext/session/tests/session_decode_basic_serialize.phpt index 9afb0a38e0..59ebe5d419 100644 --- a/ext/session/tests/session_decode_basic_serialize.phpt +++ b/ext/session/tests/session_decode_basic_serialize.phpt @@ -7,7 +7,7 @@ Test session_decode() function : basic functionality ob_start(); -/* +/* * Prototype : string session_decode(void) * Description : Decodes session data from a string * Source code : ext/session/session.c @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // Empty strings /*16*/ "", '', @@ -66,7 +66,7 @@ $inputs = array( /*18*/ "Nothing", 'Nothing', $heredoc, - + // Object data /*21*/ new classA(), diff --git a/ext/session/tests/session_decode_error.phpt b/ext/session/tests/session_decode_error.phpt index 098ecce079..b6d45063a1 100644 --- a/ext/session/tests/session_decode_error.phpt +++ b/ext/session/tests/session_decode_error.phpt @@ -7,7 +7,7 @@ Test session_decode() function : error functionality ob_start(); -/* +/* * Prototype : string session_decode(void) * Description : Decodes session data from a string * Source code : ext/session/session.c @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // Empty strings /*16*/ "", '', @@ -66,7 +66,7 @@ $inputs = array( /*18*/ "Nothing", 'Nothing', $heredoc, - + // Object data /*21*/ new classA(), diff --git a/ext/session/tests/session_decode_error2.phpt b/ext/session/tests/session_decode_error2.phpt index 37841deed8..3631613efc 100644 --- a/ext/session/tests/session_decode_error2.phpt +++ b/ext/session/tests/session_decode_error2.phpt @@ -7,7 +7,7 @@ Test session_decode() function : error functionality ob_start(); -/* +/* * Prototype : string session_decode(void) * Description : Decodes session data from a string * Source code : ext/session/session.c diff --git a/ext/session/tests/session_decode_variation1.phpt b/ext/session/tests/session_decode_variation1.phpt index dc37e089dc..94c5bf873e 100644 --- a/ext/session/tests/session_decode_variation1.phpt +++ b/ext/session/tests/session_decode_variation1.phpt @@ -7,7 +7,7 @@ Test session_decode() function : variation ob_start(); -/* +/* * Prototype : string session_decode(void) * Description : Decodes session data from a string * Source code : ext/session/session.c diff --git a/ext/session/tests/session_decode_variation2.phpt b/ext/session/tests/session_decode_variation2.phpt index 8343ab9c94..6e48331059 100644 --- a/ext/session/tests/session_decode_variation2.phpt +++ b/ext/session/tests/session_decode_variation2.phpt @@ -7,7 +7,7 @@ Test session_decode() function : basic functionality ob_start(); -/* +/* * Prototype : string session_decode(void) * Description : Decodes session data from a string * Source code : ext/session/session.c diff --git a/ext/session/tests/session_decode_variation3.phpt b/ext/session/tests/session_decode_variation3.phpt index 3557efa46d..7322dc0762 100644 --- a/ext/session/tests/session_decode_variation3.phpt +++ b/ext/session/tests/session_decode_variation3.phpt @@ -9,7 +9,7 @@ session.serialize_handler=blah ob_start(); -/* +/* * Prototype : string session_decode(void) * Description : Decodes session data from a string * Source code : ext/session/session.c diff --git a/ext/session/tests/session_decode_variation4.phpt b/ext/session/tests/session_decode_variation4.phpt index ee9f892bf0..48247d92f5 100644 --- a/ext/session/tests/session_decode_variation4.phpt +++ b/ext/session/tests/session_decode_variation4.phpt @@ -7,7 +7,7 @@ Test session_decode() function : variation ob_start(); -/* +/* * Prototype : string session_decode(void) * Description : Decodes session data from a string * Source code : ext/session/session.c diff --git a/ext/session/tests/session_destroy_error.phpt b/ext/session/tests/session_destroy_error.phpt index a3e443e9d8..ad50593bc3 100644 --- a/ext/session/tests/session_destroy_error.phpt +++ b/ext/session/tests/session_destroy_error.phpt @@ -7,7 +7,7 @@ Test session_destroy() function : error functionality ob_start(); -/* +/* * Prototype : bool session_destroy(void) * Description : Destroys all data registered to a session * Source code : ext/session/session.c @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // Empty strings /*16*/ "", '', @@ -66,7 +66,7 @@ $inputs = array( /*18*/ "Nothing", 'Nothing', $heredoc, - + // Object data /*21*/ new classA(), diff --git a/ext/session/tests/session_destroy_variation1.phpt b/ext/session/tests/session_destroy_variation1.phpt index fdbdf08c57..aa4a932662 100644 --- a/ext/session/tests/session_destroy_variation1.phpt +++ b/ext/session/tests/session_destroy_variation1.phpt @@ -7,7 +7,7 @@ Test session_destroy() function : variation ob_start(); -/* +/* * Prototype : bool session_destroy(void) * Description : Destroys all data registered to a session * Source code : ext/session/session.c diff --git a/ext/session/tests/session_destroy_variation2.phpt b/ext/session/tests/session_destroy_variation2.phpt index 40f49a46a4..0a11ea2caf 100644 --- a/ext/session/tests/session_destroy_variation2.phpt +++ b/ext/session/tests/session_destroy_variation2.phpt @@ -7,7 +7,7 @@ Test session_destroy() function : variation ob_start(); -/* +/* * Prototype : bool session_destroy(void) * Description : Destroys all data registered to a session * Source code : ext/session/session.c diff --git a/ext/session/tests/session_destroy_variation3.phpt b/ext/session/tests/session_destroy_variation3.phpt index b63c17e392..4593385401 100644 --- a/ext/session/tests/session_destroy_variation3.phpt +++ b/ext/session/tests/session_destroy_variation3.phpt @@ -7,7 +7,7 @@ Test session_destroy() function : variation ob_start(); -/* +/* * Prototype : bool session_destroy(void) * Description : Destroys all data registered to a session * Source code : ext/session/session.c diff --git a/ext/session/tests/session_encode_basic.phpt b/ext/session/tests/session_encode_basic.phpt index dfe40d204d..63ed1937ac 100644 --- a/ext/session/tests/session_encode_basic.phpt +++ b/ext/session/tests/session_encode_basic.phpt @@ -9,7 +9,7 @@ serialize_precision=100 ob_start(); -/* +/* * Prototype : string session_encode(void) * Description : Encodes the current session data as a string * Source code : ext/session/session.c @@ -59,7 +59,7 @@ $inputs = array( false, TRUE, FALSE, - + // Empty strings /*16*/ "", '', @@ -68,7 +68,7 @@ $inputs = array( /*18*/ "Nothing", 'Nothing', $heredoc, - + // Object data /*21*/ new classA(), diff --git a/ext/session/tests/session_encode_error.phpt b/ext/session/tests/session_encode_error.phpt index 955aff4d53..6bf72d6237 100644 --- a/ext/session/tests/session_encode_error.phpt +++ b/ext/session/tests/session_encode_error.phpt @@ -7,7 +7,7 @@ Test session_encode() function : basic functionality ob_start(); -/* +/* * Prototype : string session_encode(void) * Description : Encodes the current session data as a string * Source code : ext/session/session.c @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // Empty strings /*16*/ "", '', @@ -66,7 +66,7 @@ $inputs = array( /*18*/ "Nothing", 'Nothing', $heredoc, - + // Object data /*21*/ new classA(), diff --git a/ext/session/tests/session_encode_error2.phpt b/ext/session/tests/session_encode_error2.phpt index 056323ab76..17666aedda 100644 --- a/ext/session/tests/session_encode_error2.phpt +++ b/ext/session/tests/session_encode_error2.phpt @@ -7,7 +7,7 @@ Test session_encode() function : error functionality ob_start(); -/* +/* * Prototype : string session_encode(void) * Description : Encodes the current session data as a string * Source code : ext/session/session.c @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // Empty strings /*16*/ "", '', @@ -66,7 +66,7 @@ $inputs = array( /*18*/ "Nothing", 'Nothing', $heredoc, - + // Object data /*21*/ new classA(), diff --git a/ext/session/tests/session_encode_variation1.phpt b/ext/session/tests/session_encode_variation1.phpt index 26722783db..71b520e0ba 100644 --- a/ext/session/tests/session_encode_variation1.phpt +++ b/ext/session/tests/session_encode_variation1.phpt @@ -7,7 +7,7 @@ Test session_encode() function : variation ob_start(); -/* +/* * Prototype : string session_encode(void) * Description : Encodes the current session data as a string * Source code : ext/session/session.c diff --git a/ext/session/tests/session_encode_variation2.phpt b/ext/session/tests/session_encode_variation2.phpt index 93fab30d67..34e1a5cfa6 100644 --- a/ext/session/tests/session_encode_variation2.phpt +++ b/ext/session/tests/session_encode_variation2.phpt @@ -9,7 +9,7 @@ session.auto_start=1 ob_start(); -/* +/* * Prototype : string session_encode(void) * Description : Encodes the current session data as a string * Source code : ext/session/session.c diff --git a/ext/session/tests/session_encode_variation3.phpt b/ext/session/tests/session_encode_variation3.phpt index 3cdbbfe707..353fd7b205 100644 --- a/ext/session/tests/session_encode_variation3.phpt +++ b/ext/session/tests/session_encode_variation3.phpt @@ -7,7 +7,7 @@ Test session_encode() function : variation ob_start(); -/* +/* * Prototype : string session_encode(void) * Description : Encodes the current session data as a string * Source code : ext/session/session.c diff --git a/ext/session/tests/session_encode_variation4.phpt b/ext/session/tests/session_encode_variation4.phpt index bf6b0307d8..4a818d71d1 100644 --- a/ext/session/tests/session_encode_variation4.phpt +++ b/ext/session/tests/session_encode_variation4.phpt @@ -7,7 +7,7 @@ Test session_encode() function : variation ob_start(); -/* +/* * Prototype : string session_encode(void) * Description : Encodes the current session data as a string * Source code : ext/session/session.c diff --git a/ext/session/tests/session_encode_variation5.phpt b/ext/session/tests/session_encode_variation5.phpt index b4854552aa..0134081694 100644 --- a/ext/session/tests/session_encode_variation5.phpt +++ b/ext/session/tests/session_encode_variation5.phpt @@ -7,7 +7,7 @@ Test session_encode() function : variation ob_start(); -/* +/* * Prototype : string session_encode(void) * Description : Encodes the current session data as a string * Source code : ext/session/session.c diff --git a/ext/session/tests/session_encode_variation6.phpt b/ext/session/tests/session_encode_variation6.phpt index c5f1f4bbc3..e99d1b5a49 100644 --- a/ext/session/tests/session_encode_variation6.phpt +++ b/ext/session/tests/session_encode_variation6.phpt @@ -7,7 +7,7 @@ Test session_encode() function : variation ob_start(); -/* +/* * Prototype : string session_encode(void) * Description : Encodes the current session data as a string * Source code : ext/session/session.c diff --git a/ext/session/tests/session_encode_variation7.phpt b/ext/session/tests/session_encode_variation7.phpt index a7ffb364be..6c592165b8 100644 --- a/ext/session/tests/session_encode_variation7.phpt +++ b/ext/session/tests/session_encode_variation7.phpt @@ -9,7 +9,7 @@ session.serialize_handler=php_binary ob_start(); -/* +/* * Prototype : string session_encode(void) * Description : Encodes the current session data as a string * Source code : ext/session/session.c diff --git a/ext/session/tests/session_encode_variation8.phpt b/ext/session/tests/session_encode_variation8.phpt index 7ffa948620..1a93ae92f2 100644 --- a/ext/session/tests/session_encode_variation8.phpt +++ b/ext/session/tests/session_encode_variation8.phpt @@ -9,7 +9,7 @@ session.serialize_handler=blah ob_start(); -/* +/* * Prototype : string session_encode(void) * Description : Encodes the current session data as a string * Source code : ext/session/session.c diff --git a/ext/session/tests/session_get_cookie_params_basic.phpt b/ext/session/tests/session_get_cookie_params_basic.phpt index 6188e06e6d..9af2103d7c 100644 --- a/ext/session/tests/session_get_cookie_params_basic.phpt +++ b/ext/session/tests/session_get_cookie_params_basic.phpt @@ -14,7 +14,7 @@ session.cookie_samesite="" ob_start(); -/* +/* * Prototype : array session_get_cookie_params(void) * Description : Get the session cookie parameters * Source code : ext/session/session.c diff --git a/ext/session/tests/session_get_cookie_params_error.phpt b/ext/session/tests/session_get_cookie_params_error.phpt index 243536c39e..56c4a220cd 100644 --- a/ext/session/tests/session_get_cookie_params_error.phpt +++ b/ext/session/tests/session_get_cookie_params_error.phpt @@ -7,7 +7,7 @@ Test session_get_cookie_params() function : error functionality ob_start(); -/* +/* * Prototype : array session_get_cookie_params(void) * Description : Get the session cookie parameters * Source code : ext/session/session.c @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // Empty strings /*16*/ "", '', @@ -66,7 +66,7 @@ $inputs = array( /*18*/ "Nothing", 'Nothing', $heredoc, - + // Object data /*21*/ new classA(), diff --git a/ext/session/tests/session_get_cookie_params_variation1.phpt b/ext/session/tests/session_get_cookie_params_variation1.phpt index f7fd60deae..d4c35e20b0 100644 --- a/ext/session/tests/session_get_cookie_params_variation1.phpt +++ b/ext/session/tests/session_get_cookie_params_variation1.phpt @@ -14,7 +14,7 @@ session.cookie_samesite="" ob_start(); -/* +/* * Prototype : array session_get_cookie_params(void) * Description : Get the session cookie parameters * Source code : ext/session/session.c diff --git a/ext/session/tests/session_id_basic.phpt b/ext/session/tests/session_id_basic.phpt index 32a9679e20..55cbf2c97f 100644 --- a/ext/session/tests/session_id_basic.phpt +++ b/ext/session/tests/session_id_basic.phpt @@ -7,7 +7,7 @@ Test session_id() function : basic functionality ob_start(); -/* +/* * Prototype : string session_id([string $id]) * Description : Get and/or set the current session id * Source code : ext/session/session.c diff --git a/ext/session/tests/session_id_basic2.phpt b/ext/session/tests/session_id_basic2.phpt index fd26c0e9ed..bc38f4035d 100644 --- a/ext/session/tests/session_id_basic2.phpt +++ b/ext/session/tests/session_id_basic2.phpt @@ -7,7 +7,7 @@ Test session_id() function : basic functionality ob_start(); -/* +/* * Prototype : string session_id([string $id]) * Description : Get and/or set the current session id * Source code : ext/session/session.c diff --git a/ext/session/tests/session_id_error.phpt b/ext/session/tests/session_id_error.phpt index 6337cb916d..83b0737eab 100644 --- a/ext/session/tests/session_id_error.phpt +++ b/ext/session/tests/session_id_error.phpt @@ -7,7 +7,7 @@ Test session_id() function : error functionality ob_start(); -/* +/* * Prototype : string session_id([string $id]) * Description : Get and/or set the current session id * Source code : ext/session/session.c @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // Empty strings /*16*/ "", '', @@ -66,7 +66,7 @@ $inputs = array( /*18*/ "Nothing", 'Nothing', $heredoc, - + // Object data /*21*/ new classA(), diff --git a/ext/session/tests/session_id_error3.phpt b/ext/session/tests/session_id_error3.phpt index aeb0fe38a0..a3d17504b4 100644 --- a/ext/session/tests/session_id_error3.phpt +++ b/ext/session/tests/session_id_error3.phpt @@ -7,10 +7,10 @@ Test session_id() function : error functionality ob_start(); -/* +/* * Prototype : string session_id([string $id]) * Description : Get and/or set the current session id - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_id() : error functionality ***\n"; diff --git a/ext/session/tests/session_module_name_basic.phpt b/ext/session/tests/session_module_name_basic.phpt index 2daf6fc620..2695eb6230 100644 --- a/ext/session/tests/session_module_name_basic.phpt +++ b/ext/session/tests/session_module_name_basic.phpt @@ -7,7 +7,7 @@ Test session_module_name() function : basic functionality ob_start(); -/* +/* * Prototype : string session_module_name([string $module]) * Description : Get and/or set the current session module * Source code : ext/session/session.c diff --git a/ext/session/tests/session_module_name_error.phpt b/ext/session/tests/session_module_name_error.phpt index 08c080a1fa..e560dc4f2d 100644 --- a/ext/session/tests/session_module_name_error.phpt +++ b/ext/session/tests/session_module_name_error.phpt @@ -7,7 +7,7 @@ Test session_module_name() function : error functionality ob_start(); -/* +/* * Prototype : string session_module_name([string $module]) * Description : Get and/or set the current session module * Source code : ext/session/session.c @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // Empty strings /*16*/ "", '', @@ -66,7 +66,7 @@ $inputs = array( /*18*/ "Nothing", 'Nothing', $heredoc, - + // Object data /*21*/ new classA(), diff --git a/ext/session/tests/session_module_name_variation1.phpt b/ext/session/tests/session_module_name_variation1.phpt index 2034b7eff1..a3a163ef55 100644 --- a/ext/session/tests/session_module_name_variation1.phpt +++ b/ext/session/tests/session_module_name_variation1.phpt @@ -7,7 +7,7 @@ Test session_module_name() function : variation ob_start(); -/* +/* * Prototype : string session_module_name([string $module]) * Description : Get and/or set the current session module * Source code : ext/session/session.c diff --git a/ext/session/tests/session_module_name_variation2.phpt b/ext/session/tests/session_module_name_variation2.phpt index aa7b33c767..c3945b4d2e 100644 --- a/ext/session/tests/session_module_name_variation2.phpt +++ b/ext/session/tests/session_module_name_variation2.phpt @@ -7,7 +7,7 @@ Test session_module_name() function : variation ob_start(); -/* +/* * Prototype : string session_module_name([string $module]) * Description : Get and/or set the current session module * Source code : ext/session/session.c diff --git a/ext/session/tests/session_module_name_variation3.phpt b/ext/session/tests/session_module_name_variation3.phpt index 09beaa4059..5c6d792eb6 100644 --- a/ext/session/tests/session_module_name_variation3.phpt +++ b/ext/session/tests/session_module_name_variation3.phpt @@ -11,14 +11,14 @@ session.save_handler=files ob_start(); -/* +/* * Prototype : string session_module_name([string $module]) * Description : Get and/or set the current session module * Source code : ext/session/session.c */ echo "*** Testing session_module_name() : variation ***\n"; -function open($save_path, $session_name) { +function open($save_path, $session_name) { throw new Exception("Stop...!"); } diff --git a/ext/session/tests/session_module_name_variation4.phpt b/ext/session/tests/session_module_name_variation4.phpt index 70b644be58..bcf0204f95 100644 --- a/ext/session/tests/session_module_name_variation4.phpt +++ b/ext/session/tests/session_module_name_variation4.phpt @@ -11,7 +11,7 @@ session.gc_maxlifetime=0 ob_start(); -/* +/* * Prototype : string session_module_name([string $module]) * Description : Get and/or set the current session module * Source code : ext/session/session.c diff --git a/ext/session/tests/session_name_basic.phpt b/ext/session/tests/session_name_basic.phpt index 50cefe2812..ee3435b5d3 100644 --- a/ext/session/tests/session_name_basic.phpt +++ b/ext/session/tests/session_name_basic.phpt @@ -11,7 +11,7 @@ session.save_handler=files ob_start(); -/* +/* * Prototype : string session_name([string $name]) * Description : Get and/or set the current session name * Source code : ext/session/session.c diff --git a/ext/session/tests/session_name_error.phpt b/ext/session/tests/session_name_error.phpt index 9f0101d98b..2ad83642b7 100644 --- a/ext/session/tests/session_name_error.phpt +++ b/ext/session/tests/session_name_error.phpt @@ -10,7 +10,7 @@ session.name=PHPSESSID ob_start(); -/* +/* * Prototype : string session_name([string $name]) * Description : Get and/or set the current session name * Source code : ext/session/session.c @@ -60,7 +60,7 @@ $inputs = array( false, TRUE, FALSE, - + // Empty strings /*16*/ "", '', @@ -69,7 +69,7 @@ $inputs = array( /*18*/ "Nothing", 'Nothing', $heredoc, - + // Object data /*21*/ new classA(), diff --git a/ext/session/tests/session_name_variation1.phpt b/ext/session/tests/session_name_variation1.phpt index 7809e60b4d..a417df9902 100644 --- a/ext/session/tests/session_name_variation1.phpt +++ b/ext/session/tests/session_name_variation1.phpt @@ -11,7 +11,7 @@ session.save_handler=files ob_start(); -/* +/* * Prototype : string session_name([string $name]) * Description : Get and/or set the current session name * Source code : ext/session/session.c diff --git a/ext/session/tests/session_name_variation2.phpt b/ext/session/tests/session_name_variation2.phpt index 536a9d31a5..2f9538a8cf 100644 --- a/ext/session/tests/session_name_variation2.phpt +++ b/ext/session/tests/session_name_variation2.phpt @@ -9,7 +9,7 @@ session.name=blah ob_start(); -/* +/* * Prototype : string session_name([string $name]) * Description : Get and/or set the current session name * Source code : ext/session/session.c diff --git a/ext/session/tests/session_regenerate_id_basic.phpt b/ext/session/tests/session_regenerate_id_basic.phpt index cdf2bb1f2b..1f45008493 100644 --- a/ext/session/tests/session_regenerate_id_basic.phpt +++ b/ext/session/tests/session_regenerate_id_basic.phpt @@ -7,7 +7,7 @@ Test session_regenerate_id() function : basic functionality ob_start(); -/* +/* * Prototype : bool session_regenerate_id([bool $delete_old_session]) * Description : Update the current session id with a newly generated one * Source code : ext/session/session.c diff --git a/ext/session/tests/session_regenerate_id_error.phpt b/ext/session/tests/session_regenerate_id_error.phpt index 71ef13471e..74e82ef1d2 100644 --- a/ext/session/tests/session_regenerate_id_error.phpt +++ b/ext/session/tests/session_regenerate_id_error.phpt @@ -7,7 +7,7 @@ Test session_regenerate_id() function : error functionality ob_start(); -/* +/* * Prototype : bool session_regenerate_id([bool $delete_old_session]) * Description : Update the current session id with a newly generated one * Source code : ext/session/session.c @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // Empty strings /*16*/ "", '', @@ -66,7 +66,7 @@ $inputs = array( /*18*/ "Nothing", 'Nothing', $heredoc, - + // Object data /*21*/ new classA(), diff --git a/ext/session/tests/session_regenerate_id_variation1.phpt b/ext/session/tests/session_regenerate_id_variation1.phpt index ca0ef35b10..2a9b0b2997 100644 --- a/ext/session/tests/session_regenerate_id_variation1.phpt +++ b/ext/session/tests/session_regenerate_id_variation1.phpt @@ -7,7 +7,7 @@ Test session_regenerate_id() function : variation ob_start(); -/* +/* * Prototype : bool session_regenerate_id([bool $delete_old_session]) * Description : Update the current session id with a newly generated one * Source code : ext/session/session.c diff --git a/ext/session/tests/session_save_path_basic.phpt b/ext/session/tests/session_save_path_basic.phpt index 2895f46c0b..a7ff0d7655 100644 --- a/ext/session/tests/session_save_path_basic.phpt +++ b/ext/session/tests/session_save_path_basic.phpt @@ -11,7 +11,7 @@ session.name=PHPSESSID ob_start(); -/* +/* * Prototype : string session_save_path([string $path]) * Description : Get and/or set the current session save path * Source code : ext/session/session.c diff --git a/ext/session/tests/session_save_path_error.phpt b/ext/session/tests/session_save_path_error.phpt index 7a2061083a..e3b5fedad0 100644 --- a/ext/session/tests/session_save_path_error.phpt +++ b/ext/session/tests/session_save_path_error.phpt @@ -12,7 +12,7 @@ session.save_handler=files ob_start(); -/* +/* * Prototype : string session_save_path([string $path]) * Description : Get and/or set the current session save path * Source code : ext/session/session.c @@ -62,7 +62,7 @@ $inputs = array( false, TRUE, FALSE, - + // Empty strings /*16*/ "", '', @@ -71,7 +71,7 @@ $inputs = array( /*18*/ "Nothing", 'Nothing', $heredoc, - + // Object data /*21*/ new classA(), diff --git a/ext/session/tests/session_save_path_variation2.phpt b/ext/session/tests/session_save_path_variation2.phpt index 60675aec3c..e5f776ea76 100644 --- a/ext/session/tests/session_save_path_variation2.phpt +++ b/ext/session/tests/session_save_path_variation2.phpt @@ -10,7 +10,7 @@ session.gc_probability=0 ob_start(); -/* +/* * Prototype : string session_save_path([string $path]) * Description : Get and/or set the current session save path * Source code : ext/session/session.c diff --git a/ext/session/tests/session_save_path_variation3.phpt b/ext/session/tests/session_save_path_variation3.phpt index 1d290d95b3..0cfb2edd62 100644 --- a/ext/session/tests/session_save_path_variation3.phpt +++ b/ext/session/tests/session_save_path_variation3.phpt @@ -10,7 +10,7 @@ session.gc_probability=0 ob_start(); -/* +/* * Prototype : string session_save_path([string $path]) * Description : Get and/or set the current session save path * Source code : ext/session/session.c diff --git a/ext/session/tests/session_save_path_variation4.phpt b/ext/session/tests/session_save_path_variation4.phpt index 8cbee49afb..7bd65cff8f 100644 --- a/ext/session/tests/session_save_path_variation4.phpt +++ b/ext/session/tests/session_save_path_variation4.phpt @@ -12,7 +12,7 @@ session.name=PHPSESSID ob_start(); -/* +/* * Prototype : string session_save_path([string $path]) * Description : Get and/or set the current session save path * Source code : ext/session/session.c diff --git a/ext/session/tests/session_save_path_variation5.phpt b/ext/session/tests/session_save_path_variation5.phpt index c015dcc95c..e36bbfc0b1 100644 --- a/ext/session/tests/session_save_path_variation5.phpt +++ b/ext/session/tests/session_save_path_variation5.phpt @@ -1,7 +1,7 @@ --TEST-- Test session_save_path() function : variation --SKIPIF-- -<?php include('skipif.inc'); +<?php include('skipif.inc'); if(substr(PHP_OS, 0, 3) == "WIN") die("skip Not for Windows"); ?> @@ -13,7 +13,7 @@ session.name=PHPSESSID <?php ob_start(); -/* +/* * Prototype : string session_save_path([string $path]) * Description : Get and/or set the current session save path * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_cookie_params_basic.phpt b/ext/session/tests/session_set_cookie_params_basic.phpt index a67aaa2bc4..f0a25212bd 100644 --- a/ext/session/tests/session_set_cookie_params_basic.phpt +++ b/ext/session/tests/session_set_cookie_params_basic.phpt @@ -7,7 +7,7 @@ Test session_set_cookie_params() function : basic functionality ob_start(); -/* +/* * Prototype : void session_set_cookie_params(int $lifetime [, string $path [, string $domain [, bool $secure [, bool $httponly]]]]) * Description : Set the session cookie parameters * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_cookie_params_error.phpt b/ext/session/tests/session_set_cookie_params_error.phpt index cb9d1a5eaa..ad99271bd0 100644 --- a/ext/session/tests/session_set_cookie_params_error.phpt +++ b/ext/session/tests/session_set_cookie_params_error.phpt @@ -7,7 +7,7 @@ Test session_set_cookie_params() function : error functionality ob_start(); -/* +/* * Prototype : void session_set_cookie_params(int $lifetime [, string $path [, string $domain [, bool $secure [, bool $httponly]]]]) * Description : Set the session cookie parameters * Source code : ext/session/session.c @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // Empty strings /*16*/ "", '', @@ -66,7 +66,7 @@ $inputs = array( /*18*/ "Nothing", 'Nothing', $heredoc, - + // Object data /*21*/ new classA(), diff --git a/ext/session/tests/session_set_cookie_params_variation1.phpt b/ext/session/tests/session_set_cookie_params_variation1.phpt index 93ac056d89..67c6698678 100644 --- a/ext/session/tests/session_set_cookie_params_variation1.phpt +++ b/ext/session/tests/session_set_cookie_params_variation1.phpt @@ -9,7 +9,7 @@ session.cookie_lifetime=3600 ob_start(); -/* +/* * Prototype : void session_set_cookie_params(int $lifetime [, string $path [, string $domain [, bool $secure [, bool $httponly]]]]) * Description : Set the session cookie parameters * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_cookie_params_variation2.phpt b/ext/session/tests/session_set_cookie_params_variation2.phpt index 1bf9bae848..8d10c9317b 100644 --- a/ext/session/tests/session_set_cookie_params_variation2.phpt +++ b/ext/session/tests/session_set_cookie_params_variation2.phpt @@ -9,7 +9,7 @@ session.cookie_path=/path ob_start(); -/* +/* * Prototype : void session_set_cookie_params(int $lifetime [, string $path [, string $domain [, bool $secure [, bool $httponly]]]]) * Description : Set the session cookie parameters * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_cookie_params_variation3.phpt b/ext/session/tests/session_set_cookie_params_variation3.phpt index 17d1e6a771..27dc8b2c0a 100644 --- a/ext/session/tests/session_set_cookie_params_variation3.phpt +++ b/ext/session/tests/session_set_cookie_params_variation3.phpt @@ -9,7 +9,7 @@ session.cookie_domain=foo ob_start(); -/* +/* * Prototype : void session_set_cookie_params(int $lifetime [, string $path [, string $domain [, bool $secure [, bool $httponly]]]]) * Description : Set the session cookie parameters * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_cookie_params_variation4.phpt b/ext/session/tests/session_set_cookie_params_variation4.phpt index 2b10f3cc82..5d40237e43 100644 --- a/ext/session/tests/session_set_cookie_params_variation4.phpt +++ b/ext/session/tests/session_set_cookie_params_variation4.phpt @@ -9,7 +9,7 @@ session.cookie_secure=TRUE ob_start(); -/* +/* * Prototype : void session_set_cookie_params(int $lifetime [, string $path [, string $domain [, bool $secure [, bool $httponly]]]]) * Description : Set the session cookie parameters * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_cookie_params_variation5.phpt b/ext/session/tests/session_set_cookie_params_variation5.phpt index ffdd29db2d..43412316ec 100644 --- a/ext/session/tests/session_set_cookie_params_variation5.phpt +++ b/ext/session/tests/session_set_cookie_params_variation5.phpt @@ -9,7 +9,7 @@ session.cookie_httponly=TRUE ob_start(); -/* +/* * Prototype : void session_set_cookie_params(int $lifetime [, string $path [, string $domain [, bool $secure [, bool $httponly]]]]) * Description : Set the session cookie parameters * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_save_handler_basic.phpt b/ext/session/tests/session_set_save_handler_basic.phpt index 87156bea7f..c1b473da8b 100644 --- a/ext/session/tests/session_set_save_handler_basic.phpt +++ b/ext/session/tests/session_set_save_handler_basic.phpt @@ -12,7 +12,7 @@ session.save_handler=files ob_start(); -/* +/* * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc) * Description : Sets user-level session storage functions * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_save_handler_class_001.phpt b/ext/session/tests/session_set_save_handler_class_001.phpt index c46d07f9b7..d39a4c4c0e 100644 --- a/ext/session/tests/session_set_save_handler_class_001.phpt +++ b/ext/session/tests/session_set_save_handler_class_001.phpt @@ -11,7 +11,7 @@ session.save_handler=files ob_start(); -/* +/* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_save_handler_class_002.phpt b/ext/session/tests/session_set_save_handler_class_002.phpt index 880bc33425..c777242e1c 100644 --- a/ext/session/tests/session_set_save_handler_class_002.phpt +++ b/ext/session/tests/session_set_save_handler_class_002.phpt @@ -10,7 +10,7 @@ session.name=PHPSESSID ob_start(); -/* +/* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_save_handler_class_003.phpt b/ext/session/tests/session_set_save_handler_class_003.phpt index 29b3846851..ee54a90d0f 100644 --- a/ext/session/tests/session_set_save_handler_class_003.phpt +++ b/ext/session/tests/session_set_save_handler_class_003.phpt @@ -10,7 +10,7 @@ session.name=PHPSESSID ob_start(); -/* +/* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_save_handler_class_004.phpt b/ext/session/tests/session_set_save_handler_class_004.phpt index 103b13baa7..650bc8456c 100644 --- a/ext/session/tests/session_set_save_handler_class_004.phpt +++ b/ext/session/tests/session_set_save_handler_class_004.phpt @@ -10,7 +10,7 @@ session.name=PHPSESSID ob_start(); -/* +/* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_save_handler_class_005.phpt b/ext/session/tests/session_set_save_handler_class_005.phpt index b195fc4a53..2f98d2f17f 100644 --- a/ext/session/tests/session_set_save_handler_class_005.phpt +++ b/ext/session/tests/session_set_save_handler_class_005.phpt @@ -11,7 +11,7 @@ session.gc_probability=0 ob_start(); -/* +/* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_save_handler_class_006.phpt b/ext/session/tests/session_set_save_handler_class_006.phpt index 5830b6d4fa..921a1c70a5 100644 --- a/ext/session/tests/session_set_save_handler_class_006.phpt +++ b/ext/session/tests/session_set_save_handler_class_006.phpt @@ -10,7 +10,7 @@ session.name=PHPSESSID ob_start(); -/* +/* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_save_handler_class_007.phpt b/ext/session/tests/session_set_save_handler_class_007.phpt index 55f722515e..3dd97847d7 100644 --- a/ext/session/tests/session_set_save_handler_class_007.phpt +++ b/ext/session/tests/session_set_save_handler_class_007.phpt @@ -10,7 +10,7 @@ session.name=PHPSESSID ob_start(); -/* +/* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_save_handler_class_008.phpt b/ext/session/tests/session_set_save_handler_class_008.phpt index 28cb692f0e..6093efb83d 100644 --- a/ext/session/tests/session_set_save_handler_class_008.phpt +++ b/ext/session/tests/session_set_save_handler_class_008.phpt @@ -10,7 +10,7 @@ session.name=PHPSESSID ob_start(); -/* +/* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_save_handler_class_009.phpt b/ext/session/tests/session_set_save_handler_class_009.phpt index a8b57dc541..5cc4db506e 100644 --- a/ext/session/tests/session_set_save_handler_class_009.phpt +++ b/ext/session/tests/session_set_save_handler_class_009.phpt @@ -10,7 +10,7 @@ session.name=PHPSESSID ob_start(); -/* +/* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_save_handler_class_010.phpt b/ext/session/tests/session_set_save_handler_class_010.phpt index 02304f4974..76d390b63a 100644 --- a/ext/session/tests/session_set_save_handler_class_010.phpt +++ b/ext/session/tests/session_set_save_handler_class_010.phpt @@ -10,7 +10,7 @@ session.name=PHPSESSID ob_start(); -/* +/* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_save_handler_class_011.phpt b/ext/session/tests/session_set_save_handler_class_011.phpt index 2be99e2add..88321ef9dc 100644 --- a/ext/session/tests/session_set_save_handler_class_011.phpt +++ b/ext/session/tests/session_set_save_handler_class_011.phpt @@ -10,7 +10,7 @@ session.name=PHPSESSID ob_start(); -/* +/* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_save_handler_class_012.phpt b/ext/session/tests/session_set_save_handler_class_012.phpt index 3671cebe2b..bd7badd810 100644 --- a/ext/session/tests/session_set_save_handler_class_012.phpt +++ b/ext/session/tests/session_set_save_handler_class_012.phpt @@ -11,7 +11,7 @@ session.gc_probability=0 ob_start(); -/* +/* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_save_handler_class_013.phpt b/ext/session/tests/session_set_save_handler_class_013.phpt index f536aa72ac..fa35e0e6e4 100644 --- a/ext/session/tests/session_set_save_handler_class_013.phpt +++ b/ext/session/tests/session_set_save_handler_class_013.phpt @@ -10,7 +10,7 @@ session.name=PHPSESSID ob_start(); -/* +/* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_save_handler_class_014.phpt b/ext/session/tests/session_set_save_handler_class_014.phpt index a96367c13a..a3847a8f58 100644 --- a/ext/session/tests/session_set_save_handler_class_014.phpt +++ b/ext/session/tests/session_set_save_handler_class_014.phpt @@ -13,7 +13,7 @@ include('skipif.inc'); ob_start(); -/* +/* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_save_handler_class_015.phpt b/ext/session/tests/session_set_save_handler_class_015.phpt index 146984175e..7458f27251 100644 --- a/ext/session/tests/session_set_save_handler_class_015.phpt +++ b/ext/session/tests/session_set_save_handler_class_015.phpt @@ -10,7 +10,7 @@ session.name=PHPSESSID ob_start(); -/* +/* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_save_handler_class_017.phpt b/ext/session/tests/session_set_save_handler_class_017.phpt index b8e7d7a7ad..8840b0a633 100644 --- a/ext/session/tests/session_set_save_handler_class_017.phpt +++ b/ext/session/tests/session_set_save_handler_class_017.phpt @@ -10,7 +10,7 @@ session.name=PHPSESSID ob_start(); -/* +/* * Prototype : bool session_set_save_handler(SessionHandlerInterface $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_save_handler_closures.phpt b/ext/session/tests/session_set_save_handler_closures.phpt index f427ebf9a5..f790b88822 100644 --- a/ext/session/tests/session_set_save_handler_closures.phpt +++ b/ext/session/tests/session_set_save_handler_closures.phpt @@ -11,7 +11,7 @@ session.save_handler=files ob_start(); -/* +/* * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc) * Description : Sets user-level session storage functions * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_save_handler_error.phpt b/ext/session/tests/session_set_save_handler_error.phpt index bf9d25de59..0362ddc8dd 100644 --- a/ext/session/tests/session_set_save_handler_error.phpt +++ b/ext/session/tests/session_set_save_handler_error.phpt @@ -7,7 +7,7 @@ Test session_set_save_handler() function : error functionality ob_start(); -/* +/* * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc) * Description : Sets user-level session storage functions * Source code : ext/session/session.c @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // Empty strings /*16*/ "", '', @@ -66,7 +66,7 @@ $inputs = array( /*18*/ "Nothing", 'Nothing', $heredoc, - + // Object data /*21*/ new classA(), diff --git a/ext/session/tests/session_set_save_handler_error2.phpt b/ext/session/tests/session_set_save_handler_error2.phpt index fb1673e0ce..eb2ac8c99d 100644 --- a/ext/session/tests/session_set_save_handler_error2.phpt +++ b/ext/session/tests/session_set_save_handler_error2.phpt @@ -9,7 +9,7 @@ error_reporting=0 ob_start(); -/* +/* * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc) * Description : Sets user-level session storage functions * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_save_handler_error3.phpt b/ext/session/tests/session_set_save_handler_error3.phpt index 2f2659557b..451544bb90 100644 --- a/ext/session/tests/session_set_save_handler_error3.phpt +++ b/ext/session/tests/session_set_save_handler_error3.phpt @@ -11,14 +11,14 @@ session.save_handler=files ob_start(); -/* +/* * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc) * Description : Sets user-level session storage functions * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() : error functionality ***\n"; -function open($save_path, $session_name) { +function open($save_path, $session_name) { throw new Exception("Do something bad..!"); } diff --git a/ext/session/tests/session_set_save_handler_error4.phpt b/ext/session/tests/session_set_save_handler_error4.phpt index 4267195ee1..7d43333d6d 100644 --- a/ext/session/tests/session_set_save_handler_error4.phpt +++ b/ext/session/tests/session_set_save_handler_error4.phpt @@ -7,7 +7,7 @@ Test session_set_save_handler() function : error functionality ob_start(); -/* +/* * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc) * Description : Sets user-level session storage functions * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_save_handler_iface_001.phpt b/ext/session/tests/session_set_save_handler_iface_001.phpt index 6943d59cbe..e2424ba9b8 100644 --- a/ext/session/tests/session_set_save_handler_iface_001.phpt +++ b/ext/session/tests/session_set_save_handler_iface_001.phpt @@ -10,7 +10,7 @@ session.name=PHPSESSID ob_start(); -/* +/* * Prototype : bool session_set_save_handler(SessionHandlerInterface $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_save_handler_iface_002.phpt b/ext/session/tests/session_set_save_handler_iface_002.phpt index 204d88c785..56943c8f52 100644 --- a/ext/session/tests/session_set_save_handler_iface_002.phpt +++ b/ext/session/tests/session_set_save_handler_iface_002.phpt @@ -10,7 +10,7 @@ session.name=PHPSESSID ob_start(); -/* +/* * Prototype : bool session_set_save_handler(SessionHandlerInterface $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_save_handler_iface_003.phpt b/ext/session/tests/session_set_save_handler_iface_003.phpt index 4d7ed3b7ee..1e7889ec48 100644 --- a/ext/session/tests/session_set_save_handler_iface_003.phpt +++ b/ext/session/tests/session_set_save_handler_iface_003.phpt @@ -10,7 +10,7 @@ session.name=PHPSESSID ob_start(); -/* +/* * Prototype : bool session_set_save_handler(SessionHandlerInterface $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_save_handler_variation1.phpt b/ext/session/tests/session_set_save_handler_variation1.phpt index fe1d2b0b5a..1a4363d87b 100644 --- a/ext/session/tests/session_set_save_handler_variation1.phpt +++ b/ext/session/tests/session_set_save_handler_variation1.phpt @@ -7,7 +7,7 @@ Test session_set_save_handler() function : variation ob_start(); -/* +/* * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc) * Description : Sets user-level session storage functions * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_save_handler_variation2.phpt b/ext/session/tests/session_set_save_handler_variation2.phpt index 976d796f5c..93f2dbe04b 100644 --- a/ext/session/tests/session_set_save_handler_variation2.phpt +++ b/ext/session/tests/session_set_save_handler_variation2.phpt @@ -7,7 +7,7 @@ Test session_set_save_handler() function : variation ob_start(); -/* +/* * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc) * Description : Sets user-level session storage functions * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_save_handler_variation3.phpt b/ext/session/tests/session_set_save_handler_variation3.phpt index 6afa753b90..f4caa37d02 100644 --- a/ext/session/tests/session_set_save_handler_variation3.phpt +++ b/ext/session/tests/session_set_save_handler_variation3.phpt @@ -9,7 +9,7 @@ session.auto_start=1 ob_start(); -/* +/* * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc) * Description : Sets user-level session storage functions * Source code : ext/session/session.c diff --git a/ext/session/tests/session_set_save_handler_variation4.phpt b/ext/session/tests/session_set_save_handler_variation4.phpt index be8425d245..ca82d9e28e 100644 --- a/ext/session/tests/session_set_save_handler_variation4.phpt +++ b/ext/session/tests/session_set_save_handler_variation4.phpt @@ -14,7 +14,7 @@ session.save_handler=files ob_start(); -/* +/* * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc) * Description : Sets user-level session storage functions * Source code : ext/session/session.c diff --git a/ext/session/tests/session_start_error.phpt b/ext/session/tests/session_start_error.phpt index 61d702f5f5..bd848faca1 100644 --- a/ext/session/tests/session_start_error.phpt +++ b/ext/session/tests/session_start_error.phpt @@ -7,7 +7,7 @@ Test session_start() function : error functionality ob_start(); -/* +/* * Prototype : bool session_start(void) * Description : Initialize session data * Source code : ext/session/session.c @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // Empty strings /*16*/ "", '', @@ -66,7 +66,7 @@ $inputs = array( /*18*/ "Nothing", 'Nothing', $heredoc, - + // Object data /*21*/ new classA(), diff --git a/ext/session/tests/session_start_variation1.phpt b/ext/session/tests/session_start_variation1.phpt index e7eba3d28b..b184cb6d22 100644 --- a/ext/session/tests/session_start_variation1.phpt +++ b/ext/session/tests/session_start_variation1.phpt @@ -7,7 +7,7 @@ Test session_start() function : variation ob_start(); -/* +/* * Prototype : bool session_start(void) * Description : Initialize session data * Source code : ext/session/session.c diff --git a/ext/session/tests/session_start_variation2.phpt b/ext/session/tests/session_start_variation2.phpt index 1cc6454d5e..516b98d298 100644 --- a/ext/session/tests/session_start_variation2.phpt +++ b/ext/session/tests/session_start_variation2.phpt @@ -7,7 +7,7 @@ Test session_start() function : variation ob_start(); -/* +/* * Prototype : bool session_start(void) * Description : Initialize session data * Source code : ext/session/session.c diff --git a/ext/session/tests/session_start_variation3.phpt b/ext/session/tests/session_start_variation3.phpt index 9ff1ff0139..576c295397 100644 --- a/ext/session/tests/session_start_variation3.phpt +++ b/ext/session/tests/session_start_variation3.phpt @@ -7,7 +7,7 @@ Test session_start() function : variation ob_start(); -/* +/* * Prototype : bool session_start(void) * Description : Initialize session data * Source code : ext/session/session.c diff --git a/ext/session/tests/session_start_variation4.phpt b/ext/session/tests/session_start_variation4.phpt index 76f21f4bca..c2aaeaf886 100644 --- a/ext/session/tests/session_start_variation4.phpt +++ b/ext/session/tests/session_start_variation4.phpt @@ -7,7 +7,7 @@ Test session_start() function : variation ob_start(); -/* +/* * Prototype : bool session_start(void) * Description : Initialize session data * Source code : ext/session/session.c diff --git a/ext/session/tests/session_start_variation5.phpt b/ext/session/tests/session_start_variation5.phpt index edcadbf7bb..d3b702f733 100644 --- a/ext/session/tests/session_start_variation5.phpt +++ b/ext/session/tests/session_start_variation5.phpt @@ -7,7 +7,7 @@ Test session_start() function : variation ob_start(); -/* +/* * Prototype : bool session_start(void) * Description : Initialize session data * Source code : ext/session/session.c diff --git a/ext/session/tests/session_start_variation6.phpt b/ext/session/tests/session_start_variation6.phpt index 639527a63f..a6aaf3a035 100644 --- a/ext/session/tests/session_start_variation6.phpt +++ b/ext/session/tests/session_start_variation6.phpt @@ -7,7 +7,7 @@ Test session_start() function : variation ob_start(); -/* +/* * Prototype : bool session_start(void) * Description : Initialize session data * Source code : ext/session/session.c diff --git a/ext/session/tests/session_start_variation7.phpt b/ext/session/tests/session_start_variation7.phpt index 33101b5147..36a9ecdf2f 100644 --- a/ext/session/tests/session_start_variation7.phpt +++ b/ext/session/tests/session_start_variation7.phpt @@ -7,7 +7,7 @@ Test session_start() function : variation ob_start(); -/* +/* * Prototype : bool session_start(void) * Description : Initialize session data * Source code : ext/session/session.c diff --git a/ext/session/tests/session_start_variation8.phpt b/ext/session/tests/session_start_variation8.phpt index 9365475275..155aa647f3 100644 --- a/ext/session/tests/session_start_variation8.phpt +++ b/ext/session/tests/session_start_variation8.phpt @@ -7,7 +7,7 @@ Test session_start() function : variation ob_start(); -/* +/* * Prototype : bool session_start(void) * Description : Initialize session data * Source code : ext/session/session.c diff --git a/ext/session/tests/session_start_variation9.phpt b/ext/session/tests/session_start_variation9.phpt index 2629b074b6..91bf794c94 100644 --- a/ext/session/tests/session_start_variation9.phpt +++ b/ext/session/tests/session_start_variation9.phpt @@ -9,7 +9,7 @@ session.auto_start=1 ob_start(); -/* +/* * Prototype : bool session_start(void) * Description : Initialize session data * Source code : ext/session/session.c diff --git a/ext/session/tests/session_unset_basic.phpt b/ext/session/tests/session_unset_basic.phpt index 7a19a5e93d..95c2812a93 100644 --- a/ext/session/tests/session_unset_basic.phpt +++ b/ext/session/tests/session_unset_basic.phpt @@ -7,7 +7,7 @@ Test session_unset() function : basic functionality ob_start(); -/* +/* * Prototype : void session_unset(void) * Description : Free all session variables * Source code : ext/session/session.c diff --git a/ext/session/tests/session_unset_error.phpt b/ext/session/tests/session_unset_error.phpt index e371bcb409..656171dad3 100644 --- a/ext/session/tests/session_unset_error.phpt +++ b/ext/session/tests/session_unset_error.phpt @@ -7,7 +7,7 @@ Test session_unset() function : error functionality ob_start(); -/* +/* * Prototype : void session_unset(void) * Description : Free all session variables * Source code : ext/session/session.c @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // Empty strings /*16*/ "", '', @@ -66,7 +66,7 @@ $inputs = array( /*18*/ "Nothing", 'Nothing', $heredoc, - + // Object data /*21*/ new classA(), diff --git a/ext/session/tests/session_unset_variation1.phpt b/ext/session/tests/session_unset_variation1.phpt index c01128031d..baa6a634ae 100644 --- a/ext/session/tests/session_unset_variation1.phpt +++ b/ext/session/tests/session_unset_variation1.phpt @@ -7,7 +7,7 @@ Test session_unset() function : variation ob_start(); -/* +/* * Prototype : void session_unset(void) * Description : Free all session variables * Source code : ext/session/session.c diff --git a/ext/session/tests/session_write_close_basic.phpt b/ext/session/tests/session_write_close_basic.phpt index 481f4876ea..16120e5827 100644 --- a/ext/session/tests/session_write_close_basic.phpt +++ b/ext/session/tests/session_write_close_basic.phpt @@ -7,7 +7,7 @@ Test session_write_close() function : basic functionality ob_start(); -/* +/* * Prototype : bool session_write_close(void) * Description : Write session data and end session * Source code : ext/session/session.c diff --git a/ext/session/tests/session_write_close_error.phpt b/ext/session/tests/session_write_close_error.phpt index 102ac41382..d5ff20d805 100644 --- a/ext/session/tests/session_write_close_error.phpt +++ b/ext/session/tests/session_write_close_error.phpt @@ -7,7 +7,7 @@ Test session_write_close() function : error functionality ob_start(); -/* +/* * Prototype : bool session_write_close(void) * Description : Write session data and end session * Source code : ext/session/session.c @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // Empty strings /*16*/ "", '', @@ -66,7 +66,7 @@ $inputs = array( /*18*/ "Nothing", 'Nothing', $heredoc, - + // Object data /*21*/ new classA(), diff --git a/ext/session/tests/session_write_close_variation1.phpt b/ext/session/tests/session_write_close_variation1.phpt index e5a87370c3..96e34b87ce 100644 --- a/ext/session/tests/session_write_close_variation1.phpt +++ b/ext/session/tests/session_write_close_variation1.phpt @@ -7,7 +7,7 @@ Test session_write_close() function : variation ob_start(); -/* +/* * Prototype : bool session_write_close(void) * Description : Write session data and end session * Source code : ext/session/session.c diff --git a/ext/session/tests/session_write_close_variation2.phpt b/ext/session/tests/session_write_close_variation2.phpt index eb3bfc104b..1768b9365f 100644 --- a/ext/session/tests/session_write_close_variation2.phpt +++ b/ext/session/tests/session_write_close_variation2.phpt @@ -7,7 +7,7 @@ Test session_write_close() function : variation ob_start(); -/* +/* * Prototype : bool session_write_close(void) * Description : Write session data and end session * Source code : ext/session/session.c diff --git a/ext/session/tests/session_write_close_variation3.phpt b/ext/session/tests/session_write_close_variation3.phpt index a8f5457f24..9d685ad144 100644 --- a/ext/session/tests/session_write_close_variation3.phpt +++ b/ext/session/tests/session_write_close_variation3.phpt @@ -9,7 +9,7 @@ session.auto_start=1 ob_start(); -/* +/* * Prototype : bool session_write_close(void) * Description : Write session data and end session * Source code : ext/session/session.c diff --git a/ext/session/tests/session_write_close_variation4.phpt b/ext/session/tests/session_write_close_variation4.phpt index a6d78cf134..2da41ca38e 100644 --- a/ext/session/tests/session_write_close_variation4.phpt +++ b/ext/session/tests/session_write_close_variation4.phpt @@ -9,7 +9,7 @@ session.use_strict_mode=0 ob_start(); -/* +/* * Prototype : bool session_write_close(void) * Description : Write session data and end session * Source code : ext/session/session.c diff --git a/ext/session/tests/sessionhandler_open_001.phpt b/ext/session/tests/sessionhandler_open_001.phpt index e6e913a6a5..2b8c3a49fb 100644 --- a/ext/session/tests/sessionhandler_open_001.phpt +++ b/ext/session/tests/sessionhandler_open_001.phpt @@ -3,7 +3,7 @@ Testing repated SessionHandler::open() calls --SKIPIF-- <?php include('skipif.inc'); ?> --FILE-- -<?php +<?php ini_set('session.save_handler', 'files'); $x = new SessionHandler; diff --git a/ext/shmop/tests/001.phpt b/ext/shmop/tests/001.phpt index 5b798cd5ba..a5ad01c302 100644 --- a/ext/shmop/tests/001.phpt +++ b/ext/shmop/tests/001.phpt @@ -13,15 +13,15 @@ shmop extension test $write_d2 = "test #2 append data to shared memory segment"; echo "shm open for create: "; - $shm_id = shmop_open($hex_shm_id, "n", 0644, 1024); + $shm_id = shmop_open($hex_shm_id, "n", 0644, 1024); if (!$shm_id) { die("failed\n"); } else { echo "ok\n"; } - + echo "shm size is: " . ($shm_size = shmop_size($shm_id)) . "\n"; - + echo "shm write test #1: "; $written = shmop_write($shm_id, $write_d1, 0); if ($written != strlen($write_d1)) { @@ -29,34 +29,34 @@ shmop extension test } else { echo "ok\n"; } - + echo "data in memory is: " . shmop_read($shm_id, 0, $written) . "\n"; shmop_close($shm_id); - + echo "shm open for read only: "; - $shm_id = shmop_open($hex_shm_id, "a", 0644, 1024); + $shm_id = shmop_open($hex_shm_id, "a", 0644, 1024); if (!$shm_id) { echo "failed\n"; } else { echo "ok\n"; } - + echo "data in memory is: " . shmop_read($shm_id, 0, $written) . "\n"; - + /* try to append data to the shared memory segment, this should fail */ shmop_write($shm_id, $write_d1, $written); shmop_close($shm_id); - + echo "shm open for read only: "; - $shm_id = shmop_open($hex_shm_id, "w", 0644, 1024); + $shm_id = shmop_open($hex_shm_id, "w", 0644, 1024); if (!$shm_id) { echo "failed\n"; } else { echo "ok\n"; } - + echo "shm write test #1: "; $written = shmop_write($shm_id, $write_d2, $written); if ($written != strlen($write_d2)) { @@ -64,7 +64,7 @@ shmop extension test } else { echo "ok\n"; } - + echo "data in memory is: " . shmop_read($shm_id, 0, strlen($write_d1 . $write_d2)) . "\n"; echo "deletion of shm segment: "; @@ -73,7 +73,7 @@ shmop extension test } else { echo "ok\n"; } - + shmop_close($shm_id); ?> --EXPECTF-- diff --git a/ext/simplexml/tests/000.phpt b/ext/simplexml/tests/000.phpt index 62615d17a2..8a35fc9ba3 100644 --- a/ext/simplexml/tests/000.phpt +++ b/ext/simplexml/tests/000.phpt @@ -3,7 +3,7 @@ SimpleXML: var_dump() --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $sxe = simplexml_load_file(dirname(__FILE__).'/000.xml'); diff --git a/ext/simplexml/tests/001-mb.phpt b/ext/simplexml/tests/001-mb.phpt index ee4d6f085f..ce358d3328 100644 --- a/ext/simplexml/tests/001-mb.phpt +++ b/ext/simplexml/tests/001-mb.phpt @@ -3,7 +3,7 @@ SimpleXML: Simple document --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php var_dump(simplexml_load_file(dirname(__FILE__).'/sxe私はガラスを食べられます.xml')); diff --git a/ext/simplexml/tests/001.phpt b/ext/simplexml/tests/001.phpt index 0be77710e5..7f37870efa 100644 --- a/ext/simplexml/tests/001.phpt +++ b/ext/simplexml/tests/001.phpt @@ -3,7 +3,7 @@ SimpleXML: Simple document --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php var_dump(simplexml_load_file(dirname(__FILE__).'/sxe.xml')); diff --git a/ext/simplexml/tests/002.phpt b/ext/simplexml/tests/002.phpt index 4f1f6b6224..1d8ba4032a 100644 --- a/ext/simplexml/tests/002.phpt +++ b/ext/simplexml/tests/002.phpt @@ -3,7 +3,7 @@ SimpleXML: clone --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $xml =<<<EOF <?xml version='1.0'?> diff --git a/ext/simplexml/tests/003.phpt b/ext/simplexml/tests/003.phpt index 105f616d60..5b989b85d4 100644 --- a/ext/simplexml/tests/003.phpt +++ b/ext/simplexml/tests/003.phpt @@ -3,7 +3,7 @@ SimpleXML: Entities --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $xml =<<<EOF <?xml version='1.0'?> diff --git a/ext/simplexml/tests/004.phpt b/ext/simplexml/tests/004.phpt index 21cb5469e0..ffb4db0db6 100644 --- a/ext/simplexml/tests/004.phpt +++ b/ext/simplexml/tests/004.phpt @@ -3,7 +3,7 @@ SimpleXML: CDATA --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $sxe = simplexml_load_string(<<<EOF <?xml version='1.0'?> diff --git a/ext/simplexml/tests/005.phpt b/ext/simplexml/tests/005.phpt index 1411065435..ee8cd1ff83 100644 --- a/ext/simplexml/tests/005.phpt +++ b/ext/simplexml/tests/005.phpt @@ -3,7 +3,7 @@ SimpleXML: Text data --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $sxe = simplexml_load_string(<<<EOF <?xml version='1.0'?> diff --git a/ext/simplexml/tests/006.phpt b/ext/simplexml/tests/006.phpt index 72ad0c8089..bf4270f449 100644 --- a/ext/simplexml/tests/006.phpt +++ b/ext/simplexml/tests/006.phpt @@ -3,7 +3,7 @@ SimpleXML: foreach --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $sxe = simplexml_load_string(<<<EOF <?xml version='1.0'?> diff --git a/ext/simplexml/tests/007.phpt b/ext/simplexml/tests/007.phpt index 51d7a847f7..065e794c48 100644 --- a/ext/simplexml/tests/007.phpt +++ b/ext/simplexml/tests/007.phpt @@ -3,7 +3,7 @@ SimpleXML: Attributes --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $xml =<<<EOF <?xml version='1.0'?> diff --git a/ext/simplexml/tests/008.phpt b/ext/simplexml/tests/008.phpt index f6c41f43e5..f0c32d4e55 100644 --- a/ext/simplexml/tests/008.phpt +++ b/ext/simplexml/tests/008.phpt @@ -3,7 +3,7 @@ SimpleXML: XPath --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $xml =<<<EOF <?xml version='1.0'?> diff --git a/ext/simplexml/tests/009.phpt b/ext/simplexml/tests/009.phpt index a76f3d1116..096d8391e8 100644 --- a/ext/simplexml/tests/009.phpt +++ b/ext/simplexml/tests/009.phpt @@ -3,7 +3,7 @@ SimpleXML: foreach --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $sxe = simplexml_load_string(<<<EOF <?xml version='1.0'?> <!DOCTYPE sxe SYSTEM "notfound.dtd"> diff --git a/ext/simplexml/tests/009b.phpt b/ext/simplexml/tests/009b.phpt index dba300c72f..e042875ce3 100644 --- a/ext/simplexml/tests/009b.phpt +++ b/ext/simplexml/tests/009b.phpt @@ -3,7 +3,7 @@ SimpleXML: foreach --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $sxe = simplexml_load_string(<<<EOF <?xml version='1.0'?> <!DOCTYPE sxe SYSTEM "notfound.dtd"> diff --git a/ext/simplexml/tests/010.phpt b/ext/simplexml/tests/010.phpt index 267780905b..63daf800d1 100644 --- a/ext/simplexml/tests/010.phpt +++ b/ext/simplexml/tests/010.phpt @@ -3,7 +3,7 @@ SimpleXML: Simple Inheritance --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php class simplexml_inherited extends SimpleXMLElement { diff --git a/ext/simplexml/tests/011.phpt b/ext/simplexml/tests/011.phpt index 74ea4705ca..1d5c193f3b 100644 --- a/ext/simplexml/tests/011.phpt +++ b/ext/simplexml/tests/011.phpt @@ -1,11 +1,11 @@ --TEST-- SimpleXML: echo/print --SKIPIF-- -<?php +<?php if (!extension_loaded('simplexml')) print 'skip'; ?> --FILE-- -<?php +<?php $xml =<<<EOF <?xml version="1.0" encoding="ISO-8859-1" ?> diff --git a/ext/simplexml/tests/012.phpt b/ext/simplexml/tests/012.phpt index abbb10b8d3..598aa3c17a 100644 --- a/ext/simplexml/tests/012.phpt +++ b/ext/simplexml/tests/012.phpt @@ -1,11 +1,11 @@ --TEST-- SimpleXML: Attribute creation --SKIPIF-- -<?php +<?php if (!extension_loaded('simplexml')) print 'skip'; ?> --FILE-- -<?php +<?php $xml =<<<EOF <?xml version="1.0" encoding="ISO-8859-1" ?> diff --git a/ext/simplexml/tests/013.phpt b/ext/simplexml/tests/013.phpt index 56c57dfbc2..cf58461451 100644 --- a/ext/simplexml/tests/013.phpt +++ b/ext/simplexml/tests/013.phpt @@ -1,11 +1,11 @@ --TEST-- SimpleXML: Split text content --SKIPIF-- -<?php +<?php if (!extension_loaded('simplexml')) print 'skip'; ?> --FILE-- -<?php +<?php $xml =<<<EOF <?xml version="1.0" encoding="ISO-8859-1" ?> diff --git a/ext/simplexml/tests/014.phpt b/ext/simplexml/tests/014.phpt index d1d736e7b5..b0c1dd952f 100644 --- a/ext/simplexml/tests/014.phpt +++ b/ext/simplexml/tests/014.phpt @@ -3,7 +3,7 @@ SimpleXML: adding/removing attributes (direct) --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $xml =<<<EOF <people> <person name="Joe"></person> diff --git a/ext/simplexml/tests/014a.phpt b/ext/simplexml/tests/014a.phpt index 649828b4dd..f778c25f12 100644 --- a/ext/simplexml/tests/014a.phpt +++ b/ext/simplexml/tests/014a.phpt @@ -3,7 +3,7 @@ SimpleXML: adding/removing attributes (single) --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $xml =<<<EOF <people> <person name="Joe"></person> diff --git a/ext/simplexml/tests/014b.phpt b/ext/simplexml/tests/014b.phpt index 034396751a..0daa9c5c97 100644 --- a/ext/simplexml/tests/014b.phpt +++ b/ext/simplexml/tests/014b.phpt @@ -3,7 +3,7 @@ SimpleXML: adding/removing attributes (second) --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $xml =<<<EOF <people> <person name="Joe"></person> diff --git a/ext/simplexml/tests/015.phpt b/ext/simplexml/tests/015.phpt index 11e9cd55cd..d80d4d114c 100644 --- a/ext/simplexml/tests/015.phpt +++ b/ext/simplexml/tests/015.phpt @@ -3,7 +3,7 @@ SimpleXML: accessing singular subnode as array --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $xml =<<<EOF <people> <person name="Joe"></person> diff --git a/ext/simplexml/tests/016.phpt b/ext/simplexml/tests/016.phpt index ab80a7a19a..97981214db 100644 --- a/ext/simplexml/tests/016.phpt +++ b/ext/simplexml/tests/016.phpt @@ -3,7 +3,7 @@ SimpleXML: modifying attributes of singular subnode --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $xml =<<<EOF <people> <person name="Joe"></person> diff --git a/ext/simplexml/tests/016a.phpt b/ext/simplexml/tests/016a.phpt index 9797e29305..7cc8b33123 100644 --- a/ext/simplexml/tests/016a.phpt +++ b/ext/simplexml/tests/016a.phpt @@ -3,7 +3,7 @@ SimpleXML: concatenating attributes --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $xml =<<<EOF <people> <person name="Foo"></person> diff --git a/ext/simplexml/tests/018.phpt b/ext/simplexml/tests/018.phpt index e5c810944e..41a6f8259c 100644 --- a/ext/simplexml/tests/018.phpt +++ b/ext/simplexml/tests/018.phpt @@ -3,7 +3,7 @@ SimpleXML: iteration through subnodes and attributes --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $xml =<<<EOF <people> <person name="Joe"> diff --git a/ext/simplexml/tests/019.phpt b/ext/simplexml/tests/019.phpt index aec74ba42e..db15a69ff7 100644 --- a/ext/simplexml/tests/019.phpt +++ b/ext/simplexml/tests/019.phpt @@ -3,7 +3,7 @@ SimpleXML: foreach with children() --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $sxe = simplexml_load_string(<<<EOF <?xml version='1.0'?> diff --git a/ext/simplexml/tests/020.phpt b/ext/simplexml/tests/020.phpt index 9e91b5ac3a..40d04a7927 100644 --- a/ext/simplexml/tests/020.phpt +++ b/ext/simplexml/tests/020.phpt @@ -1,7 +1,7 @@ --TEST-- SimpleXML: Attribute compared to string --SKIPIF-- -<?php if (!extension_loaded("simplexml")) print "skip"; ?> +<?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- <?php diff --git a/ext/simplexml/tests/021.phpt b/ext/simplexml/tests/021.phpt index d5138685f5..c2b38d30ae 100644 --- a/ext/simplexml/tests/021.phpt +++ b/ext/simplexml/tests/021.phpt @@ -1,7 +1,7 @@ --TEST-- SimpleXML: Element check --SKIPIF-- -<?php if (!extension_loaded("simplexml")) print "skip"; ?> +<?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- <?php diff --git a/ext/simplexml/tests/022.phpt b/ext/simplexml/tests/022.phpt index 2af4a1dd28..338b61d0ed 100644 --- a/ext/simplexml/tests/022.phpt +++ b/ext/simplexml/tests/022.phpt @@ -3,7 +3,7 @@ SimpleXML: Attributes inside foreach --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $xml =<<<EOF <?xml version='1.0'?> diff --git a/ext/simplexml/tests/023.phpt b/ext/simplexml/tests/023.phpt index 515a1460c9..9ae6ec8813 100644 --- a/ext/simplexml/tests/023.phpt +++ b/ext/simplexml/tests/023.phpt @@ -3,7 +3,7 @@ SimpleXML: Attributes with entities --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $xml =<<<EOF <?xml version='1.0'?> diff --git a/ext/simplexml/tests/026.phpt b/ext/simplexml/tests/026.phpt index 7b6ca54183..cf17c7d513 100644 --- a/ext/simplexml/tests/026.phpt +++ b/ext/simplexml/tests/026.phpt @@ -3,7 +3,7 @@ SimpleXML: getName() --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $xml =<<<EOF <people> <person>Jane</person> diff --git a/ext/simplexml/tests/027.phpt b/ext/simplexml/tests/027.phpt index a531ccad46..193456aace 100644 --- a/ext/simplexml/tests/027.phpt +++ b/ext/simplexml/tests/027.phpt @@ -3,7 +3,7 @@ SimpleXML: Adding an elements --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $xml =<<<EOF <people></people> EOF; diff --git a/ext/simplexml/tests/028.phpt b/ext/simplexml/tests/028.phpt index 9adb923ddc..c68cfd21b9 100644 --- a/ext/simplexml/tests/028.phpt +++ b/ext/simplexml/tests/028.phpt @@ -3,7 +3,7 @@ SimpleXML: Adding an elements without text --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $xml =<<<EOF <people></people> EOF; diff --git a/ext/simplexml/tests/029.phpt b/ext/simplexml/tests/029.phpt index 117e6b7939..5a31c7d197 100644 --- a/ext/simplexml/tests/029.phpt +++ b/ext/simplexml/tests/029.phpt @@ -3,7 +3,7 @@ SimpleXML: foreach and count --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $xml =<<<EOF <people> <person name="Joe"/> diff --git a/ext/simplexml/tests/030.phpt b/ext/simplexml/tests/030.phpt index 774a5f1459..4d27f40ed1 100644 --- a/ext/simplexml/tests/030.phpt +++ b/ext/simplexml/tests/030.phpt @@ -3,7 +3,7 @@ SimpleXML: isset and unset by offset --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $xml =<<<EOF <root s:att1="b" att1="a" xmlns:s="urn::test" xmlns:t="urn::test-t"> diff --git a/ext/simplexml/tests/031.phpt b/ext/simplexml/tests/031.phpt index cd2d266ba1..143e57f59e 100644 --- a/ext/simplexml/tests/031.phpt +++ b/ext/simplexml/tests/031.phpt @@ -3,7 +3,7 @@ SimpleXML: addChild and addAttribute --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $xml =<<<EOF <root s:att1="b" att1="a" xmlns:s="urn::test" xmlns:t="urn::test-t"> diff --git a/ext/simplexml/tests/032.phpt b/ext/simplexml/tests/032.phpt index 55e2bc186d..c1d0b88b62 100644 --- a/ext/simplexml/tests/032.phpt +++ b/ext/simplexml/tests/032.phpt @@ -3,7 +3,7 @@ SimpleXML: comparing instances --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $xml =<<<EOF <people> <person name="Joe"/> diff --git a/ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt b/ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt index fc918798a5..5cdb88e09a 100644 --- a/ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt +++ b/ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt @@ -1,12 +1,12 @@ --TEST-- SimpleXMLElement->addAttribute() ---SKIPIF-- +--SKIPIF-- <?php if (!extension_loaded("simplexml")) die("skip"); ?> ---FILE-- +--FILE-- <?php $simple = simplexml_load_file(dirname(__FILE__)."/book.xml"); $simple->addAttribute('type','novels'); - + var_dump($simple->attributes()); echo "Done"; ?> diff --git a/ext/simplexml/tests/bug24392.phpt b/ext/simplexml/tests/bug24392.phpt index 0a462e5770..5bd133fd73 100644 --- a/ext/simplexml/tests/bug24392.phpt +++ b/ext/simplexml/tests/bug24392.phpt @@ -3,7 +3,7 @@ Bug #24392 (empty namespaces causing confusion) --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip simplexml extension is not loaded"; ?> --FILE-- -<?php +<?php $s = simplexml_load_file(dirname(__FILE__).'/bug24392.xml'); foreach ($s->item as $item) { echo $item->title . "\n"; diff --git a/ext/simplexml/tests/bug36611.phpt b/ext/simplexml/tests/bug36611.phpt index fdcfd4743c..eb202671ca 100644 --- a/ext/simplexml/tests/bug36611.phpt +++ b/ext/simplexml/tests/bug36611.phpt @@ -24,7 +24,7 @@ var_dump($val) ; ?> ===DONE=== ---EXPECT-- +--EXPECT-- int(1) int(1) ===DONE=== diff --git a/ext/simplexml/tests/bug38347.phpt b/ext/simplexml/tests/bug38347.phpt index 0ea7b5d2fe..c6b5bf7fac 100644 --- a/ext/simplexml/tests/bug38347.phpt +++ b/ext/simplexml/tests/bug38347.phpt @@ -19,7 +19,7 @@ iterate($xml->unknown); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- SimpleXMLElement Object ( ) diff --git a/ext/simplexml/tests/bug38354.phpt b/ext/simplexml/tests/bug38354.phpt index 04ed8f2823..7bd18fe649 100644 --- a/ext/simplexml/tests/bug38354.phpt +++ b/ext/simplexml/tests/bug38354.phpt @@ -10,14 +10,14 @@ $xml = simplexml_load_string( <a href="javascript:alert(\'1\');"><strong>Item Two</strong></a> </code>' ); - + foreach ($xml->xpath("//*") as $element) { var_dump($element->asXML()); } echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(101) "<?xml version="1.0"?> <code> <a href="javascript:alert('1');"><strong>Item Two</strong></a> diff --git a/ext/simplexml/tests/bug38406.phpt b/ext/simplexml/tests/bug38406.phpt index c64b52b847..ea92229496 100644 --- a/ext/simplexml/tests/bug38406.phpt +++ b/ext/simplexml/tests/bug38406.phpt @@ -17,7 +17,7 @@ $item->$a = new stdclass; echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- object(SimpleXMLElement)#%d (1) { [0]=> string(9) "something" diff --git a/ext/simplexml/tests/bug38424.phpt b/ext/simplexml/tests/bug38424.phpt index baab45fe54..560b613c01 100644 --- a/ext/simplexml/tests/bug38424.phpt +++ b/ext/simplexml/tests/bug38424.phpt @@ -21,6 +21,6 @@ $xml["a4"] = $str ; echo $xml->asXML(); ?> ---EXPECT-- +--EXPECT-- <?xml version="1.0"?> <xml a1="abc &amp; def" a2="abc &amp; def" a3="abc & def" a4="abc & def"/> diff --git a/ext/simplexml/tests/bug39662.phpt b/ext/simplexml/tests/bug39662.phpt index ae15f2ef0a..b07e90064f 100644 --- a/ext/simplexml/tests/bug39662.phpt +++ b/ext/simplexml/tests/bug39662.phpt @@ -18,7 +18,7 @@ var_dump($clone->asXML()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- object(SimpleXMLElement)#%d (1) { [0]=> string(2) " diff --git a/ext/simplexml/tests/bug39760.phpt b/ext/simplexml/tests/bug39760.phpt index e781765fa0..409b43a316 100644 --- a/ext/simplexml/tests/bug39760.phpt +++ b/ext/simplexml/tests/bug39760.phpt @@ -24,7 +24,7 @@ var_dump($test3); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- object(SimpleXMLElement)#%d (1) { [0]=> string(5) "text1" diff --git a/ext/simplexml/tests/bug40451.phpt b/ext/simplexml/tests/bug40451.phpt index afd78c769f..cf44926a5e 100644 --- a/ext/simplexml/tests/bug40451.phpt +++ b/ext/simplexml/tests/bug40451.phpt @@ -19,6 +19,6 @@ $add->Host->addAttribute('enable', 'true'); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- Warning: SimpleXMLElement::addAttribute(): Unable to locate parent Element in %s on line %d ===DONE=== diff --git a/ext/simplexml/tests/bug41175.phpt b/ext/simplexml/tests/bug41175.phpt index db03da977e..432f217b16 100644 --- a/ext/simplexml/tests/bug41175.phpt +++ b/ext/simplexml/tests/bug41175.phpt @@ -12,7 +12,7 @@ echo $xml->asXML(); ?> ===DONE=== ---EXPECT-- +--EXPECT-- <?xml version="1.0"?> <img src="foo" alt=""/> ===DONE===
\ No newline at end of file diff --git a/ext/simplexml/tests/bug46048.phpt b/ext/simplexml/tests/bug46048.phpt index 97fc9ed083..3a3e7d54ef 100644 --- a/ext/simplexml/tests/bug46048.phpt +++ b/ext/simplexml/tests/bug46048.phpt @@ -13,7 +13,7 @@ $obj = simplexml_load_string($xml); print_r(get_object_vars($obj)); ?> ===DONE=== ---EXPECT-- +--EXPECT-- Array ( [@attributes] => Array diff --git a/ext/simplexml/tests/bug51615.phpt b/ext/simplexml/tests/bug51615.phpt index c96b3ae7ca..b935414b80 100644 --- a/ext/simplexml/tests/bug51615.phpt +++ b/ext/simplexml/tests/bug51615.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #51615 (PHP crash with wrong HTML in SimpleXML) --SKIPIF-- -<?php if (!extension_loaded("simplexml")) print "skip"; +<?php if (!extension_loaded("simplexml")) print "skip"; if (!extension_loaded("dom")) print "skip"; ?> --FILE-- diff --git a/ext/simplexml/tests/feature55218.phpt b/ext/simplexml/tests/feature55218.phpt index c1489ed375..c5b09b4fb8 100644 --- a/ext/simplexml/tests/feature55218.phpt +++ b/ext/simplexml/tests/feature55218.phpt @@ -6,7 +6,7 @@ if (!extension_loaded("simplexml")) print "skip SimpleXML not present"; if (!extension_loaded("libxml")) print "skip LibXML not present"; ?> --FILE-- -<?php +<?php $x = new SimpleXMLElement( '<?xml version="1.0" standalone="yes"?> diff --git a/ext/simplexml/tests/profile01.phpt b/ext/simplexml/tests/profile01.phpt index 91b9544f66..f9628fd52b 100644 --- a/ext/simplexml/tests/profile01.phpt +++ b/ext/simplexml/tests/profile01.phpt @@ -3,7 +3,7 @@ SimpleXML [profile]: Accessing a simple node --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $root = simplexml_load_string('<?xml version="1.0"?> <root> <child>Hello</child> diff --git a/ext/simplexml/tests/profile02.phpt b/ext/simplexml/tests/profile02.phpt index 14b5bb86b2..f2e952bc36 100644 --- a/ext/simplexml/tests/profile02.phpt +++ b/ext/simplexml/tests/profile02.phpt @@ -3,7 +3,7 @@ SimpleXML [profile]: Accessing an array of subnodes --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $root = simplexml_load_string('<?xml version="1.0"?> <root> <child>Hello</child> diff --git a/ext/simplexml/tests/profile03.phpt b/ext/simplexml/tests/profile03.phpt index 14f1c5fe88..6215ec57b0 100644 --- a/ext/simplexml/tests/profile03.phpt +++ b/ext/simplexml/tests/profile03.phpt @@ -3,7 +3,7 @@ SimpleXML [profile]: Accessing an attribute --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $root = simplexml_load_string('<?xml version="1.0"?> <root> <child attribute="Sample" /> diff --git a/ext/simplexml/tests/profile04.phpt b/ext/simplexml/tests/profile04.phpt index 27714e9927..95907e8e65 100644 --- a/ext/simplexml/tests/profile04.phpt +++ b/ext/simplexml/tests/profile04.phpt @@ -3,7 +3,7 @@ SimpleXML [profile]: Accessing a namespaced element --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- -<?php +<?php $root = simplexml_load_string('<?xml version="1.0"?> <root xmlns:reserved="reserved-ns"> <reserved:child>Hello</reserved:child> diff --git a/ext/simplexml/tests/simplexml_import_dom.phpt b/ext/simplexml/tests/simplexml_import_dom.phpt index e108e0554d..9908988ee0 100644 --- a/ext/simplexml/tests/simplexml_import_dom.phpt +++ b/ext/simplexml/tests/simplexml_import_dom.phpt @@ -4,7 +4,7 @@ SimpleXML [interop]: simplexml_import_dom <?php if (!extension_loaded("simplexml")) die("skip"); ?> <?php if (!extension_loaded("dom")) die("skip dom extension not loaded"); ?> --FILE-- -<?php +<?php $dom = new domDocument; $dom->load(dirname(__FILE__)."/book.xml"); if(!$dom) { diff --git a/ext/simplexml/tests/simplexml_load_file.phpt b/ext/simplexml/tests/simplexml_load_file.phpt index 1442a0ed47..db4f3d115a 100644 --- a/ext/simplexml/tests/simplexml_load_file.phpt +++ b/ext/simplexml/tests/simplexml_load_file.phpt @@ -1,11 +1,11 @@ --TEST-- simplexml_load_file() ---SKIPIF-- +--SKIPIF-- <?php if (!extension_loaded("simplexml")) die("skip"); ?> ---FILE-- +--FILE-- <?php $simple = simplexml_load_file(dirname(__FILE__)."/book.xml"); - + var_dump($simple); echo "Done"; ?> diff --git a/ext/simplexml/tests/sxe_001.phpt b/ext/simplexml/tests/sxe_001.phpt index be293efb39..fdc0335bd5 100644 --- a/ext/simplexml/tests/sxe_001.phpt +++ b/ext/simplexml/tests/sxe_001.phpt @@ -6,7 +6,7 @@ if (!extension_loaded("simplexml")) print "skip SimpleXML not present"; if (!extension_loaded("libxml")) print "skip LibXML not present"; ?> --FILE-- -<?php +<?php $xml =<<<EOF <?xml version='1.0'?> diff --git a/ext/simplexml/tests/sxe_002.phpt b/ext/simplexml/tests/sxe_002.phpt index aff3f83844..73db596789 100644 --- a/ext/simplexml/tests/sxe_002.phpt +++ b/ext/simplexml/tests/sxe_002.phpt @@ -1,12 +1,12 @@ --TEST-- SPL: SimpleXMLIterator and recursion --SKIPIF-- -<?php +<?php if (!extension_loaded('simplexml')) print 'skip'; if (!extension_loaded("libxml")) print "skip LibXML not present"; ?> --FILE-- -<?php +<?php $xml =<<<EOF <?xml version='1.0'?> diff --git a/ext/simplexml/tests/sxe_003.phpt b/ext/simplexml/tests/sxe_003.phpt index 8a45071dd2..583242a61e 100644 --- a/ext/simplexml/tests/sxe_003.phpt +++ b/ext/simplexml/tests/sxe_003.phpt @@ -1,12 +1,12 @@ --TEST-- SPL: SimpleXMLIterator and getChildren() --SKIPIF-- -<?php +<?php if (!extension_loaded('simplexml')) print 'skip'; if (!extension_loaded("libxml")) print "skip LibXML not present"; ?> --FILE-- -<?php +<?php $xml =<<<EOF <?xml version='1.0'?> diff --git a/ext/simplexml/tests/sxe_004.phpt b/ext/simplexml/tests/sxe_004.phpt index 15b9a53aae..8b86eff375 100644 --- a/ext/simplexml/tests/sxe_004.phpt +++ b/ext/simplexml/tests/sxe_004.phpt @@ -1,12 +1,12 @@ --TEST-- SPL: SimpleXMLIterator and overridden iterator methods() --SKIPIF-- -<?php +<?php if (!extension_loaded('simplexml')) print 'skip'; if (!extension_loaded("libxml")) print "skip LibXML not present"; ?> --FILE-- -<?php +<?php $xml =<<<EOF <?xml version='1.0'?> diff --git a/ext/simplexml/tests/sxe_005.phpt b/ext/simplexml/tests/sxe_005.phpt index 8763085a09..d13d3d73d4 100644 --- a/ext/simplexml/tests/sxe_005.phpt +++ b/ext/simplexml/tests/sxe_005.phpt @@ -1,12 +1,12 @@ --TEST-- SPL: SimpleXMLIterator and overriden count() --SKIPIF-- -<?php +<?php if (!extension_loaded('simplexml')) print 'skip'; if (!extension_loaded("libxml")) print "skip LibXML not present"; ?> --FILE-- -<?php +<?php $xml =<<<EOF <?xml version='1.0'?> diff --git a/ext/skeleton/tests/001.phpt b/ext/skeleton/tests/001.phpt index 445a914936..f03f8a01be 100644 --- a/ext/skeleton/tests/001.phpt +++ b/ext/skeleton/tests/001.phpt @@ -7,7 +7,7 @@ if (!extension_loaded('%EXTNAME%')) { } ?> --FILE-- -<?php +<?php echo 'The extension "%EXTNAME%" is available'; ?> --EXPECT-- diff --git a/ext/skeleton/tests/002.phpt b/ext/skeleton/tests/002.phpt index 0147087ace..da550f27f8 100644 --- a/ext/skeleton/tests/002.phpt +++ b/ext/skeleton/tests/002.phpt @@ -7,7 +7,7 @@ if (!extension_loaded('%EXTNAME%')) { } ?> --FILE-- -<?php +<?php $ret = %EXTNAME%_test1(); var_dump($ret); diff --git a/ext/skeleton/tests/003.phpt b/ext/skeleton/tests/003.phpt index d5a0905fa9..84c9fe1602 100644 --- a/ext/skeleton/tests/003.phpt +++ b/ext/skeleton/tests/003.phpt @@ -7,7 +7,7 @@ if (!extension_loaded('%EXTNAME%')) { } ?> --FILE-- -<?php +<?php var_dump(%EXTNAME%_test2()); var_dump(%EXTNAME%_test2('PHP')); ?> diff --git a/ext/snmp/tests/bug60749.phpt b/ext/snmp/tests/bug60749.phpt index 2ce1ca3488..c31981c5af 100644 --- a/ext/snmp/tests/bug60749.phpt +++ b/ext/snmp/tests/bug60749.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- Bug #60749: SNMP module should not strip non-standard SNMP port from hostname --CREDITS-- Boris Lytochkin diff --git a/ext/snmp/tests/bug64124.phpt b/ext/snmp/tests/bug64124.phpt index 8b29a38c59..b5b8f80603 100644 --- a/ext/snmp/tests/bug64124.phpt +++ b/ext/snmp/tests/bug64124.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- Bug #64124 IPv6 malformed --CREDITS-- Boris Lytochkin diff --git a/ext/snmp/tests/bug64159.phpt b/ext/snmp/tests/bug64159.phpt index 52e53c957f..0eee4e3295 100644 --- a/ext/snmp/tests/bug64159.phpt +++ b/ext/snmp/tests/bug64159.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- Bug #64159: Truncated snmpget --CREDITS-- Boris Lytochkin diff --git a/ext/snmp/tests/bug72479.phpt b/ext/snmp/tests/bug72479.phpt index 0308754360..c4bb621e66 100644 --- a/ext/snmp/tests/bug72479.phpt +++ b/ext/snmp/tests/bug72479.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- Bug #72479: Use After Free Vulnerability in SNMP with GC and unserialize() --SKIPIF-- <?php diff --git a/ext/snmp/tests/generic_timeout_error.phpt b/ext/snmp/tests/generic_timeout_error.phpt index c333a0d20b..adcc3a7299 100644 --- a/ext/snmp/tests/generic_timeout_error.phpt +++ b/ext/snmp/tests/generic_timeout_error.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- Generic timeout (wrong community) --CREDITS-- Boris Lytochkin diff --git a/ext/snmp/tests/ipv6.phpt b/ext/snmp/tests/ipv6.phpt index aaa3304e87..1cda76565c 100644 --- a/ext/snmp/tests/ipv6.phpt +++ b/ext/snmp/tests/ipv6.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- IPv6 support --CREDITS-- Boris Lytochkin diff --git a/ext/snmp/tests/snmp-object-errno-errstr.phpt b/ext/snmp/tests/snmp-object-errno-errstr.phpt index 8ea5fe2416..32c49c4fb5 100644 --- a/ext/snmp/tests/snmp-object-errno-errstr.phpt +++ b/ext/snmp/tests/snmp-object-errno-errstr.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- OO API: getErrno & getError methods --CREDITS-- Boris Lytochkin diff --git a/ext/snmp/tests/snmp-object-error.phpt b/ext/snmp/tests/snmp-object-error.phpt index 31908921da..1445971e18 100644 --- a/ext/snmp/tests/snmp-object-error.phpt +++ b/ext/snmp/tests/snmp-object-error.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- OO API: Generic errors --CREDITS-- Boris Lytochkin diff --git a/ext/snmp/tests/snmp-object-properties.phpt b/ext/snmp/tests/snmp-object-properties.phpt index 9e6b0d5956..a214152b9b 100644 --- a/ext/snmp/tests/snmp-object-properties.phpt +++ b/ext/snmp/tests/snmp-object-properties.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- OO API: SNMP object properties --CREDITS-- Boris Lytochkin diff --git a/ext/snmp/tests/snmp-object-setSecurity_error.phpt b/ext/snmp/tests/snmp-object-setSecurity_error.phpt index fc3a1b2269..3fd14f2a5c 100644 --- a/ext/snmp/tests/snmp-object-setSecurity_error.phpt +++ b/ext/snmp/tests/snmp-object-setSecurity_error.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- OO API: SNMP::setSecurity (errors) --CREDITS-- Boris Lytochkin diff --git a/ext/snmp/tests/snmp-object.phpt b/ext/snmp/tests/snmp-object.phpt index 40567dae9d..df1c8dce0c 100644 --- a/ext/snmp/tests/snmp-object.phpt +++ b/ext/snmp/tests/snmp-object.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- OO API --CREDITS-- Boris Lytochkin diff --git a/ext/snmp/tests/snmp2_get.phpt b/ext/snmp/tests/snmp2_get.phpt index 7a9aca84cc..93d58dad0d 100644 --- a/ext/snmp/tests/snmp2_get.phpt +++ b/ext/snmp/tests/snmp2_get.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- Function snmp2_get --CREDITS-- Olivier Doucet & Boris Lytochkin diff --git a/ext/snmp/tests/snmp2_getnext.phpt b/ext/snmp/tests/snmp2_getnext.phpt index 45701cbd13..72ce02d945 100644 --- a/ext/snmp/tests/snmp2_getnext.phpt +++ b/ext/snmp/tests/snmp2_getnext.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- Function snmp2_getnext --CREDITS-- Olivier Doucet & Boris Lytochkin diff --git a/ext/snmp/tests/snmp2_real_walk.phpt b/ext/snmp/tests/snmp2_real_walk.phpt index d9bca8a4e9..7cfafc073d 100644 --- a/ext/snmp/tests/snmp2_real_walk.phpt +++ b/ext/snmp/tests/snmp2_real_walk.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- Function snmp2_real_walk --CREDITS-- Olivier Doucet Olivier Doucet Boris Lytochkin diff --git a/ext/snmp/tests/snmp2_set-nomib.phpt b/ext/snmp/tests/snmp2_set-nomib.phpt index e1714d6ab9..6000c9c0e7 100644 --- a/ext/snmp/tests/snmp2_set-nomib.phpt +++ b/ext/snmp/tests/snmp2_set-nomib.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- Function snmp2_set (without MIBs loading) --CREDITS-- Boris Lytockin diff --git a/ext/snmp/tests/snmp2_set.phpt b/ext/snmp/tests/snmp2_set.phpt index ee46fe29a3..b418a714f2 100644 --- a/ext/snmp/tests/snmp2_set.phpt +++ b/ext/snmp/tests/snmp2_set.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- Function snmp2_set --CREDITS-- Boris Lytochkin diff --git a/ext/snmp/tests/snmp2_walk.phpt b/ext/snmp/tests/snmp2_walk.phpt index a9c1f55ba9..5164a219f4 100644 --- a/ext/snmp/tests/snmp2_walk.phpt +++ b/ext/snmp/tests/snmp2_walk.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- Function snmp2_walk --CREDITS-- Olivier Doucet Olivier Doucet Boris Lytochkin diff --git a/ext/snmp/tests/snmp3-error.phpt b/ext/snmp/tests/snmp3-error.phpt index 3c0c499221..b78a1f784e 100644 --- a/ext/snmp/tests/snmp3-error.phpt +++ b/ext/snmp/tests/snmp3-error.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- SNMPv3 Support (errors) --CREDITS-- Boris Lytochkin diff --git a/ext/snmp/tests/snmp3.phpt b/ext/snmp/tests/snmp3.phpt index b863d0e079..f4177b9562 100644 --- a/ext/snmp/tests/snmp3.phpt +++ b/ext/snmp/tests/snmp3.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- SNMPv3 Support --CREDITS-- Boris Lytochkin diff --git a/ext/snmp/tests/snmp_get_quick_print.phpt b/ext/snmp/tests/snmp_get_quick_print.phpt index f88df7d618..bc842aba4f 100644 --- a/ext/snmp/tests/snmp_get_quick_print.phpt +++ b/ext/snmp/tests/snmp_get_quick_print.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- Function snmp_get_quick_print / snmp_set_quick_print --CREDITS-- Olivier Doucet diff --git a/ext/snmp/tests/snmp_get_valueretrieval.phpt b/ext/snmp/tests/snmp_get_valueretrieval.phpt index 74202bc693..99de42a647 100644 --- a/ext/snmp/tests/snmp_get_valueretrieval.phpt +++ b/ext/snmp/tests/snmp_get_valueretrieval.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- Function snmp_get_valueretrieval / snmp_set_valueretrieval --CREDITS-- Olivier Doucet diff --git a/ext/snmp/tests/snmp_getvalue.phpt b/ext/snmp/tests/snmp_getvalue.phpt index 178354a8cf..7cc5428704 100644 --- a/ext/snmp/tests/snmp_getvalue.phpt +++ b/ext/snmp/tests/snmp_getvalue.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- Function snmp_getvalue --CREDITS-- Boris Lytochkin diff --git a/ext/snmp/tests/snmp_read_mib.phpt b/ext/snmp/tests/snmp_read_mib.phpt index 9a6d3b5e5b..ef2edaeba1 100644 --- a/ext/snmp/tests/snmp_read_mib.phpt +++ b/ext/snmp/tests/snmp_read_mib.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- Function snmp_read_mib --CREDITS-- Olivier Doucet Olivier Doucet Boris Lytochkin diff --git a/ext/snmp/tests/snmp_set_enum_print.phpt b/ext/snmp/tests/snmp_set_enum_print.phpt index 97683444fe..6f8dcce1c2 100644 --- a/ext/snmp/tests/snmp_set_enum_print.phpt +++ b/ext/snmp/tests/snmp_set_enum_print.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- Function snmp_set_enum_print --CREDITS-- Olivier Doucet diff --git a/ext/snmp/tests/snmp_set_oid_output_format.phpt b/ext/snmp/tests/snmp_set_oid_output_format.phpt index 20a48d4fe1..06c2240a78 100644 --- a/ext/snmp/tests/snmp_set_oid_output_format.phpt +++ b/ext/snmp/tests/snmp_set_oid_output_format.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- Function snmp_set_oid_output_format --CREDITS-- Olivier Doucet diff --git a/ext/snmp/tests/snmpget.phpt b/ext/snmp/tests/snmpget.phpt index 8b4eb8af06..04a11afd4a 100644 --- a/ext/snmp/tests/snmpget.phpt +++ b/ext/snmp/tests/snmpget.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- Function snmpget --CREDITS-- Olivier Doucet & Boris Lytochkin diff --git a/ext/snmp/tests/snmpgetnext.phpt b/ext/snmp/tests/snmpgetnext.phpt index 2c868bfcd1..de5f8d8ccf 100644 --- a/ext/snmp/tests/snmpgetnext.phpt +++ b/ext/snmp/tests/snmpgetnext.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- Function snmpgetnext --CREDITS-- Olivier Doucet & Boris Lytochkin diff --git a/ext/snmp/tests/snmprealwalk.phpt b/ext/snmp/tests/snmprealwalk.phpt index 8ded5297fd..8b2941f581 100644 --- a/ext/snmp/tests/snmprealwalk.phpt +++ b/ext/snmp/tests/snmprealwalk.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- Function snmprealwalk --CREDITS-- Olivier Doucet Olivier Doucet Boris Lytochkin diff --git a/ext/snmp/tests/snmpset-nomib.phpt b/ext/snmp/tests/snmpset-nomib.phpt index 7b72bff979..54b2be5871 100644 --- a/ext/snmp/tests/snmpset-nomib.phpt +++ b/ext/snmp/tests/snmpset-nomib.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- Function snmpset (without MIBs loading) --CREDITS-- Boris Lytochkin diff --git a/ext/snmp/tests/snmpset.phpt b/ext/snmp/tests/snmpset.phpt index f1692cf327..a4e22f247b 100644 --- a/ext/snmp/tests/snmpset.phpt +++ b/ext/snmp/tests/snmpset.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- Function snmpset --CREDITS-- Olivier Doucet Olivier Doucet Boris Lytochkin diff --git a/ext/snmp/tests/snmpwalk.phpt b/ext/snmp/tests/snmpwalk.phpt index 5038e09712..efe7b4e317 100644 --- a/ext/snmp/tests/snmpwalk.phpt +++ b/ext/snmp/tests/snmpwalk.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- Function snmpwalk --CREDITS-- Olivier Doucet Olivier Doucet Boris Lytochkin diff --git a/ext/snmp/tests/wrong_hostname.phpt b/ext/snmp/tests/wrong_hostname.phpt index 23424764b8..29e8971e58 100644 --- a/ext/snmp/tests/wrong_hostname.phpt +++ b/ext/snmp/tests/wrong_hostname.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- Wrong hostname --CREDITS-- Boris Lytochkin diff --git a/ext/soap/tests/bug73037.phpt b/ext/soap/tests/bug73037.phpt index e68f621607..4ceb694aea 100644 --- a/ext/soap/tests/bug73037.phpt +++ b/ext/soap/tests/bug73037.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #73037 SoapServer reports Bad Request when gzipped, var 0 --SKIPIF-- -<?php +<?php require_once('skipif.inc'); if (!extension_loaded("zlib")) { echo "skip zlib is required for this test"; @@ -92,7 +92,7 @@ Expect: 100-continue Content-Length: ${len} HDRS; if ($b) { - $hdrs .="\nContent-Encoding: gzip"; + $hdrs .="\nContent-Encoding: gzip"; } //echo "Headers sent:\n$hdrs\n\n"; $fp = fsockopen(PHP_CLI_SERVER_HOSTNAME, PHP_CLI_SERVER_PORT, $errno, $errstr, 5); diff --git a/ext/soap/tests/bugs/bug29061.phpt b/ext/soap/tests/bugs/bug29061.phpt index a85a7aa1ba..0ded544b94 100644 --- a/ext/soap/tests/bugs/bug29061.phpt +++ b/ext/soap/tests/bugs/bug29061.phpt @@ -6,8 +6,8 @@ Bug #29061 (soap extension segfaults) soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/bug29061.wsdl", array("exceptions"=>0)); -$client->getQuote("ibm"); +$client = new SoapClient(dirname(__FILE__)."/bug29061.wsdl", array("exceptions"=>0)); +$client->getQuote("ibm"); echo "ok\n"; ?> --EXPECT-- diff --git a/ext/soap/tests/bugs/bug29109.phpt b/ext/soap/tests/bugs/bug29109.phpt index 3b13974d07..f16b4c5851 100644 --- a/ext/soap/tests/bugs/bug29109.phpt +++ b/ext/soap/tests/bugs/bug29109.phpt @@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php $client = new SoapClient(dirname(__FILE__)."/bug29109.wsdl"); -var_dump($client->__getFunctions()); +var_dump($client->__getFunctions()); ?> --EXPECT-- array(1) { diff --git a/ext/soap/tests/bugs/bug29236.phpt b/ext/soap/tests/bugs/bug29236.phpt index 7b7628d3de..659a8293db 100644 --- a/ext/soap/tests/bugs/bug29236.phpt +++ b/ext/soap/tests/bugs/bug29236.phpt @@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=1 --FILE-- <?php $client = new SoapClient(dirname(__FILE__)."/bug29236.wsdl"); -var_dump($client->__getFunctions()); +var_dump($client->__getFunctions()); ?> --EXPECT-- array(4) { diff --git a/ext/soap/tests/bugs/bug29830.phpt b/ext/soap/tests/bugs/bug29830.phpt index dc090f82cc..adbbd7ffa5 100644 --- a/ext/soap/tests/bugs/bug29830.phpt +++ b/ext/soap/tests/bugs/bug29830.phpt @@ -5,13 +5,13 @@ Bug #29844 (SoapServer::setClass() should not export non-public methods) --FILE-- <?php -class hello_world { +class hello_world { public function hello($to) { return 'Hello ' . $to; - } + } private function bye($to) { return 'Bye ' . $to; - } + } } $server = new SoapServer(NULL, array("uri"=>"test://")); diff --git a/ext/soap/tests/bugs/bug29839.phpt b/ext/soap/tests/bugs/bug29839.phpt index 11d924ec78..8bead388fa 100644 --- a/ext/soap/tests/bugs/bug29839.phpt +++ b/ext/soap/tests/bugs/bug29839.phpt @@ -29,7 +29,7 @@ class LocalSoapClient extends SoapClient { } -$client = new LocalSoapClient(dirname(__FILE__)."/bug29839.wsdl", array("trace"=>1)); +$client = new LocalSoapClient(dirname(__FILE__)."/bug29839.wsdl", array("trace"=>1)); $client->EchoString(array("value"=>"hello","lang"=>"en")); echo $client->__getLastRequest(); echo $client->__getLastResponse(); diff --git a/ext/soap/tests/bugs/bug29844.phpt b/ext/soap/tests/bugs/bug29844.phpt index a3006639b1..26f1151a93 100644 --- a/ext/soap/tests/bugs/bug29844.phpt +++ b/ext/soap/tests/bugs/bug29844.phpt @@ -7,10 +7,10 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php -class hello_world { +class hello_world { public function hello($to) { return 'Hello ' . $to; - } + } } class LocalSoapClient extends SoapClient { @@ -31,7 +31,7 @@ class LocalSoapClient extends SoapClient { } -$client = new LocalSoapClient(dirname(__FILE__)."/bug29844.wsdl", array("trace"=>1)); +$client = new LocalSoapClient(dirname(__FILE__)."/bug29844.wsdl", array("trace"=>1)); var_dump($client->hello('davey')); ?> --EXPECT-- diff --git a/ext/soap/tests/bugs/bug30045.phpt b/ext/soap/tests/bugs/bug30045.phpt index 281f958202..21889c2fd1 100644 --- a/ext/soap/tests/bugs/bug30045.phpt +++ b/ext/soap/tests/bugs/bug30045.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #30045 (Cannot pass big integers (> 2147483647) in SOAP requests) --SKIPIF-- -<?php +<?php if (!extension_loaded('soap')) die('skip soap extension not available'); if (!extension_loaded('simplexml')) die('skip simplexml extension not available'); ?> @@ -42,7 +42,7 @@ $soap = new LocalSoapClient(NULL, array("uri"=>"http://test-uri", "location"=>"t function test($type, $num) { global $soap; try { - printf(" %0.0f\n ", $num); + printf(" %0.0f\n ", $num); $ret = $soap->foo($type, new SoapVar($num, $type)); printf(" %0.0f\n", $ret); } catch (SoapFault $ex) { @@ -127,7 +127,7 @@ test(XSD_LONG, 2147483647); test(XSD_LONG, 2147483648); test(XSD_LONG, 4294967296); test(XSD_LONG, 8589934592); -test(XSD_LONG, 17179869184); +test(XSD_LONG, 17179869184); echo "\nunsignedLong\n"; test(XSD_UNSIGNEDLONG, 2147483647); diff --git a/ext/soap/tests/bugs/bug30106.phpt b/ext/soap/tests/bugs/bug30106.phpt index 2104c6d409..3444812623 100644 --- a/ext/soap/tests/bugs/bug30106.phpt +++ b/ext/soap/tests/bugs/bug30106.phpt @@ -16,7 +16,7 @@ class LocalSoapClient extends SoapClient { function __construct($wsdl, $options=array()) { parent::__construct($wsdl, $options); $this->server = new SoapServer($wsdl, $options); - $this->server->addFunction("getContinentList"); + $this->server->addFunction("getContinentList"); } function __doRequest($request, $location, $action, $version, $one_way = 0) { diff --git a/ext/soap/tests/bugs/bug30799.phpt b/ext/soap/tests/bugs/bug30799.phpt index fe7c8ca731..92fd40f452 100644 --- a/ext/soap/tests/bugs/bug30799.phpt +++ b/ext/soap/tests/bugs/bug30799.phpt @@ -8,7 +8,7 @@ class foo { public $a="a"; private $b="b"; protected $c="c"; - + } $x = new SoapClient(NULL,array("location"=>"test://", diff --git a/ext/soap/tests/bugs/bug30928.phpt b/ext/soap/tests/bugs/bug30928.phpt index 0f473b359e..e1fe17a359 100644 --- a/ext/soap/tests/bugs/bug30928.phpt +++ b/ext/soap/tests/bugs/bug30928.phpt @@ -33,11 +33,11 @@ class LocalSoapClient extends SoapClient { } } -$x = new LocalSoapClient(dirname(__FILE__)."/bug30928.wsdl", +$x = new LocalSoapClient(dirname(__FILE__)."/bug30928.wsdl", array()); var_dump($x->test(new foo())); -$x = new LocalSoapClient(dirname(__FILE__)."/bug30928.wsdl", +$x = new LocalSoapClient(dirname(__FILE__)."/bug30928.wsdl", array("classmap" => array('testType'=>'foo'))); var_dump($x->test(new foo())); diff --git a/ext/soap/tests/bugs/bug30994.phpt b/ext/soap/tests/bugs/bug30994.phpt index 28e3b923cd..afd5018a38 100644 --- a/ext/soap/tests/bugs/bug30994.phpt +++ b/ext/soap/tests/bugs/bug30994.phpt @@ -20,16 +20,16 @@ soap:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"> <function xsi:type="xsd:string">TASKTEST</function> <parameter href="#id1" /> </q1:bassCall> - + <soapenc:Array id="id1" soapenc:arrayType="tns:Item[1]"> <Item href="#id2" /> </soapenc:Array> - + <tns:Item id="id2" xsi:type="tns:Item"> <key xsi:type="xsd:string">ABCabc123</key> <val xsi:type="xsd:string">123456</val> </tns:Item> - + </soap:Body> </soap:Envelope> EOF; diff --git a/ext/soap/tests/bugs/bug31695.phpt b/ext/soap/tests/bugs/bug31695.phpt index 9def103726..6d3fae0d25 100644 --- a/ext/soap/tests/bugs/bug31695.phpt +++ b/ext/soap/tests/bugs/bug31695.phpt @@ -14,7 +14,7 @@ class LocalSoapClient extends SoapClient { function __construct($wsdl, $options=array()) { parent::__construct($wsdl, $options); $this->server = new SoapServer($wsdl, $options); - $this->server->addFunction("Test"); + $this->server->addFunction("Test"); } function __doRequest($request, $location, $action, $version, $one_way = 0) { @@ -31,7 +31,7 @@ $client = new LocalSoapClient(dirname(__FILE__)."/bug31695.wsdl"); $client->Test("str"); $client = new LocalSoapClient(dirname(__FILE__)."/bug31695.wsdl", array("location"=>"test://1")); $client->Test("str"); -$client->__soapCall("Test", +$client->__soapCall("Test", array("arg1"), array("location"=>"test://2")); $old = $client->__setLocation("test://3"); diff --git a/ext/soap/tests/bugs/bug32776.phpt b/ext/soap/tests/bugs/bug32776.phpt index 6dc94661ae..ae863bd339 100644 --- a/ext/soap/tests/bugs/bug32776.phpt +++ b/ext/soap/tests/bugs/bug32776.phpt @@ -32,7 +32,7 @@ class LocalSoapClient extends SoapClient { } -$x = new LocalSoapClient(dirname(__FILE__)."/bug32776.wsdl",array("trace"=>true,"exceptions"=>false)); +$x = new LocalSoapClient(dirname(__FILE__)."/bug32776.wsdl",array("trace"=>true,"exceptions"=>false)); var_dump($x->test("Hello")); var_dump($d); var_dump($x->__getLastRequest()); diff --git a/ext/soap/tests/bugs/bug34453.phpt b/ext/soap/tests/bugs/bug34453.phpt index 0f9543b715..0a9dd80179 100644 --- a/ext/soap/tests/bugs/bug34453.phpt +++ b/ext/soap/tests/bugs/bug34453.phpt @@ -29,7 +29,7 @@ class LocalSoapClient extends SoapClient { } -$client = new LocalSoapClient(dirname(__FILE__)."/bug34453.wsdl", array("trace"=>1)); +$client = new LocalSoapClient(dirname(__FILE__)."/bug34453.wsdl", array("trace"=>1)); $client->EchoString(array("value"=>"hello","lang"=>"en")); echo $client->__getLastRequest(); echo $client->__getLastResponse(); diff --git a/ext/soap/tests/bugs/bug36908.phpt b/ext/soap/tests/bugs/bug36908.phpt index cd0ea8b2e5..2d2a46410c 100644 --- a/ext/soap/tests/bugs/bug36908.phpt +++ b/ext/soap/tests/bugs/bug36908.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #36908 (wsdl default value overrides value in soap request) --SKIPIF-- -<?php +<?php if (!extension_loaded('soap')) die('skip soap extension not available'); ?> --INI-- diff --git a/ext/soap/tests/bugs/bug36999.phpt b/ext/soap/tests/bugs/bug36999.phpt index 9fbb032d8f..eed02ecf0b 100644 --- a/ext/soap/tests/bugs/bug36999.phpt +++ b/ext/soap/tests/bugs/bug36999.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #36999 (xsd:long values clamped to LONG_MAX instead of using double) --SKIPIF-- -<?php +<?php if (!extension_loaded('soap')) die('skip soap extension not available'); ?> --INI-- diff --git a/ext/soap/tests/bugs/bug37013.phpt b/ext/soap/tests/bugs/bug37013.phpt index 45f314293b..7c0546ba2d 100644 --- a/ext/soap/tests/bugs/bug37013.phpt +++ b/ext/soap/tests/bugs/bug37013.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #37013 (server hangs when returning circular object references) --SKIPIF-- -<?php +<?php if (!extension_loaded('soap')) die('skip soap extension not available'); ?> --INI-- diff --git a/ext/soap/tests/bugs/bug39815.phpt b/ext/soap/tests/bugs/bug39815.phpt index 847c37161b..57b429ec43 100644 --- a/ext/soap/tests/bugs/bug39815.phpt +++ b/ext/soap/tests/bugs/bug39815.phpt @@ -1,8 +1,8 @@ --TEST-- Bug #39815 (to_zval_double() in ext/soap/php_encoding.c is not locale-independent) --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); if (!@setlocale(LC_ALL, 'sv_SE', 'sv_SE.ISO8859-1')) die('skip sv_SE locale not available'); if (!@setlocale(LC_ALL, 'en_US', 'en_US.ISO8859-1')) die('skip en_US locale not available'); ?> @@ -31,9 +31,9 @@ class LocalSoapClient extends SoapClient { } } -$x = new LocalSoapClient(NULL,array('location'=>'test://', +$x = new LocalSoapClient(NULL,array('location'=>'test://', 'uri'=>'http://testuri.org', - "trace"=>1)); + "trace"=>1)); setlocale(LC_ALL,"sv_SE","sv_SE.ISO8859-1"); var_dump($x->test()); echo $x->__getLastResponse(); diff --git a/ext/soap/tests/bugs/bug41004.phpt b/ext/soap/tests/bugs/bug41004.phpt index 992c6b708d..87ab88598e 100644 --- a/ext/soap/tests/bugs/bug41004.phpt +++ b/ext/soap/tests/bugs/bug41004.phpt @@ -9,7 +9,7 @@ ini_set('soap.wsdl_cache_enabled', false); class EchoBean{ public $mandatoryElement; public $optionalElement; - + } class EchoRequest{ diff --git a/ext/soap/tests/bugs/bug42086.phpt b/ext/soap/tests/bugs/bug42086.phpt index 6edc06f879..35e5ef0e07 100644 --- a/ext/soap/tests/bugs/bug42086.phpt +++ b/ext/soap/tests/bugs/bug42086.phpt @@ -20,7 +20,7 @@ function firstFunctionWithoutParam() { $ret->param = "firstFunctionWithoutParam"; return $ret; } - + $server = new SoapServer(dirname(__FILE__).'/bug42086.wsdl', array('features'=>SOAP_SINGLE_ELEMENT_ARRAYS)); $server->addFunction('firstFunctionWithoutParam'); diff --git a/ext/soap/tests/bugs/bug42183.phpt b/ext/soap/tests/bugs/bug42183.phpt index d34311f26c..043487c964 100644 --- a/ext/soap/tests/bugs/bug42183.phpt +++ b/ext/soap/tests/bugs/bug42183.phpt @@ -16,7 +16,7 @@ function test() { return new PHPObject(); } -$server = new SoapServer(NULL, array('uri' => 'http://ws.sit.com', +$server = new SoapServer(NULL, array('uri' => 'http://ws.sit.com', 'classmap' => array('Object' => 'PHPObject'))); $server->addFunction("test"); ob_start(); diff --git a/ext/soap/tests/bugs/bug42326.phpt b/ext/soap/tests/bugs/bug42326.phpt index 2e6c7c3501..a1d8d59fc0 100644 --- a/ext/soap/tests/bugs/bug42326.phpt +++ b/ext/soap/tests/bugs/bug42326.phpt @@ -28,7 +28,7 @@ class SOAP_GetProductsResponse { public $products; function __construct(){ $this->products = new SOAP_productDetailsType(); - + } } diff --git a/ext/soap/tests/bugs/bug46419.phpt b/ext/soap/tests/bugs/bug46419.phpt index cb113e28d2..d5f9751ed5 100644 --- a/ext/soap/tests/bugs/bug46419.phpt +++ b/ext/soap/tests/bugs/bug46419.phpt @@ -26,8 +26,8 @@ class LocalSoapClient extends SoapClient { } -$x = new LocalSoapClient(NULL,array('location'=>'test://', - 'uri'=>'http://testuri.org')); +$x = new LocalSoapClient(NULL,array('location'=>'test://', + 'uri'=>'http://testuri.org')); var_dump($x->bar()); ?> --EXPECT-- diff --git a/ext/soap/tests/bugs/bug47273.phpt b/ext/soap/tests/bugs/bug47273.phpt index 1cfb0f3cd9..85abf432da 100644 --- a/ext/soap/tests/bugs/bug47273.phpt +++ b/ext/soap/tests/bugs/bug47273.phpt @@ -19,7 +19,7 @@ class SoapFaultTest // Test #1 return 'Test #1 exception with some special chars: Äßö'; } - public function test2() { + public function test2() { // Test #2 //throw new SoapFault('Server', 'Test #2 exception with some special chars: Äßö'); throw new Exception('Test #2 exception with some special chars: Äßö'); diff --git a/ext/soap/tests/bugs/bug50698_2.phpt b/ext/soap/tests/bugs/bug50698_2.phpt index 7ff667423c..79bbb3bd80 100644 --- a/ext/soap/tests/bugs/bug50698_2.phpt +++ b/ext/soap/tests/bugs/bug50698_2.phpt @@ -15,7 +15,7 @@ try { } else { echo "Call: \"new SoapClient(dirname(__FILE__).'/bug50698_2.wsdl');\" threw a SoapFault with an incorrect faultcode or faultmessage."; print_r($e); - } + } } ?> --EXPECT-- diff --git a/ext/soap/tests/bugs/bug50698_3.phpt b/ext/soap/tests/bugs/bug50698_3.phpt index 6cee6a67ec..341a4afb97 100644 --- a/ext/soap/tests/bugs/bug50698_3.phpt +++ b/ext/soap/tests/bugs/bug50698_3.phpt @@ -15,7 +15,7 @@ try { } else { echo "Call: \"new SoapClient(dirname(__FILE__).'/bug50698_3.wsdl');\" threw a SoapFault with an incorrect faultcode or faultmessage."; print_r($e); - } + } } ?> --EXPECT-- diff --git a/ext/soap/tests/bugs/bug54911.phpt b/ext/soap/tests/bugs/bug54911.phpt index 6913925f8a..1cc4faf959 100644 --- a/ext/soap/tests/bugs/bug54911.phpt +++ b/ext/soap/tests/bugs/bug54911.phpt @@ -7,8 +7,8 @@ Bug #54911 (Access to a undefined member in inherit SoapClient may cause Segment class XSoapClient extends SoapClient { function __doRequest($request, $location, $action, $version, $one_way=false) { echo self::$crash; - } - } + } + } $client = new XSoapClient(null, array('uri'=>'', 'location'=>'')); $client->__soapCall('', array()); ?> diff --git a/ext/soap/tests/bugs/multiport.phpt b/ext/soap/tests/bugs/multiport.phpt index 0b5e944514..90799cf492 100644 --- a/ext/soap/tests/bugs/multiport.phpt +++ b/ext/soap/tests/bugs/multiport.phpt @@ -6,7 +6,7 @@ Proper binding selection soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__).'/multiport.wsdl', +$client = new SoapClient(dirname(__FILE__).'/multiport.wsdl', array('trace' => true, 'exceptions' => false)); $response = $client->GetSessionId(array('userId'=>'user', 'password'=>'password')); echo $client->__getLastRequest(); diff --git a/ext/soap/tests/classmap001.phpt b/ext/soap/tests/classmap001.phpt index 247a1ded7f..7699aab2bc 100644 --- a/ext/soap/tests/classmap001.phpt +++ b/ext/soap/tests/classmap001.phpt @@ -22,19 +22,19 @@ $GLOBALS['HTTP_RAW_POST_DATA']=" </dotest> </env:Body> <env:Header/> -</env:Envelope>"; +</env:Envelope>"; class test{ function dotest(book $book){ $classname=get_class($book); return "Classname: ".$classname; - } + } } class book{ public $a="a"; public $b="c"; - + } $options=Array( 'actor' =>'http://schema.nothing.com', diff --git a/ext/soap/tests/classmap002.phpt b/ext/soap/tests/classmap002.phpt index d79deb6d39..cbd74f2f74 100644 --- a/ext/soap/tests/classmap002.phpt +++ b/ext/soap/tests/classmap002.phpt @@ -17,13 +17,13 @@ class TestSoapClient extends SoapClient{ </res> </ns1:dotest2Response></SOAP-ENV:Body></SOAP-ENV:Envelope> EOF; - } + } } class book{ public $a="a"; public $b="c"; - + } $options=Array( diff --git a/ext/soap/tests/classmap003.phpt b/ext/soap/tests/classmap003.phpt index 4d0118fef4..2f49bb4e34 100644 --- a/ext/soap/tests/classmap003.phpt +++ b/ext/soap/tests/classmap003.phpt @@ -14,7 +14,7 @@ class A { } class B extends A { - public $y; + public $y; function __construct($a){ parent::__construct($a); $this->y = $a + 1; diff --git a/ext/soap/tests/schema/schema064.phpt b/ext/soap/tests/schema/schema064.phpt index 899a2938fa..913cbd16e0 100644 --- a/ext/soap/tests/schema/schema064.phpt +++ b/ext/soap/tests/schema/schema064.phpt @@ -1,7 +1,7 @@ --TEST-- SOAP XML Schema 64: standard date/time types --SKIPIF-- -<?php +<?php if (defined('PHP_WINDOWS_VERSION_MAJOR')) { die('skip, windows has different TZ format'); } diff --git a/ext/soap/tests/server019.phpt b/ext/soap/tests/server019.phpt index d36cff0887..132b4dc1a5 100644 --- a/ext/soap/tests/server019.phpt +++ b/ext/soap/tests/server019.phpt @@ -1,9 +1,9 @@ --TEST-- SOAP Server 19: compressed request (gzip) --SKIPIF-- -<?php +<?php if (php_sapi_name()=='cli') echo 'skip'; - require_once('skipif.inc'); + require_once('skipif.inc'); if (!extension_loaded('zlib')) die('skip zlib extension not available'); ?> --INI-- diff --git a/ext/soap/tests/server020.phpt b/ext/soap/tests/server020.phpt index b14978fd31..69eb4f097b 100644 --- a/ext/soap/tests/server020.phpt +++ b/ext/soap/tests/server020.phpt @@ -1,9 +1,9 @@ --TEST-- SOAP Server 20: compressed request (deflate) --SKIPIF-- -<?php +<?php if (php_sapi_name()=='cli') echo 'skip'; - require_once('skipif.inc'); + require_once('skipif.inc'); if (!extension_loaded('zlib')) die('skip zlib extension not available'); ?> --INI-- diff --git a/ext/soap/tests/server029.phpt b/ext/soap/tests/server029.phpt index 26db9fd9cc..e25c6fb859 100644 --- a/ext/soap/tests/server029.phpt +++ b/ext/soap/tests/server029.phpt @@ -13,9 +13,9 @@ SOAP Server 29-CGI: new/addfunction/handle </SOAP-ENV:Body> </SOAP-ENV:Envelope> --SKIPIF-- -<?php +<?php if (php_sapi_name()=='cli') echo 'skip'; - require_once('skipif.inc'); + require_once('skipif.inc'); ?> --FILE-- <?php diff --git a/ext/soap/tests/soap12/T68.phpt b/ext/soap/tests/soap12/T68.phpt index a7915196cb..acf4230973 100644 --- a/ext/soap/tests/soap12/T68.phpt +++ b/ext/soap/tests/soap12/T68.phpt @@ -12,15 +12,15 @@ $HTTP_RAW_POST_DATA = <<<EOF <test:echoOk xmlns:test="http://example.org/ts-tests" env:role="http://www.w3.org/2003/05/soap-envelope/role/next" >foo</test:echoOk> - + </env:Header> <env:Body> - - + + </env:Body> - - + + </env:Envelope> EOF; diff --git a/ext/soap/tests/transport001.phpt b/ext/soap/tests/transport001.phpt index 9ab0d3d9d1..a2733bd5dc 100644 --- a/ext/soap/tests/transport001.phpt +++ b/ext/soap/tests/transport001.phpt @@ -26,8 +26,8 @@ class LocalSoapClient extends SoapClient { } -$x = new LocalSoapClient(NULL,array('location'=>'test://', - 'uri'=>'http://testuri.org')); +$x = new LocalSoapClient(NULL,array('location'=>'test://', + 'uri'=>'http://testuri.org')); var_dump($x->Add(3,4)); echo "ok\n"; ?> diff --git a/ext/soap/tests/typemap001.phpt b/ext/soap/tests/typemap001.phpt index b5ed31da85..3268c694ae 100644 --- a/ext/soap/tests/typemap001.phpt +++ b/ext/soap/tests/typemap001.phpt @@ -23,7 +23,7 @@ $GLOBALS['HTTP_RAW_POST_DATA']=" </ns1:dotest> </env:Body> <env:Header/> -</env:Envelope>"; +</env:Envelope>"; function book_from_xml($xml) { $sxe = simplexml_load_string($xml); @@ -37,13 +37,13 @@ class test{ function dotest($book){ $classname=get_class($book); return "Object: ".$classname. "(".$book->a.",".$book->b.")"; - } + } } class book{ public $a="a"; public $b="c"; - + } $options=Array( 'actor' =>'http://schemas.nothing.com', diff --git a/ext/soap/tests/typemap002.phpt b/ext/soap/tests/typemap002.phpt index ceb00f1a19..41bbc1505e 100644 --- a/ext/soap/tests/typemap002.phpt +++ b/ext/soap/tests/typemap002.phpt @@ -19,7 +19,7 @@ $GLOBALS['HTTP_RAW_POST_DATA']=" </ns1:dotest2> </env:Body> <env:Header/> -</env:Envelope>"; +</env:Envelope>"; function book_to_xml($book) { return '<book xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><a xsi:type="xsd:string">'.$book->a.'!</a><b xsi:type="xsd:string">'.$book->b.'!</b></book>'; @@ -31,13 +31,13 @@ class test{ $book->a = "foo"; $book->b = "bar"; return $book; - } + } } class book{ public $a="a"; public $b="c"; - + } $options=Array( diff --git a/ext/soap/tests/typemap003.phpt b/ext/soap/tests/typemap003.phpt index 63bb76cbcf..85a6369313 100644 --- a/ext/soap/tests/typemap003.phpt +++ b/ext/soap/tests/typemap003.phpt @@ -18,13 +18,13 @@ class TestSoapClient extends SoapClient{ </res> </ns1:dotest2Response></SOAP-ENV:Body></SOAP-ENV:Envelope> EOF; - } + } } class book{ public $a="a"; public $b="c"; - + } function book_from_xml($xml) { diff --git a/ext/soap/tests/typemap004.phpt b/ext/soap/tests/typemap004.phpt index 4fe15f7f9f..ffd24c6a38 100644 --- a/ext/soap/tests/typemap004.phpt +++ b/ext/soap/tests/typemap004.phpt @@ -10,13 +10,13 @@ class TestSoapClient extends SoapClient{ function __doRequest($request, $location, $action, $version, $one_way = 0) { echo $request; exit; - } + } } class book{ public $a="a"; public $b="c"; - + } function book_to_xml($book) { diff --git a/ext/soap/tests/typemap005.phpt b/ext/soap/tests/typemap005.phpt index 369d026b5a..5a8319fab7 100644 --- a/ext/soap/tests/typemap005.phpt +++ b/ext/soap/tests/typemap005.phpt @@ -23,7 +23,7 @@ $GLOBALS['HTTP_RAW_POST_DATA']=" </ns1:dotest> </env:Body> <env:Header/> -</env:Envelope>"; +</env:Envelope>"; function book_from_xml($xml) { $sxe = simplexml_load_string($xml); @@ -37,13 +37,13 @@ class test{ function dotest($book){ $classname=get_class($book); return "Object: ".$classname. "(".$book->a.",".$book->b.")"; - } + } } class book{ public $a="a"; public $b="c"; - + } $options=Array( 'uri' => "http://schemas.nothing.com", diff --git a/ext/soap/tests/typemap006.phpt b/ext/soap/tests/typemap006.phpt index 7ecf410ad8..9de9e245d2 100644 --- a/ext/soap/tests/typemap006.phpt +++ b/ext/soap/tests/typemap006.phpt @@ -19,7 +19,7 @@ $GLOBALS['HTTP_RAW_POST_DATA']=" </ns1:dotest2> </env:Body> <env:Header/> -</env:Envelope>"; +</env:Envelope>"; function book_to_xml($book) { return '<book xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><a xsi:type="xsd:string">'.$book->a.'!</a><b xsi:type="xsd:string">'.$book->b.'!</b></book>'; @@ -31,13 +31,13 @@ class test{ $book->a = "foo"; $book->b = "bar"; return new SoapVar($book, null, "book", "http://schemas.nothing.com"); - } + } } class book{ public $a="a"; public $b="c"; - + } $options=Array( diff --git a/ext/soap/tests/typemap007.phpt b/ext/soap/tests/typemap007.phpt index b3451f1dae..1dd2becb61 100644 --- a/ext/soap/tests/typemap007.phpt +++ b/ext/soap/tests/typemap007.phpt @@ -18,13 +18,13 @@ class TestSoapClient extends SoapClient{ </res> </ns1:dotest2Response></SOAP-ENV:Body></SOAP-ENV:Envelope> EOF; - } + } } class book{ public $a="a"; public $b="c"; - + } function book_from_xml($xml) { diff --git a/ext/soap/tests/typemap008.phpt b/ext/soap/tests/typemap008.phpt index 192f6dc0d2..4ba1fb5bef 100644 --- a/ext/soap/tests/typemap008.phpt +++ b/ext/soap/tests/typemap008.phpt @@ -10,13 +10,13 @@ class TestSoapClient extends SoapClient{ function __doRequest($request, $location, $action, $version, $one_way = 0) { echo $request; exit; - } + } } class book{ public $a="a"; public $b="c"; - + } function book_to_xml($book) { diff --git a/ext/soap/tests/typemap009.phpt b/ext/soap/tests/typemap009.phpt index ec5c38da2b..7c7cd6fee7 100644 --- a/ext/soap/tests/typemap009.phpt +++ b/ext/soap/tests/typemap009.phpt @@ -22,7 +22,7 @@ $GLOBALS['HTTP_RAW_POST_DATA']=" </ns1:dotest> </env:Body> <env:Header/> -</env:Envelope>"; +</env:Envelope>"; function book_from_xml($xml) { throw new SoapFault("Server", "Conversion Failed"); @@ -32,13 +32,13 @@ class test{ function dotest($book){ $classname=get_class($book); return "Object: ".$classname. "(".$book->a.",".$book->b.")"; - } + } } class book{ public $a="a"; public $b="c"; - + } $options=Array( 'actor' =>'http://schemas.nothing.com', diff --git a/ext/soap/tests/typemap010.phpt b/ext/soap/tests/typemap010.phpt index 4eba6345cb..0d27ba4936 100644 --- a/ext/soap/tests/typemap010.phpt +++ b/ext/soap/tests/typemap010.phpt @@ -19,7 +19,7 @@ $GLOBALS['HTTP_RAW_POST_DATA']=" </ns1:dotest2> </env:Body> <env:Header/> -</env:Envelope>"; +</env:Envelope>"; function book_to_xml($book) { throw new SoapFault("Server", "Conversion Fault"); @@ -31,13 +31,13 @@ class test{ $book->a = "foo"; $book->b = "bar"; return $book; - } + } } class book{ public $a="a"; public $b="c"; - + } $options=Array( diff --git a/ext/soap/tests/typemap011.phpt b/ext/soap/tests/typemap011.phpt index 1e2addceec..7d89b71e06 100644 --- a/ext/soap/tests/typemap011.phpt +++ b/ext/soap/tests/typemap011.phpt @@ -17,13 +17,13 @@ class TestSoapClient extends SoapClient{ </res> </ns1:dotest2Response></SOAP-ENV:Body></SOAP-ENV:Envelope> EOF; - } + } } class book{ public $a="a"; public $b="c"; - + } function book_from_xml($xml) { diff --git a/ext/soap/tests/typemap012.phpt b/ext/soap/tests/typemap012.phpt index 847957a982..79e2319085 100644 --- a/ext/soap/tests/typemap012.phpt +++ b/ext/soap/tests/typemap012.phpt @@ -10,13 +10,13 @@ class TestSoapClient extends SoapClient{ function __doRequest($request, $location, $action, $version, $one_way = 0) { echo $request; exit; - } + } } class book{ public $a="a"; public $b="c"; - + } function book_to_xml($book) { diff --git a/ext/soap/tests/typemap013.phpt b/ext/soap/tests/typemap013.phpt index d873eb4d18..4ebeac71d8 100644 --- a/ext/soap/tests/typemap013.phpt +++ b/ext/soap/tests/typemap013.phpt @@ -19,7 +19,7 @@ $GLOBALS['HTTP_RAW_POST_DATA']=" </ns1:dotest2> </env:Body> <env:Header/> -</env:Envelope>"; +</env:Envelope>"; function book_to_xml($book) { return '<book xmlns="http://schemas.nothing.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><a xsi:type="xsd:string">'.$book->a.'!</a><b xsi:type="xsd:string">'.$book->b.'!</b></book>'; @@ -31,13 +31,13 @@ class test{ $book->a = "foo"; $book->b = "bar"; return $book; - } + } } class book{ public $a="a"; public $b="c"; - + } $options=Array( diff --git a/ext/sockets/tests/ipv4loop.phpt b/ext/sockets/tests/ipv4loop.phpt index 920b27b66e..4fed237b20 100644 --- a/ext/sockets/tests/ipv4loop.phpt +++ b/ext/sockets/tests/ipv4loop.phpt @@ -26,7 +26,7 @@ IPv4 Loopback test if (!socket_listen($server, 2)) { die('Unable to listen on socket'); } - + /* Connect to it */ $client = socket_create(AF_INET, SOCK_STREAM, getprotobyname('tcp')); if (!$client) { diff --git a/ext/sockets/tests/ipv6loop.phpt b/ext/sockets/tests/ipv6loop.phpt index 4720cb49e4..307f61f082 100644 --- a/ext/sockets/tests/ipv6loop.phpt +++ b/ext/sockets/tests/ipv6loop.phpt @@ -27,7 +27,7 @@ IPv6 Loopback test if (!socket_listen($server, 2)) { die('Unable to listen on socket'); } - + /* Connect to it */ $client = socket_create(AF_INET6, SOCK_STREAM, getprotobyname('tcp')); if (!$client) { diff --git a/ext/sockets/tests/socket_bind.phpt b/ext/sockets/tests/socket_bind.phpt index 28cf36c322..118361e42c 100644 --- a/ext/sockets/tests/socket_bind.phpt +++ b/ext/sockets/tests/socket_bind.phpt @@ -18,11 +18,11 @@ fa@php.net $s_c = socket_create(AF_INET, SOCK_STREAM, SOL_TCP); $s_bind = socket_bind($s_c, '0.0.0.0', 31330+$rand); var_dump($s_bind); - + // Connect to destination address $s_conn = socket_connect($s_c, 'www.php.net', 80); var_dump($s_conn); - + // Write $request = 'GET / HTTP/1.1' . "\r\n"; $s_write = socket_write($s_c, $request); diff --git a/ext/sockets/tests/socket_bind_params.phpt b/ext/sockets/tests/socket_bind_params.phpt index 65b694c1df..29af2a2d45 100644 --- a/ext/sockets/tests/socket_bind_params.phpt +++ b/ext/sockets/tests/socket_bind_params.phpt @@ -16,7 +16,7 @@ fa@php.net $s_w = socket_bind(); var_dump($s_w); $s_w = socket_bind($s_c); - var_dump($s_w); + var_dump($s_w); socket_close($s_c); ?> diff --git a/ext/sockets/tests/socket_close_params.phpt b/ext/sockets/tests/socket_close_params.phpt index 8ba0e44c5b..91cc85195e 100644 --- a/ext/sockets/tests/socket_close_params.phpt +++ b/ext/sockets/tests/socket_close_params.phpt @@ -13,7 +13,7 @@ fa@php.net <?php // wrong parameter count $s_c = socket_close(); - var_dump($s_c); + var_dump($s_c); ?> --EXPECTF-- diff --git a/ext/sockets/tests/socket_connect_error.phpt b/ext/sockets/tests/socket_connect_error.phpt index 5987f502be..713791d849 100644 --- a/ext/sockets/tests/socket_connect_error.phpt +++ b/ext/sockets/tests/socket_connect_error.phpt @@ -16,13 +16,13 @@ display_errors=1 <?php // Test with no arguments $server = socket_create(); - + // Test with less arguments than required $server = socket_create(SOCK_STREAM, getprotobyname('tcp')); - + // Test with non integer parameters $server = socket_create(array(), 1, 1); - + ?> --EXPECTF-- Warning: socket_create() expects exactly 3 parameters, 0 given in %s on line %d diff --git a/ext/sockets/tests/socket_connect_params.phpt b/ext/sockets/tests/socket_connect_params.phpt index e329ce1c99..e731672f57 100644 --- a/ext/sockets/tests/socket_connect_params.phpt +++ b/ext/sockets/tests/socket_connect_params.phpt @@ -11,14 +11,14 @@ fa@php.net ?> --FILE-- <?php - $rand = rand(1,999); + $rand = rand(1,999); $s_c = socket_create_listen(31330+$rand); // wrong parameter count $s_w = socket_connect(); $s_w = socket_connect($s_c); $s_w = socket_connect($s_c, '0.0.0.0'); $s_w = socket_connect($s_c, '0.0.0.0', 31330+$rand); - + socket_close($s_c); ?> diff --git a/ext/sockets/tests/socket_create_listen-win32.phpt b/ext/sockets/tests/socket_create_listen-win32.phpt index 23bf963c5f..f7306262f4 100644 --- a/ext/sockets/tests/socket_create_listen-win32.phpt +++ b/ext/sockets/tests/socket_create_listen-win32.phpt @@ -11,7 +11,7 @@ if (!extension_loaded('sockets')) { --FILE-- <?php $sock = socket_create_listen(31338); -socket_getsockname($sock, $addr, $port); +socket_getsockname($sock, $addr, $port); var_dump($addr, $port); --EXPECT-- string(9) "127.0.0.1" diff --git a/ext/sockets/tests/socket_create_listen.phpt b/ext/sockets/tests/socket_create_listen.phpt index 76f2942587..7083b0a1b9 100644 --- a/ext/sockets/tests/socket_create_listen.phpt +++ b/ext/sockets/tests/socket_create_listen.phpt @@ -11,7 +11,7 @@ if (!extension_loaded('sockets')) { --FILE-- <?php $sock = socket_create_listen(31338); -socket_getsockname($sock, $addr, $port); +socket_getsockname($sock, $addr, $port); var_dump($addr, $port); --EXPECT-- string(7) "0.0.0.0" diff --git a/ext/sockets/tests/socket_getpeername.phpt b/ext/sockets/tests/socket_getpeername.phpt index 1a542d0702..34de42de80 100644 --- a/ext/sockets/tests/socket_getpeername.phpt +++ b/ext/sockets/tests/socket_getpeername.phpt @@ -15,7 +15,7 @@ fa@php.net $s_c = socket_create(AF_INET, SOCK_STREAM, SOL_TCP); $s_bind = socket_bind($s_c, '0.0.0.0', 31330+$rand); var_dump($s_bind); - + // Connect to destination address $s_peer = socket_getpeername($s_c, $ip, $port); var_dump($s_peer); diff --git a/ext/sockets/tests/socket_getpeername_ipv4loop.phpt b/ext/sockets/tests/socket_getpeername_ipv4loop.phpt index 083ed55e5d..efd2a6b445 100644 --- a/ext/sockets/tests/socket_getpeername_ipv4loop.phpt +++ b/ext/sockets/tests/socket_getpeername_ipv4loop.phpt @@ -4,13 +4,13 @@ ext/sockets - socket_getpeername_ipv4loop - basic test Tatjana Andersen tatjana.andersen@redpill-linpro.com # TestFest 2009 - NorwayUG --SKIPIF-- -<?php +<?php if (!extension_loaded('sockets')) { die('skip sockets extension not available.'); } ?> --FILE-- -<?php +<?php /* Bind and connect sockets to localhost */ $localhost = '127.0.0.1'; diff --git a/ext/sockets/tests/socket_getpeername_ipv6loop.phpt b/ext/sockets/tests/socket_getpeername_ipv6loop.phpt index 96041287f4..a4965a8601 100644 --- a/ext/sockets/tests/socket_getpeername_ipv6loop.phpt +++ b/ext/sockets/tests/socket_getpeername_ipv6loop.phpt @@ -4,14 +4,14 @@ ext/sockets - socket_getpeername_ipv6loop - basic test Tatjana Andersen tatjana.andersen@redpill-linpro.com # TestFest 2009 - NorwayUG --SKIPIF-- -<?php +<?php if (!extension_loaded('sockets')) { die('skip sockets extension not available.'); } require 'ipv6_skipif.inc'; ?> --FILE-- -<?php +<?php /* Bind and connect sockets to localhost */ $localhost = '::1'; diff --git a/ext/sockets/tests/socket_getsockname.phpt b/ext/sockets/tests/socket_getsockname.phpt index 877bef5016..f3f392130c 100644 --- a/ext/sockets/tests/socket_getsockname.phpt +++ b/ext/sockets/tests/socket_getsockname.phpt @@ -15,7 +15,7 @@ fa@php.net $s_c = socket_create(AF_INET, SOCK_STREAM, SOL_TCP); $s_bind = socket_bind($s_c, '0.0.0.0', 31330+$rand); var_dump($s_bind); - + // Connect to destination address $s_conn = socket_getsockname($s_c, $ip, $port); var_dump($s_conn); diff --git a/ext/sockets/tests/socket_listen-wrongparams.phpt b/ext/sockets/tests/socket_listen-wrongparams.phpt index b5e13548eb..41d7ac1f10 100644 --- a/ext/sockets/tests/socket_listen-wrongparams.phpt +++ b/ext/sockets/tests/socket_listen-wrongparams.phpt @@ -11,7 +11,7 @@ if (!extension_loaded('sockets')) { --FILE-- <?php var_dump(socket_listen(null)); -$socket = socket_create(AF_UNIX, SOCK_STREAM, 0); +$socket = socket_create(AF_UNIX, SOCK_STREAM, 0); var_dump(socket_listen($socket)); --EXPECTF-- Warning: socket_listen() expects parameter 1 to be resource, null given in %s on line %d diff --git a/ext/sockets/tests/socket_listen_params.phpt b/ext/sockets/tests/socket_listen_params.phpt index 5b6d3b1459..5e20999374 100644 --- a/ext/sockets/tests/socket_listen_params.phpt +++ b/ext/sockets/tests/socket_listen_params.phpt @@ -13,7 +13,7 @@ fa@php.net <?php // wrong parameter count $s_c = socket_listen(); - var_dump($s_c); + var_dump($s_c); ?> --EXPECTF-- diff --git a/ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt b/ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt index 6b46f33715..fb9a311b17 100644 --- a/ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt +++ b/ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt @@ -9,7 +9,7 @@ require 'ipv6_skipif.inc'; if (!defined('IPPROTO_IPV6')) die('skip IPv6 not available.'); -if (substr(PHP_OS, 0, 3) == 'WIN') +if (substr(PHP_OS, 0, 3) == 'WIN') 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 diff --git a/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt b/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt index 5aeaa0824f..ced060e8a3 100644 --- a/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt +++ b/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt @@ -14,13 +14,13 @@ if (!extension_loaded('sockets')) { if (!socket_set_nonblock($socket)) { die('Unable to set nonblocking mode for socket'); } - + $address = '127.0.0.1'; socket_sendto($socket, '', 1, 0, $address); // cause warning if (!socket_bind($socket, $address, 1223)) { die("Unable to bind to $address:1223"); } - + var_dump(socket_recvfrom($socket, $buf, 12, 0, $from, $port)); //false (EAGAIN - no warning) $msg = "Ping!"; diff --git a/ext/sockets/tests/socket_set_option_in6_pktinfo.phpt b/ext/sockets/tests/socket_set_option_in6_pktinfo.phpt index 75019cafac..c44f58e793 100644 --- a/ext/sockets/tests/socket_set_option_in6_pktinfo.phpt +++ b/ext/sockets/tests/socket_set_option_in6_pktinfo.phpt @@ -16,7 +16,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { } if (!defined('IPV6_PKTINFO')) { die('skip IPV6_PKTINFO not available.'); -} +} --FILE-- <?php diff --git a/ext/sockets/tests/unixloop.phpt b/ext/sockets/tests/unixloop.phpt index 4a19444859..cd4afd65c7 100644 --- a/ext/sockets/tests/unixloop.phpt +++ b/ext/sockets/tests/unixloop.phpt @@ -27,7 +27,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { if (!socket_listen($server, 2)) { die('Unable to listen on socket'); } - + /* Connect to it */ $client = socket_create(AF_UNIX, SOCK_STREAM, 0); if (!$client) { diff --git a/ext/sockets/tests/wsaprotocol_info_0.phpt b/ext/sockets/tests/wsaprotocol_info_0.phpt index b51dab227a..19550d11e9 100644 --- a/ext/sockets/tests/wsaprotocol_info_0.phpt +++ b/ext/sockets/tests/wsaprotocol_info_0.phpt @@ -38,7 +38,7 @@ if (!extension_loaded('sockets')) { socket_close($sock2); var_dump($sock, $sock2); - /* Using invalid PID. */ + /* Using invalid PID. */ $info = socket_wsaprotocol_info_export($sock, 123412341); socket_close($sock); diff --git a/ext/spl/tests/DirectoryIterator_by_reference.phpt b/ext/spl/tests/DirectoryIterator_by_reference.phpt index 3c5c5ac2b2..570d09f406 100644 --- a/ext/spl/tests/DirectoryIterator_by_reference.phpt +++ b/ext/spl/tests/DirectoryIterator_by_reference.phpt @@ -5,7 +5,7 @@ Havard Eide <nucleuz@gmail.com> #PHPTestFest2009 Norway 2009-06-09 \o/ --FILE-- <?php -$it = new DirectoryIterator(__DIR__); +$it = new DirectoryIterator(__DIR__); foreach( $it as &$file ) { echo $file . "\n"; } diff --git a/ext/spl/tests/SplDoublyLinkedList_debug-info.phpt b/ext/spl/tests/SplDoublyLinkedList_debug-info.phpt index 3164b42206..c5d10919ff 100644 --- a/ext/spl/tests/SplDoublyLinkedList_debug-info.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_debug-info.phpt @@ -6,12 +6,12 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com ) <?php // Create a new Doubly Linked List $dll = new SplDoublyLinkedList(); - + // Add some items to the list $dll->push(1); $dll->push(2); $dll->push(3); - + // Check the debug info print_r($dll); ?> diff --git a/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty-with-parameter.phpt b/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty-with-parameter.phpt index 8d7aaf8c93..a05ba68f7a 100644 --- a/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty-with-parameter.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty-with-parameter.phpt @@ -6,7 +6,7 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com ) <?php // Create a new Doubly Linked List $dll = new SplDoublyLinkedList(); - + var_dump($dll->isEmpty("test")); ?> --EXPECTF-- diff --git a/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty.phpt b/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty.phpt index f129385d07..4e9e2b33de 100644 --- a/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty.phpt @@ -6,7 +6,7 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com ) <?php // Create a new Doubly Linked List $dll = new SplDoublyLinkedList(); - + var_dump($dll->isEmpty()); ?> --EXPECT-- diff --git a/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty-with-parameter.phpt b/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty-with-parameter.phpt index 6ea9198bf0..5e3d8e9ee2 100644 --- a/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty-with-parameter.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty-with-parameter.phpt @@ -6,13 +6,13 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com ) <?php // Create a new Doubly Linked List $dll = new SplDoublyLinkedList(); - + // Add some items to the list $dll->push(1); $dll->push(2); $dll->push(3); //var_dump($dll); - + var_dump($dll->isEmpty("test")); ?> --EXPECTF-- diff --git a/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty.phpt b/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty.phpt index cac1866bc1..4b308f345b 100644 --- a/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty.phpt @@ -6,13 +6,13 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com ) <?php // Create a new Doubly Linked List $dll = new SplDoublyLinkedList(); - + // Add some items to the list $dll->push(1); $dll->push(2); $dll->push(3); //var_dump($dll); - + var_dump($dll->isEmpty()); ?> --EXPECT-- diff --git a/ext/spl/tests/SplDoublyLinkedList_offsetUnset_negative-parameter.phpt b/ext/spl/tests/SplDoublyLinkedList_offsetUnset_negative-parameter.phpt index d3d1d7d9a9..838100be1e 100644 --- a/ext/spl/tests/SplDoublyLinkedList_offsetUnset_negative-parameter.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_offsetUnset_negative-parameter.phpt @@ -6,12 +6,12 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com ) <?php // Create a new Doubly Linked List $dll = new SplDoublyLinkedList(); - + // Add some items to the list $dll->push(1); $dll->push(2); $dll->push(3); - + try { $dll->offsetUnset(-1); } diff --git a/ext/spl/tests/SplDoublyLinkedList_offsetUnset_parameter-larger-num-elements.phpt b/ext/spl/tests/SplDoublyLinkedList_offsetUnset_parameter-larger-num-elements.phpt index aea73b93b4..cd77f11aef 100644 --- a/ext/spl/tests/SplDoublyLinkedList_offsetUnset_parameter-larger-num-elements.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_offsetUnset_parameter-larger-num-elements.phpt @@ -6,12 +6,12 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com ) <?php // Create a new Doubly Linked List $dll = new SplDoublyLinkedList(); - + // Add some items to the list $dll->push(1); $dll->push(2); $dll->push(3); - + try { $dll->offsetUnset(3); } diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation1.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation1.phpt index 6780b242dd..fba9a1bf19 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation1.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation1.phpt @@ -29,13 +29,13 @@ $file = "$file_path/fputcsv_variation1.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $fo = new SplFileObject($file, 'w'); @@ -45,7 +45,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + var_dump( $fo->fputcsv($csv_field, $delimiter, $enclosure) ); // check the file pointer position and eof @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { var_dump( $fo->eof() ); //close the file unset($fo); - + // print the file contents var_dump( file_get_contents($file) ); diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation10.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation10.phpt index 08a2461b4d..ed684179b8 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation10.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation10.phpt @@ -23,13 +23,13 @@ $file = "$file_path/fputcsv_variation10.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($fields as $field) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $fo = new SplFileObject($file, 'w'); @@ -37,16 +37,16 @@ foreach ($fields as $field) { $fo = new SplFileObject($file, $file_modes[$mode_counter]); } $csv_field = $field; - + // write to a file in csv format var_dump( $fo->fputcsv($csv_field) ); - + // check the file pointer position and eof var_dump( $fo->ftell() ); var_dump( $fo->eof() ); //close the file unset($fo); - + // print the file contents var_dump( file_get_contents($file) ); diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation11.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation11.phpt index c85dd0a8cd..2deafac1ea 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation11.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation11.phpt @@ -29,13 +29,13 @@ $file = "$file_path/fputcsv_variation11.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $fo = new SplFileObject($file, 'w'); @@ -45,7 +45,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( $fo->fputcsv($csv_field, $delimiter) ); // check the file pointer position and eof @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { var_dump( $fo->eof() ); //close the file unset($fo); - + // print the file contents var_dump( file_get_contents($file) ); diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation12.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation12.phpt index 8bb47d3371..aee1da3559 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation12.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation12.phpt @@ -30,13 +30,13 @@ $file = "$file_path/fputcsv_variation12.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $fo = new SplFileObject($file, 'w'); @@ -46,7 +46,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( $fo->fputcsv($csv_field, '+') ); // check the file pointer position and eof @@ -54,7 +54,7 @@ foreach ($csv_lists as $csv_list) { var_dump( $fo->eof() ); //close the file unset($fo); - + // print the file contents var_dump( file_get_contents($file) ); diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation5.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation5.phpt index 9c4c01f54f..f83bc6755f 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation5.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation5.phpt @@ -29,13 +29,13 @@ $file = "$file_path/fputcsv_variation5.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $fo = new SplFileObject($file, 'w'); @@ -45,7 +45,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( $fo->fputcsv($csv_field) ); // check the file pointer position and eof @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { var_dump( $fo->eof() ); //close the file unset($fo); - + // print the file contents var_dump( file_get_contents($file) ); diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation6.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation6.phpt index 6cbb880aaf..ffa2b320c6 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation6.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation6.phpt @@ -32,13 +32,13 @@ $file = "$file_path/fputcsv_variation6.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $fo = new SplFileObject($file, 'w'); @@ -48,7 +48,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( $fo->fputcsv($csv_field, '+', '%') ); // check the file pointer position and eof @@ -56,7 +56,7 @@ foreach ($csv_lists as $csv_list) { var_dump( $fo->eof() ); //close the file unset($fo); - + // print the file contents var_dump( file_get_contents($file) ); diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation7.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation7.phpt index ceb438a9f1..72fb34efa6 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation7.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation7.phpt @@ -32,13 +32,13 @@ $file = "$file_path/fputcsv_variation7.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $fo = new SplFileObject($file, 'w'); @@ -48,7 +48,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( $fo->fputcsv($csv_field, '+', $enclosure) ); // check the file pointer position and eof @@ -56,7 +56,7 @@ foreach ($csv_lists as $csv_list) { var_dump( $fo->eof() ); //close the file unset($fo); - + // print the file contents var_dump( file_get_contents($file) ); diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation8.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation8.phpt index f1a8cbf7b1..4eab3d74e4 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation8.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation8.phpt @@ -32,13 +32,13 @@ $file = "$file_path/fputcsv_variation8.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $fo = new SplFileObject($file, 'w'); @@ -48,7 +48,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( $fo->fputcsv($csv_field, $delimiter, '+') ); // check the file pointer position and eof @@ -56,7 +56,7 @@ foreach ($csv_lists as $csv_list) { var_dump( $fo->eof() ); //close the file unset($fo); - + // print the file contents var_dump( file_get_contents($file) ); diff --git a/ext/spl/tests/SplFileObject_ftruncate_error_001.phpt b/ext/spl/tests/SplFileObject_ftruncate_error_001.phpt index a2eef604f1..121d12e029 100644 --- a/ext/spl/tests/SplFileObject_ftruncate_error_001.phpt +++ b/ext/spl/tests/SplFileObject_ftruncate_error_001.phpt @@ -21,7 +21,7 @@ $ftruncate_test = ""; //end creating stream //open an SplFileObject using the above test stream -$obj = New SplFileObject("SPLtest://ftruncate_test"); +$obj = New SplFileObject("SPLtest://ftruncate_test"); try { $obj->ftruncate(1); } catch (LogicException $e) { diff --git a/ext/spl/tests/SplFixedArray_fromarray_indexes.phpt b/ext/spl/tests/SplFixedArray_fromarray_indexes.phpt index 7c225b05e7..c649e3b6c3 100644 --- a/ext/spl/tests/SplFixedArray_fromarray_indexes.phpt +++ b/ext/spl/tests/SplFixedArray_fromarray_indexes.phpt @@ -4,7 +4,7 @@ Create a SplFixedArray from an array using the fromArray() function use the defa Philip Norton philipnorton42@gmail.com --FILE-- <?php -$array = SplFixedArray::fromArray(array(1 => 1, +$array = SplFixedArray::fromArray(array(1 => 1, 2 => '2', 3 => false)); var_dump($array); diff --git a/ext/spl/tests/SplFixedArray_fromarray_non_indexes.phpt b/ext/spl/tests/SplFixedArray_fromarray_non_indexes.phpt index 03cbeeecd7..b3e7497397 100644 --- a/ext/spl/tests/SplFixedArray_fromarray_non_indexes.phpt +++ b/ext/spl/tests/SplFixedArray_fromarray_non_indexes.phpt @@ -4,7 +4,7 @@ Create a SplFixedArray from an array using the fromArray() function don't try to Philip Norton philipnorton42@gmail.com --FILE-- <?php -$array = SplFixedArray::fromArray(array(1 => 1, +$array = SplFixedArray::fromArray(array(1 => 1, 2 => '2', 3 => false), false); diff --git a/ext/spl/tests/SplFixedArray_offsetUnset_string.phpt b/ext/spl/tests/SplFixedArray_offsetUnset_string.phpt index 5c9431ec24..3b0e6bb222 100644 --- a/ext/spl/tests/SplFixedArray_offsetUnset_string.phpt +++ b/ext/spl/tests/SplFixedArray_offsetUnset_string.phpt @@ -6,17 +6,17 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com ) <?php // Create a fixed array $fixedArray = new SplFixedArray(5); - + // Fill it up - for ($i=0; $i < 5; $i++) { + for ($i=0; $i < 5; $i++) { $fixedArray[$i] = "PHPNW Testfest"; } - + // remove an item $fixedArray->offsetUnset("4"); - + var_dump($fixedArray); - + ?> --EXPECT-- object(SplFixedArray)#1 (5) { diff --git a/ext/spl/tests/SplFixedArray_toArray_with-params.phpt b/ext/spl/tests/SplFixedArray_toArray_with-params.phpt index 8864362c67..4c72dca235 100644 --- a/ext/spl/tests/SplFixedArray_toArray_with-params.phpt +++ b/ext/spl/tests/SplFixedArray_toArray_with-params.phpt @@ -6,12 +6,12 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com ) <?php // Create a fixed array $fixedArray = new SplFixedArray(5); - + // Fill it up - for ($i=0; $i < 5; $i++) { + for ($i=0; $i < 5; $i++) { $fixedArray[$i] = "PHPNW Testfest"; } - + // Test count() returns correct error when parameters are passed. $fixedArray->count(1); ?> diff --git a/ext/spl/tests/SplObjectStorage_removeAllExcept_basic.phpt b/ext/spl/tests/SplObjectStorage_removeAllExcept_basic.phpt index 7c8cb7574c..d28e190de7 100644 --- a/ext/spl/tests/SplObjectStorage_removeAllExcept_basic.phpt +++ b/ext/spl/tests/SplObjectStorage_removeAllExcept_basic.phpt @@ -5,9 +5,9 @@ Matthew Turland (me@matthewturland.com) --FILE-- <?php - $a = (object) 'a'; - $b = (object) 'b'; - $c = (object) 'c'; + $a = (object) 'a'; + $b = (object) 'b'; + $c = (object) 'c'; $foo = new SplObjectStorage; $foo->attach($a); diff --git a/ext/spl/tests/arrayObject___construct_basic2.phpt b/ext/spl/tests/arrayObject___construct_basic2.phpt index bd27c42774..9295f40e51 100644 --- a/ext/spl/tests/arrayObject___construct_basic2.phpt +++ b/ext/spl/tests/arrayObject___construct_basic2.phpt @@ -8,7 +8,7 @@ class C { class MyArrayObject extends ArrayObject { public $prop = 'MyArrayObject::prop.orig'; -} +} echo "--> Access prop on instance of ArrayObject:\n"; $c = new C; @@ -28,20 +28,20 @@ function testAccess($c, $ao) { echo " - Read:\n"; @var_dump($ao->prop, $ao['prop']); - + echo " - Write:\n"; $ao->prop = 'changed1'; $ao['prop'] = 'changed2'; var_dump($ao->prop, $ao['prop']); - + echo " - Isset:\n"; var_dump(isset($ao->prop), isset($ao['prop'])); - + echo " - Unset:\n"; unset($ao->prop); unset($ao['prop']); var_dump($ao->prop, $ao['prop']); - + echo " - After:\n"; var_dump($ao, $c); } diff --git a/ext/spl/tests/arrayObject___construct_basic3.phpt b/ext/spl/tests/arrayObject___construct_basic3.phpt index 11a17a6dc4..fcd369af84 100644 --- a/ext/spl/tests/arrayObject___construct_basic3.phpt +++ b/ext/spl/tests/arrayObject___construct_basic3.phpt @@ -8,7 +8,7 @@ class C { class MyArrayObject extends ArrayObject { public $prop = 'MyArrayObject::prop.orig'; -} +} echo "\n--> Access prop on instance of ArrayObject with ArrayObject::STD_PROP_LIST:\n"; $c = new C; @@ -28,20 +28,20 @@ function testAccess($c, $ao) { echo " - Read:\n"; @var_dump($ao->prop, $ao['prop']); - + echo " - Write:\n"; $ao->prop = 'changed1'; $ao['prop'] = 'changed2'; var_dump($ao->prop, $ao['prop']); - + echo " - Isset:\n"; var_dump(isset($ao->prop), isset($ao['prop'])); - + echo " - Unset:\n"; unset($ao->prop); unset($ao['prop']); var_dump($ao->prop, $ao['prop']); - + echo " - After:\n"; var_dump($ao, $c); } diff --git a/ext/spl/tests/arrayObject___construct_basic4.phpt b/ext/spl/tests/arrayObject___construct_basic4.phpt index b0809de0d4..c136c949e2 100644 --- a/ext/spl/tests/arrayObject___construct_basic4.phpt +++ b/ext/spl/tests/arrayObject___construct_basic4.phpt @@ -8,7 +8,7 @@ class C { class MyArrayObject extends ArrayObject { public $prop = 'MyArrayObject::prop.orig'; -} +} echo "\n--> Access prop on instance of ArrayObject with ArrayObject::ARRAY_AS_PROPS:\n"; $c = new C; @@ -28,20 +28,20 @@ function testAccess($c, $ao) { echo " - Read:\n"; @var_dump($ao->prop, $ao['prop']); - + echo " - Write:\n"; $ao->prop = 'changed1'; $ao['prop'] = 'changed2'; var_dump($ao->prop, $ao['prop']); - + echo " - Isset:\n"; var_dump(isset($ao->prop), isset($ao['prop'])); - + echo " - Unset:\n"; unset($ao->prop); unset($ao['prop']); var_dump($ao->prop, $ao['prop']); - + echo " - After:\n"; var_dump($ao, $c); } diff --git a/ext/spl/tests/arrayObject___construct_basic5.phpt b/ext/spl/tests/arrayObject___construct_basic5.phpt index 8c44ee2ce4..0eb8904bac 100644 --- a/ext/spl/tests/arrayObject___construct_basic5.phpt +++ b/ext/spl/tests/arrayObject___construct_basic5.phpt @@ -8,7 +8,7 @@ class C { class MyArrayObject extends ArrayObject { public $prop = 'MyArrayObject::prop.orig'; -} +} echo "\n--> Access prop on instance of ArrayObject with ArrayObject::STD_PROP_LIST|ArrayObject::ARRAY_AS_PROPS:\n"; $c = new C; @@ -28,20 +28,20 @@ function testAccess($c, $ao) { echo " - Read:\n"; @var_dump($ao->prop, $ao['prop']); - + echo " - Write:\n"; $ao->prop = 'changed1'; $ao['prop'] = 'changed2'; var_dump($ao->prop, $ao['prop']); - + echo " - Isset:\n"; var_dump(isset($ao->prop), isset($ao['prop'])); - + echo " - Unset:\n"; unset($ao->prop); unset($ao['prop']); var_dump($ao->prop, $ao['prop']); - + echo " - After:\n"; var_dump($ao, $c); } diff --git a/ext/spl/tests/arrayObject___construct_basic6.phpt b/ext/spl/tests/arrayObject___construct_basic6.phpt index 58ba46061b..befa6eab3c 100644 --- a/ext/spl/tests/arrayObject___construct_basic6.phpt +++ b/ext/spl/tests/arrayObject___construct_basic6.phpt @@ -5,7 +5,7 @@ SPL: ArrayObject::__construct: check impact of ArrayObject::STD_PROP_LIST on var class MyArrayObject extends ArrayObject { private $priv1 = 'secret1'; public $pub1 = 'public1'; -} +} $ao = new ArrayObject(array(1,2,3)); $ao->p = 1; diff --git a/ext/spl/tests/arrayObject_asort_basic1.phpt b/ext/spl/tests/arrayObject_asort_basic1.phpt index 6a2014e72b..e945def656 100644 --- a/ext/spl/tests/arrayObject_asort_basic1.phpt +++ b/ext/spl/tests/arrayObject_asort_basic1.phpt @@ -6,7 +6,7 @@ SPL: Test ArrayObject::asort() function : basic functionality with array based s * Description: proto int ArrayIterator::asort() * Sort the entries by values. * Source code: ext/spl/spl_array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ArrayObject::asort() : basic functionality ***\n"; diff --git a/ext/spl/tests/arrayObject_asort_basic2.phpt b/ext/spl/tests/arrayObject_asort_basic2.phpt index 7c506e1214..a5158536ee 100644 --- a/ext/spl/tests/arrayObject_asort_basic2.phpt +++ b/ext/spl/tests/arrayObject_asort_basic2.phpt @@ -6,7 +6,7 @@ SPL: Test ArrayObject::asort() function : basic functionality with object based * Description: proto int ArrayIterator::asort() * Sort the entries by values. * Source code: ext/spl/spl_array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ArrayObject::asort() : basic functionality ***\n"; diff --git a/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt b/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt index d89ca821a2..823256edbc 100644 --- a/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt +++ b/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt @@ -5,7 +5,7 @@ SPL: ArrayObject::exchangeArray() basic usage with object as underlying data sto class C { public $pub1 = 'public1'; -} +} echo "--> exchangeArray() with objects:\n"; $original = new C; diff --git a/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt b/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt index 2b67093da2..63315d531c 100644 --- a/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt +++ b/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt @@ -9,31 +9,31 @@ class MyIterator extends ArrayIterator { echo " In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; } - function rewind() { + function rewind() { $args = func_get_args(); echo " In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; return parent::rewind(); } - function valid() { + function valid() { $args = func_get_args(); echo " In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; return parent::valid(); } - - function current() { + + function current() { $args = func_get_args(); echo " In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; return parent::current(); } - function next() { + function next() { $args = func_get_args(); echo " In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; return parent::next(); } - - function key() { + + function key() { $args = func_get_args(); echo " In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; return parent::key(); diff --git a/ext/spl/tests/arrayObject_ksort_basic1.phpt b/ext/spl/tests/arrayObject_ksort_basic1.phpt index 85e90031cf..43a2a2c578 100644 --- a/ext/spl/tests/arrayObject_ksort_basic1.phpt +++ b/ext/spl/tests/arrayObject_ksort_basic1.phpt @@ -6,7 +6,7 @@ SPL: Test ArrayObject::ksort() function : basic functionality with array based s * Description: proto int ArrayIterator::ksort() * Sort the entries by key. * Source code: ext/spl/spl_array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ArrayObject::ksort() : basic functionality ***\n"; diff --git a/ext/spl/tests/arrayObject_ksort_basic2.phpt b/ext/spl/tests/arrayObject_ksort_basic2.phpt index cd1020c0cb..824165ddb8 100644 --- a/ext/spl/tests/arrayObject_ksort_basic2.phpt +++ b/ext/spl/tests/arrayObject_ksort_basic2.phpt @@ -6,7 +6,7 @@ SPL: Test ArrayObject::ksort() function : basic functionality with object base s * Description: proto int ArrayIterator::ksort() * Sort the entries by key. * Source code: ext/spl/spl_array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ArrayObject::ksort() : basic functionality ***\n"; diff --git a/ext/spl/tests/arrayObject_magicMethods1.phpt b/ext/spl/tests/arrayObject_magicMethods1.phpt index ec4812f107..351f68214a 100644 --- a/ext/spl/tests/arrayObject_magicMethods1.phpt +++ b/ext/spl/tests/arrayObject_magicMethods1.phpt @@ -8,24 +8,24 @@ class UsesMagic { public $c = 3; private $priv = 'secret'; - - function __get($name) { + + function __get($name) { $args = func_get_args(); echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; } - function __set($name, $value) { + function __set($name, $value) { $args = func_get_args(); echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; } - function __isset($name) { + function __isset($name) { $args = func_get_args(); echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; } - function __unset($name) { + function __unset($name) { $args = func_get_args(); echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; } - + } $obj = new UsesMagic; diff --git a/ext/spl/tests/arrayObject_magicMethods2.phpt b/ext/spl/tests/arrayObject_magicMethods2.phpt index 691a9a1e6c..18f0520fcd 100644 --- a/ext/spl/tests/arrayObject_magicMethods2.phpt +++ b/ext/spl/tests/arrayObject_magicMethods2.phpt @@ -8,24 +8,24 @@ class UsesMagic { public $c = 3; private $priv = 'secret'; - - function __get($name) { + + function __get($name) { $args = func_get_args(); echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; } - function __set($name, $value) { + function __set($name, $value) { $args = func_get_args(); echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; } - function __isset($name) { + function __isset($name) { $args = func_get_args(); echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; } - function __unset($name) { + function __unset($name) { $args = func_get_args(); echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; } - + } $obj = new UsesMagic; diff --git a/ext/spl/tests/arrayObject_magicMethods3.phpt b/ext/spl/tests/arrayObject_magicMethods3.phpt index 6231ceabb7..6771c46800 100644 --- a/ext/spl/tests/arrayObject_magicMethods3.phpt +++ b/ext/spl/tests/arrayObject_magicMethods3.phpt @@ -8,24 +8,24 @@ class UsesMagic { public $c = 3; private $priv = 'secret'; - - function __get($name) { + + function __get($name) { $args = func_get_args(); echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; } - function __set($name, $value) { + function __set($name, $value) { $args = func_get_args(); echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; } - function __isset($name) { + function __isset($name) { $args = func_get_args(); echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; } - function __unset($name) { + function __unset($name) { $args = func_get_args(); echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; } - + } $obj = new UsesMagic; diff --git a/ext/spl/tests/arrayObject_magicMethods4.phpt b/ext/spl/tests/arrayObject_magicMethods4.phpt index 9580dc5ae7..d6a6292fc0 100644 --- a/ext/spl/tests/arrayObject_magicMethods4.phpt +++ b/ext/spl/tests/arrayObject_magicMethods4.phpt @@ -11,26 +11,26 @@ class C { } class UsesMagic extends ArrayObject { - + public $b = "This should not be in the storage"; - function __get($name) { + function __get($name) { $args = func_get_args(); echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; } - function __set($name, $value) { + function __set($name, $value) { $args = func_get_args(); echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; } - function __isset($name) { + function __isset($name) { $args = func_get_args(); echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; } - function __unset($name) { + function __unset($name) { $args = func_get_args(); echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; } - + } $obj = new C; $ao = new UsesMagic($obj); diff --git a/ext/spl/tests/arrayObject_magicMethods5.phpt b/ext/spl/tests/arrayObject_magicMethods5.phpt index 78f0adbdd1..a3c0581bc3 100644 --- a/ext/spl/tests/arrayObject_magicMethods5.phpt +++ b/ext/spl/tests/arrayObject_magicMethods5.phpt @@ -11,26 +11,26 @@ class C { } class UsesMagic extends ArrayObject { - + public $b = "This should appear in storage"; - function __get($name) { + function __get($name) { $args = func_get_args(); echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; } - function __set($name, $value) { + function __set($name, $value) { $args = func_get_args(); echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; } - function __isset($name) { + function __isset($name) { $args = func_get_args(); echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; } - function __unset($name) { + function __unset($name) { $args = func_get_args(); echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; } - + } $obj = new C; $ao = new UsesMagic($obj); diff --git a/ext/spl/tests/arrayObject_magicMethods6.phpt b/ext/spl/tests/arrayObject_magicMethods6.phpt index b43f56c2b0..243e0f53a8 100644 --- a/ext/spl/tests/arrayObject_magicMethods6.phpt +++ b/ext/spl/tests/arrayObject_magicMethods6.phpt @@ -11,26 +11,26 @@ class C { } class UsesMagic extends ArrayObject { - + public $b = "This should never appear in storage"; - function __get($name) { + function __get($name) { $args = func_get_args(); echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; } - function __set($name, $value) { + function __set($name, $value) { $args = func_get_args(); echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; } - function __isset($name) { + function __isset($name) { $args = func_get_args(); echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; } - function __unset($name) { + function __unset($name) { $args = func_get_args(); echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n"; } - + } $obj = new C; $ao = new UsesMagic($obj, ArrayObject::ARRAY_AS_PROPS); diff --git a/ext/spl/tests/arrayObject_natcasesort_basic1.phpt b/ext/spl/tests/arrayObject_natcasesort_basic1.phpt index c959fb88e2..3c73cfa077 100644 --- a/ext/spl/tests/arrayObject_natcasesort_basic1.phpt +++ b/ext/spl/tests/arrayObject_natcasesort_basic1.phpt @@ -6,7 +6,7 @@ SPL: Test ArrayObject::natcasesort() function : basic functionality * Description: proto int ArrayIterator::natcasesort() Sort the entries by values using case insensitive "natural order" algorithm. * Source code: ext/spl/spl_array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ArrayObject::natcasesort() : basic functionality ***\n"; diff --git a/ext/spl/tests/arrayObject_natsort_basic1.phpt b/ext/spl/tests/arrayObject_natsort_basic1.phpt index d23e819f1d..41d5b60829 100644 --- a/ext/spl/tests/arrayObject_natsort_basic1.phpt +++ b/ext/spl/tests/arrayObject_natsort_basic1.phpt @@ -6,7 +6,7 @@ SPL: Test ArrayObject::natsort() function : basic functionality * Description: proto int ArrayIterator::natsort() Sort the entries by values using "natural order" algorithm. * Source code: ext/spl/spl_array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ArrayObject::natsort() : basic functionality ***\n"; diff --git a/ext/spl/tests/arrayObject_setFlags_basic1.phpt b/ext/spl/tests/arrayObject_setFlags_basic1.phpt index 391b0eeae7..d40057dfab 100644 --- a/ext/spl/tests/arrayObject_setFlags_basic1.phpt +++ b/ext/spl/tests/arrayObject_setFlags_basic1.phpt @@ -4,7 +4,7 @@ SPL: ArrayObject::setFlags basic usage with ArrayObject::ARRAY_AS_PROPS. Current <?php class C extends ArrayObject { public $p = 'object property'; -} +} function access_p($ao) { // isset diff --git a/ext/spl/tests/arrayObject_setFlags_basic2.phpt b/ext/spl/tests/arrayObject_setFlags_basic2.phpt index 6eece74cbb..fe9111c90b 100644 --- a/ext/spl/tests/arrayObject_setFlags_basic2.phpt +++ b/ext/spl/tests/arrayObject_setFlags_basic2.phpt @@ -4,11 +4,11 @@ SPL: Ensure access to non-visible properties falls back to dimension access with <?php class C extends ArrayObject { private $x = 'secret'; - + static function go($c) { var_dump($c->x); } -} +} $c = new C(array('x'=>'public')); diff --git a/ext/spl/tests/arrayObject_uasort_basic1.phpt b/ext/spl/tests/arrayObject_uasort_basic1.phpt index 6e447b6a63..0cf15a0254 100644 --- a/ext/spl/tests/arrayObject_uasort_basic1.phpt +++ b/ext/spl/tests/arrayObject_uasort_basic1.phpt @@ -6,7 +6,7 @@ SPL: Test ArrayObject::uasort() function : basic functionality * Description: proto int ArrayIterator::uasort(callback cmp_function) Sort the entries by values user defined function. * Source code: ext/spl/spl_array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ArrayObject::uasort() : basic functionality ***\n"; diff --git a/ext/spl/tests/arrayObject_uasort_error1.phpt b/ext/spl/tests/arrayObject_uasort_error1.phpt index 74e3d65089..9706eadfca 100644 --- a/ext/spl/tests/arrayObject_uasort_error1.phpt +++ b/ext/spl/tests/arrayObject_uasort_error1.phpt @@ -6,7 +6,7 @@ Test ArrayObject::uasort() function : wrong arg count * Description: proto int ArrayIterator::uasort(callback cmp_function) Sort the entries by values user defined function. * Source code: ext/spl/spl_array.c - * Alias to functions: + * Alias to functions: */ $ao = new ArrayObject(); diff --git a/ext/spl/tests/arrayObject_uksort_basic1.phpt b/ext/spl/tests/arrayObject_uksort_basic1.phpt index 825c4d747c..c7f2d3d188 100644 --- a/ext/spl/tests/arrayObject_uksort_basic1.phpt +++ b/ext/spl/tests/arrayObject_uksort_basic1.phpt @@ -6,7 +6,7 @@ Test ArrayObject::uksort() function : basic functionality * Description: proto int ArrayIterator::uksort(callback cmp_function) * Sort the entries by key using user defined function. * Source code: ext/spl/spl_array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ArrayObject::uksort() : basic functionality ***\n"; diff --git a/ext/spl/tests/arrayObject_uksort_error1.phpt b/ext/spl/tests/arrayObject_uksort_error1.phpt index ec699eb67d..8e63ca4a5b 100644 --- a/ext/spl/tests/arrayObject_uksort_error1.phpt +++ b/ext/spl/tests/arrayObject_uksort_error1.phpt @@ -6,7 +6,7 @@ Test ArrayObject::uksort() function : wrong arg count * Description: proto int ArrayIterator::uksort(callback cmp_function) Sort the entries by key using user defined function. * Source code: ext/spl/spl_array.c - * Alias to functions: + * Alias to functions: */ $ao = new ArrayObject(); diff --git a/ext/spl/tests/array_003.phpt b/ext/spl/tests/array_003.phpt index 204387da04..d5317a11c5 100644 --- a/ext/spl/tests/array_003.phpt +++ b/ext/spl/tests/array_003.phpt @@ -12,7 +12,7 @@ class test public $pub = "public"; protected $pro = "protected"; private $pri = "private"; - + function __construct() { $this->imp = "implicit"; diff --git a/ext/spl/tests/array_005.phpt b/ext/spl/tests/array_005.phpt index d7ef15db1a..b0175e7e7a 100644 --- a/ext/spl/tests/array_005.phpt +++ b/ext/spl/tests/array_005.phpt @@ -18,7 +18,7 @@ class Student { return $this->id . ', ' . $this->name; } - + public function getId() { return $this->id; @@ -34,7 +34,7 @@ class StudentIdFilter extends FilterIterator FilterIterator::__construct($students->getIterator()); $this->id = $other->getId(); } - + public function accept() { echo "ACCEPT ".$this->current()->getId()." == ".$this->id."\n"; @@ -45,19 +45,19 @@ class StudentIdFilter extends FilterIterator class StudentList implements IteratorAggregate { private $students; - + public function __construct() { $this->students = new ArrayObject(array()); } - + public function add(Student $student) { if (!$this->contains($student)) { $this->students[] = $student; } } - + public function contains(Student $student) { foreach ($this->students as $s) @@ -68,7 +68,7 @@ class StudentList implements IteratorAggregate } return false; } - + public function getIterator() { return $this->students->getIterator(); } diff --git a/ext/spl/tests/array_007.phpt b/ext/spl/tests/array_007.phpt index edf2a922d6..0bd9ef9a6d 100644 --- a/ext/spl/tests/array_007.phpt +++ b/ext/spl/tests/array_007.phpt @@ -12,12 +12,12 @@ class test implements IteratorAggregate public $pub = "public"; protected $pro = "protected"; private $pri = "private"; - + function __construct() { $this->imp = "implicit"; } - + function getIterator() { $it = new ArrayObject($this); diff --git a/ext/spl/tests/array_009a.phpt b/ext/spl/tests/array_009a.phpt index 396aa9b9e9..f2078bcd41 100644 --- a/ext/spl/tests/array_009a.phpt +++ b/ext/spl/tests/array_009a.phpt @@ -9,7 +9,7 @@ class MyRecursiveArrayIterator extends ArrayIterator implements RecursiveIterato { return is_array($this->current()); } - + function getChildren() { return new MyRecursiveArrayIterator($this->current()); diff --git a/ext/spl/tests/array_013.phpt b/ext/spl/tests/array_013.phpt index c2dc1f4989..6533819b68 100644 --- a/ext/spl/tests/array_013.phpt +++ b/ext/spl/tests/array_013.phpt @@ -6,7 +6,7 @@ SPL: ArrayIterator::append if (!class_exists('NoRewindIterator', false)) { require_once(dirname(__FILE__) . '/../examples/norewinditerator.inc'); -} +} echo "===Array===\n"; diff --git a/ext/spl/tests/array_017.phpt b/ext/spl/tests/array_017.phpt index 0fde103627..3074a76417 100644 --- a/ext/spl/tests/array_017.phpt +++ b/ext/spl/tests/array_017.phpt @@ -36,7 +36,7 @@ class ArrayObjectEx extends ArrayObject public $pub1 = 1; protected $pro1 = 2; private $pri1 = 3; - + function __construct($ar = array(), $flags = 0) { echo __METHOD__ . "()\n"; @@ -66,13 +66,13 @@ class ArrayObjectEx extends ArrayObject var_dump(array($n => $v)); } } - + function setFlags($flags) { echo __METHOD__ . "($flags)\n"; ArrayObject::setFlags($flags); } - + function getIterator() { echo __METHOD__ . "()\n"; @@ -92,21 +92,21 @@ function check($obj, $flags) $obj->show(); echo "===FOREACH===\n"; - + $it = $obj->getIterator(); foreach($it as $n => $v) { var_dump(array($n => $v)); } - + echo "===PROPERTY===\n"; - + var_dump($obj->pub1); var_dump(isset($obj->a)); $obj->setFlags($flags | 2); var_dump($obj->pub1); var_dump(isset($obj->a)); - + var_dump($it->pub2); var_dump(isset($it->pub1)); $it->setFlags($flags | 2); diff --git a/ext/spl/tests/array_021.phpt b/ext/spl/tests/array_021.phpt index f2ae0c87e5..cfe2bcb77d 100644 --- a/ext/spl/tests/array_021.phpt +++ b/ext/spl/tests/array_021.phpt @@ -25,7 +25,7 @@ catch (Exception $e) ?> ===DONE=== ---EXPECT-- +--EXPECT-- foo::seek(bar) got exception ===DONE=== diff --git a/ext/spl/tests/array_022.phpt b/ext/spl/tests/array_022.phpt index 1ce6cae4ad..75eeb8884f 100644 --- a/ext/spl/tests/array_022.phpt +++ b/ext/spl/tests/array_022.phpt @@ -44,7 +44,7 @@ var_dump($b); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- ==ArrayObject=== object(MyArrayObject)#%d (1) { ["bar"]=> diff --git a/ext/spl/tests/bug32134.phpt b/ext/spl/tests/bug32134.phpt index 5a880b321d..7c3f810401 100644 --- a/ext/spl/tests/bug32134.phpt +++ b/ext/spl/tests/bug32134.phpt @@ -2,7 +2,7 @@ Bug #32134 (Overloading offsetGet/offsetSet) --FILE-- <?php - + class myArray extends ArrayIterator { diff --git a/ext/spl/tests/bug33136.phpt b/ext/spl/tests/bug33136.phpt index 121ff58ad7..4d9a1506ca 100644 --- a/ext/spl/tests/bug33136.phpt +++ b/ext/spl/tests/bug33136.phpt @@ -6,19 +6,19 @@ Bug #33136 (method offsetSet in class extended from ArrayObject crash PHP) class Collection extends ArrayObject { private $data; - + function __construct() { $this->data = array(); parent::__construct($this->data); } - + function offsetGet($index) { echo __METHOD__ . "($index)\n"; return parent::offsetGet($index); } - + function offsetSet($index, $value) { echo __METHOD__ . "(" . (is_null($index) ? "NULL" : $index) . ",$value)\n"; diff --git a/ext/spl/tests/bug34548.phpt b/ext/spl/tests/bug34548.phpt index 27c3094902..399aa33788 100644 --- a/ext/spl/tests/bug34548.phpt +++ b/ext/spl/tests/bug34548.phpt @@ -26,7 +26,7 @@ print_r($foo->getArrayCopy()); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- Array ( [0] => one diff --git a/ext/spl/tests/bug36258.phpt b/ext/spl/tests/bug36258.phpt index 60817d06ba..428158c858 100644 --- a/ext/spl/tests/bug36258.phpt +++ b/ext/spl/tests/bug36258.phpt @@ -13,7 +13,7 @@ foreach ($diriter as $key => $file) { ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s" string(%d) "%s" ===DONE=== diff --git a/ext/spl/tests/bug36825.phpt b/ext/spl/tests/bug36825.phpt index 35de013a8f..3b68167204 100644 --- a/ext/spl/tests/bug36825.phpt +++ b/ext/spl/tests/bug36825.phpt @@ -25,7 +25,7 @@ catch (Exception $e) ?> ===DONE=== ---EXPECT-- +--EXPECT-- foo::offsetGet(bar) got exception ===DONE=== diff --git a/ext/spl/tests/bug37457.phpt b/ext/spl/tests/bug37457.phpt index 188d2fba81..4c92bbc357 100644 --- a/ext/spl/tests/bug37457.phpt +++ b/ext/spl/tests/bug37457.phpt @@ -6,13 +6,13 @@ Bug #37457 (Crash when an exception is thrown in accept() method of FilterIterat class Collection implements Iterator { protected $array, $valid = false; - + public function __construct(array $a) { echo __METHOD__ . "\n"; $this->array = $a; } - + public function current() { echo __METHOD__ . "\n"; diff --git a/ext/spl/tests/bug41691.phpt b/ext/spl/tests/bug41691.phpt index 11fe80817c..d1c53a6fe6 100644 --- a/ext/spl/tests/bug41691.phpt +++ b/ext/spl/tests/bug41691.phpt @@ -17,7 +17,7 @@ var_dump($a->exchangeArray(array('a'=>1,'b'=>1,'c'=>1))); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(3) { ["a"]=> NULL diff --git a/ext/spl/tests/bug41692.phpt b/ext/spl/tests/bug41692.phpt index c9b7d8d60f..6095a3800b 100644 --- a/ext/spl/tests/bug41692.phpt +++ b/ext/spl/tests/bug41692.phpt @@ -20,7 +20,7 @@ var_dump($bar); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- object(Bar)#%d (2) { ["foo":"Bar":private]=> array(3) { diff --git a/ext/spl/tests/bug42703.phpt b/ext/spl/tests/bug42703.phpt index 4b3e4675cc..ab4ee5ed50 100644 --- a/ext/spl/tests/bug42703.phpt +++ b/ext/spl/tests/bug42703.phpt @@ -5,18 +5,18 @@ Bug #42703 (Exception raised in an iterator::current() causes segfault in Filter class BlaIterator implements Iterator { public function rewind() { } - + public function next() { } - + public function valid() { return true; } - + public function current() { throw new Exception('boo'); } - + public function key() { } } diff --git a/ext/spl/tests/bug45216.phpt b/ext/spl/tests/bug45216.phpt index 5cf7cd948c..31e6d62352 100644 --- a/ext/spl/tests/bug45216.phpt +++ b/ext/spl/tests/bug45216.phpt @@ -4,7 +4,7 @@ SPL: SplFileObject::fgetss (bug 45216) Perrick Penet <perrick@noparking.net> #testfest phpcampparis 2008-06-07 --FILE-- -<?php +<?php $file = dirname(__FILE__) . '/foo.html'; file_put_contents($file, 'text 0<div class="tested">text 1</div>'); $handle = fopen($file, 'r'); diff --git a/ext/spl/tests/bug45614.phpt b/ext/spl/tests/bug45614.phpt index 9ab3186a75..d9e9207d28 100644 --- a/ext/spl/tests/bug45614.phpt +++ b/ext/spl/tests/bug45614.phpt @@ -9,7 +9,7 @@ class C { public $pub2 = 'public2'; public $pub3 = 'public3'; public $pub4 = 'public4'; -} +} function showFirstTwoItems($it) { echo str_replace("\0", '\0', $it->key()) . " => " . $it->current() . diff --git a/ext/spl/tests/bug45622.phpt b/ext/spl/tests/bug45622.phpt index c8d16804c0..1638000f09 100644 --- a/ext/spl/tests/bug45622.phpt +++ b/ext/spl/tests/bug45622.phpt @@ -5,7 +5,7 @@ SPL: Bug #45622 (isset($arrayObject->p) misbehaves with ArrayObject::ARRAY_AS_PR class C extends ArrayObject { public $p = 'object property'; -} +} $ao = new C(array('p'=>'array element')); $ao->setFlags(ArrayObject::ARRAY_AS_PROPS); diff --git a/ext/spl/tests/bug45622b.phpt b/ext/spl/tests/bug45622b.phpt index f101a8459d..879d610301 100644 --- a/ext/spl/tests/bug45622b.phpt +++ b/ext/spl/tests/bug45622b.phpt @@ -13,7 +13,7 @@ $ao = new UsesMagic(array(), ArrayObject::ARRAY_AS_PROPS); echo "Doesn't trigger __get.\n"; echo $ao->prop1; -echo "Doesn't trigger __set.\n"; +echo "Doesn't trigger __set.\n"; $ao->prop2 = 'foo'; echo "Doesn't trigger __unset.\n"; diff --git a/ext/spl/tests/bug50579.phpt b/ext/spl/tests/bug50579.phpt index 8672f86eea..7bc5deede8 100644 --- a/ext/spl/tests/bug50579.phpt +++ b/ext/spl/tests/bug50579.phpt @@ -6,8 +6,8 @@ Bug #50579 (RegexIterator::REPLACE doesn't work) class foo extends ArrayIterator { public function __construct( ) { parent::__construct(array( - 'test1'=>'test888', - 'test2'=>'what?', + 'test1'=>'test888', + 'test2'=>'what?', 'test3'=>'test999')); } } @@ -17,7 +17,7 @@ $i->replacement = '[$0]'; foreach ($i as $name=>$value) { echo $name . '=>' . $value . "\n"; } - + $i->replacement = '$1'; foreach ($i as $name=>$value) { echo $name . '=>' . $value . "\n"; diff --git a/ext/spl/tests/bug52238.phpt b/ext/spl/tests/bug52238.phpt index 667c0a497a..53e53e9729 100644 --- a/ext/spl/tests/bug52238.phpt +++ b/ext/spl/tests/bug52238.phpt @@ -7,7 +7,7 @@ class Foo implements IteratorAggregate public function bar() { throw new Exception; } - + public function getIterator() { return new ArrayIterator($this->bar()); } diff --git a/ext/spl/tests/bug60201.phpt b/ext/spl/tests/bug60201.phpt index c77988eb13..351b0b08a5 100644 --- a/ext/spl/tests/bug60201.phpt +++ b/ext/spl/tests/bug60201.phpt @@ -4,7 +4,7 @@ Bug #60201 (SplFileObject::setCsvControl does not expose third argument via Refl <?php $method = new ReflectionMethod('SplFileObject', 'setCsvControl'); -$params = $method->getParameters(); +$params = $method->getParameters(); var_dump($params); ?> diff --git a/ext/spl/tests/bug62433.phpt b/ext/spl/tests/bug62433.phpt index bfb3568bac..e96af6e988 100644 --- a/ext/spl/tests/bug62433.phpt +++ b/ext/spl/tests/bug62433.phpt @@ -11,7 +11,7 @@ var_dump(in_array(__DIR__ . DIRECTORY_SEPARATOR . '..', $dots)); var_dump(in_array(__DIR__ . DIRECTORY_SEPARATOR . '.', $ndots)); var_dump(in_array(__DIR__ . DIRECTORY_SEPARATOR . '..', $ndots)); ?> ---EXPECT-- +--EXPECT-- bool(true) bool(true) bool(false) diff --git a/ext/spl/tests/bug62904.phpt b/ext/spl/tests/bug62904.phpt index 9a31cc5e94..36585a5609 100644 --- a/ext/spl/tests/bug62904.phpt +++ b/ext/spl/tests/bug62904.phpt @@ -3,7 +3,7 @@ Bug #62904 (Crash when cloning an object which inherits SplFixedArray) --FILE-- <?php -class foo extends SplFixedArray { +class foo extends SplFixedArray { public function __construct($size) { } } diff --git a/ext/spl/tests/bug64264.phpt b/ext/spl/tests/bug64264.phpt index e02fb775c4..ebe30522e7 100644 --- a/ext/spl/tests/bug64264.phpt +++ b/ext/spl/tests/bug64264.phpt @@ -2,12 +2,12 @@ Bug #64264 (SPLFixedArray toArray problem) --FILE-- <?php -class MyFixedArray extends \SplFixedArray { - protected $foo; - protected $bar; -} +class MyFixedArray extends \SplFixedArray { + protected $foo; + protected $bar; +} -$myFixedArr = new MyFixedArray(1); +$myFixedArr = new MyFixedArray(1); $myFixedArr[0] = 'foo'; $myFixedArr->setSize(2); $myFixedArr[1] = 'bar'; diff --git a/ext/spl/tests/bug68479.phpt b/ext/spl/tests/bug68479.phpt index 031857e774..5d2aacb346 100644 --- a/ext/spl/tests/bug68479.phpt +++ b/ext/spl/tests/bug68479.phpt @@ -4,7 +4,7 @@ Bug #68479 (Escape parameter missing from SplFileObject::fputcsv) <?php $method = new ReflectionMethod('SplFileObject', 'fputcsv'); -$params = $method->getParameters(); +$params = $method->getParameters(); var_dump($params); ?> diff --git a/ext/spl/tests/bug71838.phpt b/ext/spl/tests/bug71838.phpt index 44fc761ceb..dc44625d8e 100644 --- a/ext/spl/tests/bug71838.phpt +++ b/ext/spl/tests/bug71838.phpt @@ -9,7 +9,7 @@ class A extends SplObjectStorage { public function __construct() { $this->a = '123'; } - + public function getA() { return $this->a; } diff --git a/ext/spl/tests/bug73471.phpt b/ext/spl/tests/bug73471.phpt index 6fdbf187be..43af0ac965 100644 --- a/ext/spl/tests/bug73471.phpt +++ b/ext/spl/tests/bug73471.phpt @@ -11,5 +11,5 @@ foreach($events as $event){} $iterator->append($events2); ?> ===DONE=== ---EXPECT-- +--EXPECT-- ===DONE=== diff --git a/ext/spl/tests/bug74519.phpt b/ext/spl/tests/bug74519.phpt index 92efb6378a..6492997b1a 100644 --- a/ext/spl/tests/bug74519.phpt +++ b/ext/spl/tests/bug74519.phpt @@ -15,7 +15,7 @@ while($iterator->valid()) { } ?> ===DONE=== ---EXPECT-- +--EXPECT-- 2 3 4 diff --git a/ext/spl/tests/bug75173.phpt b/ext/spl/tests/bug75173.phpt index a2cc9097b1..fa5d2ac371 100644 --- a/ext/spl/tests/bug75173.phpt +++ b/ext/spl/tests/bug75173.phpt @@ -8,7 +8,7 @@ $it->append(new ArrayIterator(['foo'])); foreach ($it as $item) { var_dump($item); - + if ('foo' === $item) { $it->append(new ArrayIterator(['bar'])); } diff --git a/ext/spl/tests/bug76367.phpt b/ext/spl/tests/bug76367.phpt index f34e8a39de..38aefbc922 100644 --- a/ext/spl/tests/bug76367.phpt +++ b/ext/spl/tests/bug76367.phpt @@ -10,7 +10,7 @@ while($iter->valid()) { $iter->next(); } -var_dump($iter->current()); +var_dump($iter->current()); ?> --EXPECT-- NULL diff --git a/ext/spl/tests/class_implements_basic.phpt b/ext/spl/tests/class_implements_basic.phpt index 1170b214f8..a0a53a82df 100644 --- a/ext/spl/tests/class_implements_basic.phpt +++ b/ext/spl/tests/class_implements_basic.phpt @@ -5,7 +5,7 @@ SPL: Test class_implements() function : basic /* Prototype : array class_implements(mixed what [, bool autoload ]) * Description: Return all classes and interfaces implemented by SPL * Source code: ext/spl/php_spl.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing class_implements() : basic ***\n"; diff --git a/ext/spl/tests/class_implements_basic2.phpt b/ext/spl/tests/class_implements_basic2.phpt index ea25e5b98d..26ec288015 100644 --- a/ext/spl/tests/class_implements_basic2.phpt +++ b/ext/spl/tests/class_implements_basic2.phpt @@ -5,7 +5,7 @@ SPL: Test class_implements() function : basic /* Prototype : array class_implements(mixed what [, bool autoload ]) * Description: Return all classes and interfaces implemented by SPL * Source code: ext/spl/php_spl.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing class_implements() : basic ***\n"; diff --git a/ext/spl/tests/class_implements_variation.phpt b/ext/spl/tests/class_implements_variation.phpt index 4d9e88622d..a3e33a1761 100644 --- a/ext/spl/tests/class_implements_variation.phpt +++ b/ext/spl/tests/class_implements_variation.phpt @@ -5,7 +5,7 @@ SPL: Test class_implements() function : variation - no interfaces and autoload /* Prototype : array class_implements(mixed what [, bool autoload ]) * Description: Return all classes and interfaces implemented by SPL * Source code: ext/spl/php_spl.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing class_implements() : variation ***\n"; diff --git a/ext/spl/tests/class_implements_variation1.phpt b/ext/spl/tests/class_implements_variation1.phpt index d8a45ce6a6..01044458e1 100644 --- a/ext/spl/tests/class_implements_variation1.phpt +++ b/ext/spl/tests/class_implements_variation1.phpt @@ -5,7 +5,7 @@ SPL: Test class_implements() function : variation /* Prototype : array class_implements(mixed what [, bool autoload ]) * Description: Return all classes and interfaces implemented by SPL * Source code: ext/spl/php_spl.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing class_implements() : variation ***\n"; @@ -96,7 +96,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + //resource 'resource' => $res, ); diff --git a/ext/spl/tests/class_implements_variation2.phpt b/ext/spl/tests/class_implements_variation2.phpt index c65fdd1626..6e05820dac 100644 --- a/ext/spl/tests/class_implements_variation2.phpt +++ b/ext/spl/tests/class_implements_variation2.phpt @@ -5,7 +5,7 @@ SPL: Test class_implements() function : variation /* Prototype : array class_implements(mixed what [, bool autoload ]) * Description: Return all classes and interfaces implemented by SPL * Source code: ext/spl/php_spl.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing class_implements() : variation ***\n"; @@ -96,7 +96,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + //resource 'resource' => $res, ); diff --git a/ext/spl/tests/class_uses_basic.phpt b/ext/spl/tests/class_uses_basic.phpt index 8aeb7b52a7..99070d623f 100644 --- a/ext/spl/tests/class_uses_basic.phpt +++ b/ext/spl/tests/class_uses_basic.phpt @@ -5,7 +5,7 @@ SPL: Test class_implements() function : basic /* Prototype : array class_uses(mixed what [, bool autoload ]) * Description: Return all traits used by a class * Source code: ext/spl/php_spl.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing class_uses() : basic ***\n"; diff --git a/ext/spl/tests/class_uses_basic2.phpt b/ext/spl/tests/class_uses_basic2.phpt index a0ffe8b861..ed656639e6 100644 --- a/ext/spl/tests/class_uses_basic2.phpt +++ b/ext/spl/tests/class_uses_basic2.phpt @@ -5,7 +5,7 @@ SPL: Test class_uses() function : basic /* Prototype : array class_uses(mixed what [, bool autoload ]) * Description: Return all traits used by a class * Source code: ext/spl/php_spl.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing class_uses() : basic ***\n"; diff --git a/ext/spl/tests/class_uses_variation.phpt b/ext/spl/tests/class_uses_variation.phpt index 3424e13397..5df38cc2a4 100644 --- a/ext/spl/tests/class_uses_variation.phpt +++ b/ext/spl/tests/class_uses_variation.phpt @@ -5,7 +5,7 @@ SPL: Test class_uses() function : variation - no interfaces and autoload /* Prototype : array class_uses(mixed what [, bool autoload ]) * Description: Return all traits used by a class * Source code: ext/spl/php_spl.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing class_uses() : variation ***\n"; diff --git a/ext/spl/tests/class_uses_variation1.phpt b/ext/spl/tests/class_uses_variation1.phpt index aa0ba35c94..8e27db6b9b 100644 --- a/ext/spl/tests/class_uses_variation1.phpt +++ b/ext/spl/tests/class_uses_variation1.phpt @@ -5,7 +5,7 @@ SPL: Test class_uses() function : variation /* Prototype : array class_uses(mixed what [, bool autoload ]) * Description: Return all traits used by a class * Source code: ext/spl/php_spl.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing class_uses() : variation ***\n"; @@ -96,7 +96,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + //resource 'resource' => $res, ); diff --git a/ext/spl/tests/class_uses_variation2.phpt b/ext/spl/tests/class_uses_variation2.phpt index 68e5119b88..bb560ff44f 100644 --- a/ext/spl/tests/class_uses_variation2.phpt +++ b/ext/spl/tests/class_uses_variation2.phpt @@ -5,7 +5,7 @@ SPL: Test class_uses() function : variation /* Prototype : array class_uses(mixed what [, bool autoload ]) * Description: Return all traits used by a class * Source code: ext/spl/php_spl.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing class_uses() : variation ***\n"; @@ -98,7 +98,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + //resource 'resource' => $res, ); diff --git a/ext/spl/tests/fileobject_003.phpt b/ext/spl/tests/fileobject_003.phpt index 6cc650b7b5..822e21b9fa 100644 --- a/ext/spl/tests/fileobject_003.phpt +++ b/ext/spl/tests/fileobject_003.phpt @@ -17,7 +17,7 @@ function test($name, $lc, $lp) var_dump($o === $c); var_dump($o == $c); var_dump($o->getPathname() == $c->getPathname()); - + try { $f = new SplFileObject($name); var_dump($name); diff --git a/ext/spl/tests/fileobject_getmaxlinelen_basic.phpt b/ext/spl/tests/fileobject_getmaxlinelen_basic.phpt index b08a71190d..49cf536f89 100644 --- a/ext/spl/tests/fileobject_getmaxlinelen_basic.phpt +++ b/ext/spl/tests/fileobject_getmaxlinelen_basic.phpt @@ -7,8 +7,8 @@ H�vard Eide <nucleuz at gmail.com> include_path=. --FILE-- <?php -$s = new SplFileObject( __FILE__ ); -$s->setMaxLineLen( 7 ); +$s = new SplFileObject( __FILE__ ); +$s->setMaxLineLen( 7 ); echo $s->getMaxLineLen(); ?> --EXPECT-- diff --git a/ext/spl/tests/fileobject_setmaxlinelen_basic.phpt b/ext/spl/tests/fileobject_setmaxlinelen_basic.phpt index 1d81a6f651..3af6f01a7f 100644 --- a/ext/spl/tests/fileobject_setmaxlinelen_basic.phpt +++ b/ext/spl/tests/fileobject_setmaxlinelen_basic.phpt @@ -7,8 +7,8 @@ H�vard Eide <nucleuz at gmail.com> include_path=. --FILE-- <?php -$s = new SplFileObject( __FILE__ ); -$s->setMaxLineLen( 3); +$s = new SplFileObject( __FILE__ ); +$s->setMaxLineLen( 3); echo $s->getCurrentLine(); ?> --EXPECT-- diff --git a/ext/spl/tests/fixedarray_008.phpt b/ext/spl/tests/fixedarray_008.phpt index 8775d61fff..6d9c9cbf09 100644 --- a/ext/spl/tests/fixedarray_008.phpt +++ b/ext/spl/tests/fixedarray_008.phpt @@ -17,7 +17,7 @@ foreach ($a as $x) { var_dump($x[0]); } else { var_dump($x); - } + } } var_dump($a->getSize()); diff --git a/ext/spl/tests/fixedarray_010.phpt b/ext/spl/tests/fixedarray_010.phpt index 472e8b07a2..7af3a83156 100644 --- a/ext/spl/tests/fixedarray_010.phpt +++ b/ext/spl/tests/fixedarray_010.phpt @@ -30,10 +30,10 @@ var_dump($a->getSize()); $a = new SplFixedArray(3); -$a[0] = "test"; -$a[1] = array(1,2,"blah"); -$a[2] = 1; -$a[0] = "test"; +$a[0] = "test"; +$a[1] = array(1,2,"blah"); +$a[2] = 1; +$a[0] = "test"; $a->setSize(0); var_dump($a->getSize()); diff --git a/ext/spl/tests/fixedarray_015.phpt b/ext/spl/tests/fixedarray_015.phpt index a25e1dc669..3fedd35090 100644 --- a/ext/spl/tests/fixedarray_015.phpt +++ b/ext/spl/tests/fixedarray_015.phpt @@ -11,6 +11,6 @@ try { echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- Ok - SplFixedArray::__construct() expects parameter 1 to be int, string given Done diff --git a/ext/spl/tests/heap_corruption.phpt b/ext/spl/tests/heap_corruption.phpt index 5e9dec7855..6b85681de5 100644 --- a/ext/spl/tests/heap_corruption.phpt +++ b/ext/spl/tests/heap_corruption.phpt @@ -9,7 +9,7 @@ Mike Sullivan <mikesul@php.net> class myHeap extends SplHeap { public $allow_compare = true; - + public function compare($v1, $v2) { if ($this->allow_compare == true) diff --git a/ext/spl/tests/iterator_001.phpt b/ext/spl/tests/iterator_001.phpt index 26df62e85b..f5bb6974d9 100644 --- a/ext/spl/tests/iterator_001.phpt +++ b/ext/spl/tests/iterator_001.phpt @@ -44,7 +44,7 @@ class NumericArrayIterator implements Iterator echo __METHOD__ . "\n"; $this->i++; } - + public function greaterThan($comp) { echo get_class($this) . '::' . __FUNCTION__ . '(' . $comp . ")\n"; diff --git a/ext/spl/tests/iterator_002.phpt b/ext/spl/tests/iterator_002.phpt index 527fe6b776..61765421f1 100644 --- a/ext/spl/tests/iterator_002.phpt +++ b/ext/spl/tests/iterator_002.phpt @@ -9,7 +9,7 @@ class RecursiceArrayIterator extends ArrayIterator implements RecursiveIterator { return is_array($this->current()); } - + function getChildren() { return new RecursiceArrayIterator($this->current()); @@ -22,12 +22,12 @@ class CrashIterator extends FilterIterator implements RecursiveIterator { return true; } - + function hasChildren() { return $this->getInnerIterator()->hasChildren(); } - + function getChildren() { return new RecursiceArrayIterator($this->getInnerIterator()->current()); diff --git a/ext/spl/tests/iterator_003.phpt b/ext/spl/tests/iterator_003.phpt index 11d37b303b..f119661f57 100644 --- a/ext/spl/tests/iterator_003.phpt +++ b/ext/spl/tests/iterator_003.phpt @@ -18,7 +18,7 @@ class Student { return $this->id . ', ' . $this->name; } - + public function getId() { return $this->id; @@ -34,7 +34,7 @@ class StudentIdFilter extends FilterIterator FilterIterator::__construct($students->getIterator()); $this->id = $other->getId(); } - + public function accept() { echo "ACCEPT ".$this->current()->getId()." == ".$this->id."\n"; @@ -45,19 +45,19 @@ class StudentIdFilter extends FilterIterator class StudentList implements IteratorAggregate { private $students; - + public function __construct() { $this->students = new ArrayObject(array()); } - + public function add(Student $student) { if (!$this->contains($student)) { $this->students[] = $student; } } - + public function contains(Student $student) { foreach ($this->students as $s) @@ -68,7 +68,7 @@ class StudentList implements IteratorAggregate } return false; } - + public function getIterator() { return new CachingIterator($this->students->getIterator(), true); } diff --git a/ext/spl/tests/iterator_022.phpt b/ext/spl/tests/iterator_022.phpt index 8d055313ac..f0831d5799 100644 --- a/ext/spl/tests/iterator_022.phpt +++ b/ext/spl/tests/iterator_022.phpt @@ -88,7 +88,7 @@ class RecursiveArrayIteratorIterator extends RecursiveIteratorIterator } return $res; } - + function callGetChildren() { if ($this->over == 2) diff --git a/ext/spl/tests/iterator_023.phpt b/ext/spl/tests/iterator_023.phpt index 1b6b4685ec..c11a7355cf 100644 --- a/ext/spl/tests/iterator_023.phpt +++ b/ext/spl/tests/iterator_023.phpt @@ -88,7 +88,7 @@ class RecursiveArrayIteratorIterator extends RecursiveIteratorIterator } return $res; } - + function callGetChildren() { if ($this->over == 2) diff --git a/ext/spl/tests/iterator_025.phpt b/ext/spl/tests/iterator_025.phpt index e582b1f39e..623a4cbcf4 100644 --- a/ext/spl/tests/iterator_025.phpt +++ b/ext/spl/tests/iterator_025.phpt @@ -9,7 +9,7 @@ class MyRecursiveIteratorIterator extends RecursiveIteratorIterator { echo __METHOD__ . "()\n"; } - + function endIteration() { echo __METHOD__ . "()\n"; diff --git a/ext/spl/tests/iterator_031.phpt b/ext/spl/tests/iterator_031.phpt index 8bd3ca7c54..da91469f08 100644 --- a/ext/spl/tests/iterator_031.phpt +++ b/ext/spl/tests/iterator_031.phpt @@ -37,13 +37,13 @@ class MyAppendIterator extends AppendIterator echo __METHOD__ . "\n"; return parent::valid(); } - + function append(Iterator $what) { echo __METHOD__ . "\n"; parent::append($what); } - + function parent__construct() { parent::__construct(); diff --git a/ext/spl/tests/iterator_034.phpt b/ext/spl/tests/iterator_034.phpt index 3329e744bd..84b15d4eec 100644 --- a/ext/spl/tests/iterator_034.phpt +++ b/ext/spl/tests/iterator_034.phpt @@ -23,7 +23,7 @@ class MyRecursiveArrayIterator extends RecursiveArrayIterator echo __METHOD__ . "()\n"; return parent::getChildren(); } - + function rewind() { echo __METHOD__ . "()\n"; diff --git a/ext/spl/tests/iterator_035.phpt b/ext/spl/tests/iterator_035.phpt index 307337431a..e6d68fbea6 100644 --- a/ext/spl/tests/iterator_035.phpt +++ b/ext/spl/tests/iterator_035.phpt @@ -2,7 +2,7 @@ SPL: ArrayIterator and values assigned by reference --FILE-- <?php - + $tmp = 1; $a = new ArrayIterator(); @@ -11,7 +11,7 @@ $a[] = &$tmp; echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Notice: Indirect modification of overloaded element of ArrayIterator has no effect in %s on line %d Fatal error: Uncaught Error: Cannot assign by reference to overloaded object in %s:%d diff --git a/ext/spl/tests/iterator_036.phpt b/ext/spl/tests/iterator_036.phpt index 0f668db53f..a4ff7a214c 100644 --- a/ext/spl/tests/iterator_036.phpt +++ b/ext/spl/tests/iterator_036.phpt @@ -17,6 +17,6 @@ test(new CachingIterator($ar, 0)); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- Fatal error: Method CachingIterator::__toString() must not throw an exception, caught BadMethodCallException: CachingIterator does not fetch string value (see CachingIterator::__construct) in %siterator_036.php on line %d diff --git a/ext/spl/tests/iterator_037.phpt b/ext/spl/tests/iterator_037.phpt index a95cbee77c..da8c465ca9 100644 --- a/ext/spl/tests/iterator_037.phpt +++ b/ext/spl/tests/iterator_037.phpt @@ -89,7 +89,7 @@ catch (Exception $e) ?> ===DONE=== ---EXPECT-- +--EXPECT-- ===1=== int(1) string(1) "1" diff --git a/ext/spl/tests/iterator_045.phpt b/ext/spl/tests/iterator_045.phpt index d76b2d93ce..c8ffae77a5 100644 --- a/ext/spl/tests/iterator_045.phpt +++ b/ext/spl/tests/iterator_045.phpt @@ -27,7 +27,7 @@ class MyCachingIterator extends CachingIterator $this->offsetSet($k, $v); } } - + function testUnset($ar) { echo __METHOD__ . "()\n"; @@ -37,7 +37,7 @@ class MyCachingIterator extends CachingIterator $this->offsetUnset($v); } } - + function fill() { echo __METHOD__ . "()\n"; diff --git a/ext/spl/tests/iterator_052.phpt b/ext/spl/tests/iterator_052.phpt index 84b3eb993c..4c8191fab7 100644 --- a/ext/spl/tests/iterator_052.phpt +++ b/ext/spl/tests/iterator_052.phpt @@ -6,7 +6,7 @@ SPL: RegexIterator::ALL_MATCHES class MyRegexIterator extends RegexIterator { public $uk, $re; - + function __construct($it, $re, $mode, $flags = 0) { $this->uk = $flags & self::USE_KEY; @@ -22,7 +22,7 @@ class MyRegexIterator extends RegexIterator var_dump($v); } } - + function accept() { @preg_match_all($this->re, (string)($this->uk ? $this->key() : $this->current()), $sub); diff --git a/ext/spl/tests/iterator_053.phpt b/ext/spl/tests/iterator_053.phpt index 21c044c1b2..fb8e1e5f14 100644 --- a/ext/spl/tests/iterator_053.phpt +++ b/ext/spl/tests/iterator_053.phpt @@ -6,7 +6,7 @@ SPL: RegexIterator::ALL_MATCHES class MyRegexIterator extends RegexIterator { public $uk, $re; - + function __construct($it, $re, $mode, $flags = 0) { $this->uk = $flags & self::USE_KEY; @@ -22,7 +22,7 @@ class MyRegexIterator extends RegexIterator var_dump($v); } } - + function accept() { @preg_match_all($this->re, (string)($this->uk ? $this->key() : $this->current()), $sub); diff --git a/ext/spl/tests/iterator_056.phpt b/ext/spl/tests/iterator_056.phpt index b5213732c3..ec49e6b740 100644 --- a/ext/spl/tests/iterator_056.phpt +++ b/ext/spl/tests/iterator_056.phpt @@ -20,25 +20,25 @@ class myLimitIterator extends LimitIterator { } class myNoRewindIterator extends NoRewindIterator {} try { - $it = new myFilterIterator(); + $it = new myFilterIterator(); } catch (TypeError $e) { echo $e->getMessage(), "\n"; } try { - $it = new myCachingIterator(); + $it = new myCachingIterator(); } catch (TypeError $e) { echo $e->getMessage(), "\n"; } try { - $it = new myRecursiveCachingIterator(); + $it = new myRecursiveCachingIterator(); } catch (TypeError $e) { echo $e->getMessage(), "\n"; } try { - $it = new myParentIterator(); + $it = new myParentIterator(); } catch (TypeError $e) { echo $e->getMessage(), "\n"; } diff --git a/ext/spl/tests/iterator_057.phpt b/ext/spl/tests/iterator_057.phpt index 602c125015..64d9951021 100644 --- a/ext/spl/tests/iterator_057.phpt +++ b/ext/spl/tests/iterator_057.phpt @@ -6,7 +6,7 @@ Sebastian Schürmann <?php /** * From Docs: Construct a new array iterator from anything that has a hash table. - * NULL, NOTHING is not a hash table ;) + * NULL, NOTHING is not a hash table ;) */ class myArrayIterator extends ArrayIterator { } diff --git a/ext/spl/tests/iterator_058.phpt b/ext/spl/tests/iterator_058.phpt index 3f65ecb7e4..83d9d91feb 100644 --- a/ext/spl/tests/iterator_058.phpt +++ b/ext/spl/tests/iterator_058.phpt @@ -5,16 +5,16 @@ Sebastian Schürmann --FILE-- <?php class myIterator implements Iterator { - + function current() {} function next() {} - function key() {} + function key() {} function valid() {} function rewind() {} - + } try { - $it = new myIterator(); + $it = new myIterator(); } catch (InvalidArgumentException $e) { echo 'InvalidArgumentException thrown'; } diff --git a/ext/spl/tests/iterator_062.phpt b/ext/spl/tests/iterator_062.phpt index 59a1dfacf0..3694cf1956 100644 --- a/ext/spl/tests/iterator_062.phpt +++ b/ext/spl/tests/iterator_062.phpt @@ -5,7 +5,7 @@ Sebastian Schürmann --FILE-- <?php class myRecursiveIteratorIterator extends RecursiveIteratorIterator { - + } try { diff --git a/ext/spl/tests/iterator_069.phpt b/ext/spl/tests/iterator_069.phpt index 101fe91681..975fbe2f8e 100644 --- a/ext/spl/tests/iterator_069.phpt +++ b/ext/spl/tests/iterator_069.phpt @@ -1,7 +1,7 @@ --TEST-- SPL: RecursiveIteratorIterator cannot be used with foreach by reference --FILE-- -<?php +<?php $arr = array(array(1,2)); $arrOb = new ArrayObject($arr); diff --git a/ext/spl/tests/iterator_071.phpt b/ext/spl/tests/iterator_071.phpt index 5fc65edf9c..930499bef5 100644 --- a/ext/spl/tests/iterator_071.phpt +++ b/ext/spl/tests/iterator_071.phpt @@ -1,7 +1,7 @@ --TEST-- SPL: RecursiveIteratorIterator - Test where the case is RS_SELF and mode is CHILD_FIRST --FILE-- -<?php +<?php $arr = array(array(1,2),2); $arrOb = new ArrayObject($arr); @@ -9,7 +9,7 @@ $arrOb = new ArrayObject($arr); $recArrIt = new RecursiveArrayIterator($arrOb->getIterator()); class MyRecursiveIteratorIterator extends RecursiveIteratorIterator { - + function nextelement() { echo __METHOD__."\n"; } diff --git a/ext/spl/tests/observer_001.phpt b/ext/spl/tests/observer_001.phpt index e7d72b9e24..6408406ebf 100644 --- a/ext/spl/tests/observer_001.phpt +++ b/ext/spl/tests/observer_001.phpt @@ -16,7 +16,7 @@ class ObserverImpl implements SplObserver { echo $this->name . '->' . __METHOD__ . '(' . $subject->getName() . ");\n"; } - + function getName() { return $this->name; diff --git a/ext/spl/tests/observer_002.phpt b/ext/spl/tests/observer_002.phpt index 5d006177f2..504e7ca3f3 100644 --- a/ext/spl/tests/observer_002.phpt +++ b/ext/spl/tests/observer_002.phpt @@ -49,7 +49,7 @@ class ObserverImpl implements SplObserver { echo $this->name . '->' . __METHOD__ . '(' . $subject->getName() . ");\n"; } - + function getName() { return $this->name; @@ -72,18 +72,18 @@ class SubjectImpl implements SplSubject echo $this->name . '->' . __METHOD__ . '(' . $observer->getName() . ");\n"; $this->observers->attach($observer); } - + function detach(SplObserver $observer) { echo $this->name . '->' . __METHOD__ . '(' . $observer->getName() . ");\n"; $this->observers->detach($observer); } - + function count() { return $this->observers->count(); } - + function notify() { echo $this->name . '->' . __METHOD__ . "();\n"; @@ -97,7 +97,7 @@ class SubjectImpl implements SplSubject { return $this->name; } - + function contains($obj) { return $this->observers->contains($obj); diff --git a/ext/spl/tests/observer_003.phpt b/ext/spl/tests/observer_003.phpt index 5e5da22e38..c7041051b8 100644 --- a/ext/spl/tests/observer_003.phpt +++ b/ext/spl/tests/observer_003.phpt @@ -6,7 +6,7 @@ SPL: SplObjectStorage serialization class TestClass { public $test = 25; - + public function __construct($test = 42) { $this->test = $test; diff --git a/ext/spl/tests/observer_004.phpt b/ext/spl/tests/observer_004.phpt index 0bc2512d80..a56c514615 100644 --- a/ext/spl/tests/observer_004.phpt +++ b/ext/spl/tests/observer_004.phpt @@ -6,7 +6,7 @@ SPL: SplObjectStorage serialization & overloading class TestClass { public $test = 25; - + public function __construct($test = 42) { $this->test = $test; @@ -16,7 +16,7 @@ class TestClass class MyStorage extends SplObjectStorage { public $bla = 25; - + public function __construct($bla = 26) { $this->bla = $bla; diff --git a/ext/spl/tests/observer_005.phpt b/ext/spl/tests/observer_005.phpt index 883602f51d..fe490525b8 100644 --- a/ext/spl/tests/observer_005.phpt +++ b/ext/spl/tests/observer_005.phpt @@ -9,7 +9,7 @@ class TestClass public $pub = 25; protected $pro = 26; private $pri = 27; - + public function __construct($pub = 42, $pro = 43, $pri = 44) { $this->pub = $pub; @@ -28,7 +28,7 @@ class MyStorage extends SplObjectStorage public $pub = 25; protected $pro = 26; private $pri = 27; - + public function __construct($pub = 52, $pro = 53, $pri = 54) { $this->pub = $pub; diff --git a/ext/spl/tests/observer_006.phpt b/ext/spl/tests/observer_006.phpt index 3cd84a742f..f021dfb7f2 100644 --- a/ext/spl/tests/observer_006.phpt +++ b/ext/spl/tests/observer_006.phpt @@ -6,7 +6,7 @@ SPL: SplObjectStorage with accociatied information class TestClass { public $test = 25; - + public function __construct($test = 42) { $this->test = $test; @@ -16,7 +16,7 @@ class TestClass class MyStorage extends SplObjectStorage { public $bla = 25; - + public function __construct($bla = 26) { $this->bla = $bla; diff --git a/ext/spl/tests/recursiveIteratorIterator_beginchildren_error.phpt b/ext/spl/tests/recursiveIteratorIterator_beginchildren_error.phpt index 7ed3b6eb34..cac0e2c479 100644 --- a/ext/spl/tests/recursiveIteratorIterator_beginchildren_error.phpt +++ b/ext/spl/tests/recursiveIteratorIterator_beginchildren_error.phpt @@ -1,7 +1,7 @@ --TEST-- SPL: RecursiveIteratorIterator - Exception thrown in beginchildren which should be handled in next() --FILE-- -<?php +<?php $arr = array(array(1,2),2); $arrOb = new ArrayObject($arr); @@ -9,7 +9,7 @@ $arrOb = new ArrayObject($arr); $recArrIt = new RecursiveArrayIterator($arrOb->getIterator()); class MyRecursiveIteratorIterator extends RecursiveIteratorIterator { - + function beginchildren() { throw new Exception; } diff --git a/ext/spl/tests/recursiveIteratorIterator_callHasChildren_error.phpt b/ext/spl/tests/recursiveIteratorIterator_callHasChildren_error.phpt index 0e3c1c1439..1961517253 100644 --- a/ext/spl/tests/recursiveIteratorIterator_callHasChildren_error.phpt +++ b/ext/spl/tests/recursiveIteratorIterator_callHasChildren_error.phpt @@ -1,7 +1,7 @@ --TEST-- SPL: RecursiveIteratorIterator - Exception thrown in callHasChildren which should be handled in next() --FILE-- -<?php +<?php $arr = array(1,2); $arrOb = new ArrayObject($arr); @@ -9,7 +9,7 @@ $arrOb = new ArrayObject($arr); $recArrIt = new RecursiveArrayIterator($arrOb->getIterator()); class MyRecursiveIteratorIterator extends RecursiveIteratorIterator { - + function callHasChildren() { throw new Exception; } diff --git a/ext/spl/tests/recursiveIteratorIterator_endchildren_error.phpt b/ext/spl/tests/recursiveIteratorIterator_endchildren_error.phpt index 32617bf108..941f92be82 100644 --- a/ext/spl/tests/recursiveIteratorIterator_endchildren_error.phpt +++ b/ext/spl/tests/recursiveIteratorIterator_endchildren_error.phpt @@ -1,7 +1,7 @@ --TEST-- SPL: RecursiveIteratorIterator - Exception thrown in endchildren which should be handled in next() --FILE-- -<?php +<?php $arr = array(array(1,2)); $arrOb = new ArrayObject($arr); @@ -9,7 +9,7 @@ $arrOb = new ArrayObject($arr); $recArrIt = new RecursiveArrayIterator($arrOb->getIterator()); class MyRecursiveIteratorIterator extends RecursiveIteratorIterator { - + function endchildren() { throw new Exception; } diff --git a/ext/spl/tests/recursiveIteratorIterator_nextelement_error.phpt b/ext/spl/tests/recursiveIteratorIterator_nextelement_error.phpt index a2c0d2ea1b..dd4f038710 100644 --- a/ext/spl/tests/recursiveIteratorIterator_nextelement_error.phpt +++ b/ext/spl/tests/recursiveIteratorIterator_nextelement_error.phpt @@ -1,7 +1,7 @@ --TEST-- SPL: RecursiveIteratorIterator - Exception thrown in nextelement which should be handled in next() --FILE-- -<?php +<?php $arr = array(1,2); $arrOb = new ArrayObject($arr); @@ -9,7 +9,7 @@ $arrOb = new ArrayObject($arr); $recArrIt = new RecursiveArrayIterator($arrOb->getIterator()); class MyRecursiveIteratorIterator extends RecursiveIteratorIterator { - + function nextelement() { throw new Exception; } diff --git a/ext/spl/tests/regexiterator_setflags_exception.phpt b/ext/spl/tests/regexiterator_setflags_exception.phpt index fdc8bca649..44108c746d 100644 --- a/ext/spl/tests/regexiterator_setflags_exception.phpt +++ b/ext/spl/tests/regexiterator_setflags_exception.phpt @@ -24,7 +24,7 @@ $rege = '/^a/'; $r = new TestRegexIterator(new myIterator, $rege); -try{ +try{ $r->setFlags(); }catch (Exception $e) { echo $e->getMessage(); diff --git a/ext/spl/tests/regexiterator_setpregflags_exception.phpt b/ext/spl/tests/regexiterator_setpregflags_exception.phpt index cc7c17c272..c84af67d2b 100644 --- a/ext/spl/tests/regexiterator_setpregflags_exception.phpt +++ b/ext/spl/tests/regexiterator_setpregflags_exception.phpt @@ -25,7 +25,7 @@ $rege = '/^a/'; $r = new TestRegexIterator(new myIterator, $rege); -try{ +try{ $r->setPregFlags(); }catch (Exception $e) { echo $e->getMessage(); diff --git a/ext/spl/tests/spl_autoload_002.phpt b/ext/spl/tests/spl_autoload_002.phpt index 2373d6dbbc..778b22a7d0 100644 --- a/ext/spl/tests/spl_autoload_002.phpt +++ b/ext/spl/tests/spl_autoload_002.phpt @@ -1,8 +1,8 @@ --TEST-- SPL: spl_autoload_functions() --SKIPIF-- -<?php -if (spl_autoload_functions() !== false) die('skip __autoload() registered by php.ini'); +<?php +if (spl_autoload_functions() !== false) die('skip __autoload() registered by php.ini'); ?> --FILE-- <?php diff --git a/ext/spl/tests/spl_autoload_005.phpt b/ext/spl/tests/spl_autoload_005.phpt index 90fd63d88b..ccebf91f04 100644 --- a/ext/spl/tests/spl_autoload_005.phpt +++ b/ext/spl/tests/spl_autoload_005.phpt @@ -11,7 +11,7 @@ class MyAutoLoader { { echo __METHOD__ . "($className)\n"; } - + function autoThrow($className) { echo __METHOD__ . "($className)\n"; diff --git a/ext/spl/tests/spl_autoload_008.phpt b/ext/spl/tests/spl_autoload_008.phpt index 4b10351866..df795d02b6 100644 --- a/ext/spl/tests/spl_autoload_008.phpt +++ b/ext/spl/tests/spl_autoload_008.phpt @@ -18,7 +18,7 @@ class MyAutoLoader echo __METHOD__ . "($className)\n"; throw new Exception('Bla'); } - + function dynaLoad($className) { echo __METHOD__ . "($className)\n"; @@ -49,9 +49,9 @@ foreach($funcs as $idx => $func) if (count(spl_autoload_functions())) { echo "registered\n"; - + var_dump(class_exists("NoExistingTestClass", true)); - } + } } catch (Exception $e) { diff --git a/ext/spl/tests/spl_iterator_getcallchildren.phpt b/ext/spl/tests/spl_iterator_getcallchildren.phpt index 2178db7c96..8d825481fb 100644 --- a/ext/spl/tests/spl_iterator_getcallchildren.phpt +++ b/ext/spl/tests/spl_iterator_getcallchildren.phpt @@ -16,7 +16,7 @@ var_dump($test->current()); try { $output = $test->callGetChildren(); } catch (InvalidArgumentException $ilae){ - $output = null; + $output = null; print "invalid argument exception\n"; } var_dump($output); diff --git a/ext/standard/tests/array/005.phpt b/ext/standard/tests/array/005.phpt index 667c954895..9257ce951b 100644 --- a/ext/standard/tests/array/005.phpt +++ b/ext/standard/tests/array/005.phpt @@ -52,13 +52,13 @@ var_dump( array_shift($empty_array) ); echo "\n*** Testing with various array inputs ***\n"; $counter = 1; -foreach( $mixed_array as $sub_array ) { +foreach( $mixed_array as $sub_array ) { echo "\n-- Input Array for Iteration $counter is -- \n"; print_r( $sub_array ); echo "\nOutput after shift is :\n"; var_dump( array_shift($sub_array) ); $counter++; -} +} /*Checking for internal array pointer beint reset when shift is called */ diff --git a/ext/standard/tests/array/009.phpt b/ext/standard/tests/array/009.phpt index f275085de5..4e046dfbed 100644 --- a/ext/standard/tests/array/009.phpt +++ b/ext/standard/tests/array/009.phpt @@ -19,16 +19,16 @@ $basic_arrays = array ( array('d' => 'drink', 'p' => 'port', 's' => 'set'), // another associative array array(1 => 'One', 2 => 'two', 3 => "three") // associative array with key as integers ); - + $varient_arrays = array ( array(), // empty array array(""), // array with null string array(NULL),// array with NULL array(null),// array with null array(NULL, true, null, "", 1), // mixed array - array(-1.5 => "test", -2 => "rest", 2.5 => "two", + array(-1.5 => "test", -2 => "rest", 2.5 => "two", "" => "string", 0 => "zero", "" => "" ) // mixed array -); +); echo "*** Testing basic operations ***\n"; $loop_count = 1; @@ -69,7 +69,7 @@ foreach ($varient_arrays as $sub_array ) { echo "\n"; } -/*test these functions on array which is already unset */ +/*test these functions on array which is already unset */ echo "\n-- Testing variation: when array is unset --\n"; $unset_array = array (1); unset($unset_array); @@ -116,7 +116,7 @@ var_dump( reset($string) ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- *** Testing basic operations *** -- Iteration 1 -- int(0) diff --git a/ext/standard/tests/array/array_change_key_case_variation.phpt b/ext/standard/tests/array/array_change_key_case_variation.phpt index 5c2d524f9b..3f8d502ffe 100644 --- a/ext/standard/tests/array/array_change_key_case_variation.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation.phpt @@ -6,17 +6,17 @@ Test array_change_key_case() function - 2 $item = array ("one" => 1, "two" => 2, "THREE" => 3, "FOUR" => "four"); /* use 'case' argument other than CASE_LOWER & CASE_UPPER */ -var_dump(array_change_key_case($item, "CASE_UPPER")); -var_dump(array_change_key_case($item, 5)); +var_dump(array_change_key_case($item, "CASE_UPPER")); +var_dump(array_change_key_case($item, 5)); /* when keys are different in terms of only case */ /* should return one value key pair with key being in lowercase */ -var_dump( array_change_key_case( array("ONE" => 1, "one" => 3, "One" => 4) ) ); -var_dump( array_change_key_case( array("ONE" => 1, "one" => 6, "One" => 5), "CASE_UPPER" ) ); +var_dump( array_change_key_case( array("ONE" => 1, "one" => 3, "One" => 4) ) ); +var_dump( array_change_key_case( array("ONE" => 1, "one" => 6, "One" => 5), "CASE_UPPER" ) ); /* should return one value key pair with key being in uppercase */ -var_dump( array_change_key_case( array("ONE" => 1, "one" => 2, "One" => 3), CASE_UPPER ) ); -var_dump( array_change_key_case( array("ONE" => 1, "one" => 1, "One" => 2), 5 ) ); +var_dump( array_change_key_case( array("ONE" => 1, "one" => 2, "One" => 3), CASE_UPPER ) ); +var_dump( array_change_key_case( array("ONE" => 1, "one" => 1, "One" => 2), 5 ) ); echo "end\n"; ?> diff --git a/ext/standard/tests/array/array_change_key_case_variation1.phpt b/ext/standard/tests/array/array_change_key_case_variation1.phpt index ef4ce85256..1f1120ef14 100644 --- a/ext/standard/tests/array/array_change_key_case_variation1.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation1.phpt @@ -58,7 +58,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -68,7 +68,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/array/array_change_key_case_variation2.phpt b/ext/standard/tests/array/array_change_key_case_variation2.phpt index 818c20e2ee..4ca3f398b4 100644 --- a/ext/standard/tests/array/array_change_key_case_variation2.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation2.phpt @@ -56,7 +56,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', diff --git a/ext/standard/tests/array/array_change_key_case_variation3.phpt b/ext/standard/tests/array/array_change_key_case_variation3.phpt index 025e8f5d61..e04b32f89a 100644 --- a/ext/standard/tests/array/array_change_key_case_variation3.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation3.phpt @@ -40,7 +40,7 @@ $inputs = array( -10.5 => 'negative', .5 => 'half', ), - + 'extreme floats' => array( 12.3456789000e6 => 'large', 12.3456789000E-10 => 'small', @@ -63,7 +63,7 @@ $inputs = array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*5*/ 'empty double quotes' => array( "" => 'emptyd', diff --git a/ext/standard/tests/array/array_chunk2.phpt b/ext/standard/tests/array/array_chunk2.phpt index 2560332bf5..6d8b74545e 100644 --- a/ext/standard/tests/array/array_chunk2.phpt +++ b/ext/standard/tests/array/array_chunk2.phpt @@ -6,11 +6,11 @@ $input_array = array('a', 'b', 'c', 'd', 'e'); var_dump(array_chunk($input_array, 0)); var_dump(array_chunk($input_array, 0, true)); var_dump(array_chunk($input_array, 1)); -var_dump(array_chunk($input_array, 1, true)); +var_dump(array_chunk($input_array, 1, true)); var_dump(array_chunk($input_array, 2)); -var_dump(array_chunk($input_array, 2, true)); +var_dump(array_chunk($input_array, 2, true)); var_dump(array_chunk($input_array, 10)); -var_dump(array_chunk($input_array, 10, true)); +var_dump(array_chunk($input_array, 10, true)); ?> --EXPECTF-- Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d diff --git a/ext/standard/tests/array/array_chunk_basic1.phpt b/ext/standard/tests/array/array_chunk_basic1.phpt index 44c9b5ffaa..8a5c5726b1 100644 --- a/ext/standard/tests/array/array_chunk_basic1.phpt +++ b/ext/standard/tests/array/array_chunk_basic1.phpt @@ -20,19 +20,19 @@ $input_arrays = array ( // associative arrays - key as string array('key1' => 1, "key2" => 2, "key3" => 3), - + // associative arrays - key as numeric array(1 => 'one', 2 => "two", 3 => "three"), // array containing elements with/witout keys array(1 => 'one','two', 3 => 'three', 4, "five" => 5) -); +); $count = 1; // loop through each element of the array for input -foreach ($input_arrays as $input_array){ - echo "\n-- Iteration $count --\n"; +foreach ($input_arrays as $input_array){ + echo "\n-- Iteration $count --\n"; var_dump( array_chunk($input_array, $size) ); $count++; } diff --git a/ext/standard/tests/array/array_chunk_basic2.phpt b/ext/standard/tests/array/array_chunk_basic2.phpt index 6e622df070..030324c320 100644 --- a/ext/standard/tests/array/array_chunk_basic2.phpt +++ b/ext/standard/tests/array/array_chunk_basic2.phpt @@ -20,18 +20,18 @@ $input_arrays = array( // associative arrays - key as string array('key1' => 1, "key2" => 2, "key3" => 3), - + // associative arrays - key as numeric array(1 => 'one', 2 => "two", 3 => "three"), // array containing elements with/without keys array(1 => 'one','two', 3 => 'three', 4, "five" => 5) -); +); $count = 1; // loop through each element of the array for input -foreach ($input_arrays as $input_array){ - echo "\n-- Iteration $count --\n"; +foreach ($input_arrays as $input_array){ + echo "\n-- Iteration $count --\n"; var_dump( array_chunk($input_array, $size, true) ); var_dump( array_chunk($input_array, $size, false) ); $count++; diff --git a/ext/standard/tests/array/array_chunk_variation4.phpt b/ext/standard/tests/array/array_chunk_variation4.phpt index b5d0818327..66e431c0e8 100644 --- a/ext/standard/tests/array/array_chunk_variation4.phpt +++ b/ext/standard/tests/array/array_chunk_variation4.phpt @@ -20,16 +20,16 @@ $size = 2; $input_array = array ( "array1" => array(), "array2" => array(1, 2, 3), - "array3" => array(1) + "array3" => array(1) ); -echo "\n-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' as defualt --\n"; +echo "\n-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' as defualt --\n"; var_dump( array_chunk($input_array, $size) ); -echo "\n-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' = true --\n"; +echo "\n-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' = true --\n"; var_dump( array_chunk($input_array, $size, true) ); -echo "\n-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' = false --\n"; +echo "\n-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' = false --\n"; var_dump( array_chunk($input_array, $size, false) ); echo "Done"; diff --git a/ext/standard/tests/array/array_chunk_variation6.phpt b/ext/standard/tests/array/array_chunk_variation6.phpt index 0f66fc19f5..e761a72822 100644 --- a/ext/standard/tests/array/array_chunk_variation6.phpt +++ b/ext/standard/tests/array/array_chunk_variation6.phpt @@ -25,7 +25,7 @@ $input_arrays = array ( // array with one element "array2" => array(1), - + // associative array with duplicate keys "array3" => array("a" => 1, "b" => 2, "c" => 3, "a" => 4, "d" => 5) diff --git a/ext/standard/tests/array/array_chunk_variation7.phpt b/ext/standard/tests/array/array_chunk_variation7.phpt index 0d5ccb7e6d..3d20531704 100644 --- a/ext/standard/tests/array/array_chunk_variation7.phpt +++ b/ext/standard/tests/array/array_chunk_variation7.phpt @@ -21,7 +21,7 @@ echo "\n-- Testing array_chunk(), input array containing references \n"; $numbers=array(1, 2, 3, 4); // reference array -$input_array = array ( +$input_array = array ( "one" => &$numbers[0], "two" => &$numbers[1], "three" => &$numbers[2], diff --git a/ext/standard/tests/array/array_combine_variation4.phpt b/ext/standard/tests/array/array_combine_variation4.phpt index bcd8428cee..9fd3852830 100644 --- a/ext/standard/tests/array/array_combine_variation4.phpt +++ b/ext/standard/tests/array/array_combine_variation4.phpt @@ -70,7 +70,7 @@ $arrays = array ( // array to be passsed to $arr2 argument $arr2 = array(0 => 0, 2 => "float", 4 => "f3", 33333333 => "f4", - "\tHello" => 111, 2.2, 'color', "Hello world" => "string", + "\tHello" => 111, 2.2, 'color', "Hello world" => "string", "pen\n" => 33, new classA() => 11, 133 => "int"); // loop through each sub-array within $arrays to check the behavior of array_combine() diff --git a/ext/standard/tests/array/array_combine_variation5.phpt b/ext/standard/tests/array/array_combine_variation5.phpt index 4d9f185786..db5c90df34 100644 --- a/ext/standard/tests/array/array_combine_variation5.phpt +++ b/ext/standard/tests/array/array_combine_variation5.phpt @@ -60,8 +60,8 @@ $arrays = array ( /*10*/ array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp), // array with mixed values -/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", - 'resource' => $fp, "int" => 133, "float" => 444.432, +/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", + 'resource' => $fp, "int" => 133, "float" => 444.432, "unset" => @$unset_var, "heredoc" => $heredoc) ); diff --git a/ext/standard/tests/array/array_count_values2.phpt b/ext/standard/tests/array/array_count_values2.phpt index 6ec907856c..a02868362b 100644 --- a/ext/standard/tests/array/array_count_values2.phpt +++ b/ext/standard/tests/array/array_count_values2.phpt @@ -2,15 +2,15 @@ basic array_count_values test --FILE-- <?php -$array1 = array(1, - "hello", - 1, - "world", - "hello", - "", - "rabbit", - "foo", - "Foo", +$array1 = array(1, + "hello", + 1, + "world", + "hello", + "", + "rabbit", + "foo", + "Foo", TRUE, FALSE, NULL, diff --git a/ext/standard/tests/array/array_count_values_error.phpt b/ext/standard/tests/array/array_count_values_error.phpt index e544c8117c..2d41fd7bc1 100644 --- a/ext/standard/tests/array/array_count_values_error.phpt +++ b/ext/standard/tests/array/array_count_values_error.phpt @@ -5,7 +5,7 @@ Test array_count_values() function : Invalid parameters /* Prototype : proto array array_count_values(array input) * Description: Return the value as key and the frequency of that value in input as value * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/standard/tests/array/array_count_values_variation.phpt b/ext/standard/tests/array/array_count_values_variation.phpt index 9a2830b918..2368973e12 100644 --- a/ext/standard/tests/array/array_count_values_variation.phpt +++ b/ext/standard/tests/array/array_count_values_variation.phpt @@ -5,7 +5,7 @@ Test array_count_values() function : Test all normal parameter variations /* Prototype : proto array array_count_values(array input) * Description: Return the value as key and the frequency of that value in input as value * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/standard/tests/array/array_diff_assoc.phpt b/ext/standard/tests/array/array_diff_assoc.phpt index 29db107d65..509c632ba5 100644 --- a/ext/standard/tests/array/array_diff_assoc.phpt +++ b/ext/standard/tests/array/array_diff_assoc.phpt @@ -1,6 +1,6 @@ --TEST-- basic array_diff_assoc test ---FILE-- +--FILE-- <?php $array1 = array("a" => "green", "b" => "brown", "c" => "blue", "red", ""); $array2 = array("a" => "green", "yellow", "red", TRUE); diff --git a/ext/standard/tests/array/array_diff_assoc_variation1.phpt b/ext/standard/tests/array/array_diff_assoc_variation1.phpt index 10b012414c..c930dd5951 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation1.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation1.phpt @@ -11,7 +11,7 @@ Test array_diff_assoc() function : usage variations - unexpected values for 'ar /* * Pass array_diff_assoc arguments that are not arrays in place of $arr1 */ - + echo "*** Testing array_diff_assoc() : usage variations ***\n"; $array = array(1, 2, 3); @@ -61,7 +61,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -70,11 +70,11 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // binary data /*21*/ b"binary", (binary)"binary", - + // object data /*23*/ new classA(), diff --git a/ext/standard/tests/array/array_diff_assoc_variation10.phpt b/ext/standard/tests/array/array_diff_assoc_variation10.phpt index 5e4460cd2a..79aae55d4f 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation10.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation10.phpt @@ -15,15 +15,15 @@ Test array_diff_assoc() function : usage variations - binary safe check echo "*** Testing array_diff_assoc() : usage variations ***\n"; -$array1 = array( b"1", - b"hello", - "world", - "str1" => "hello", +$array1 = array( b"1", + b"hello", + "world", + "str1" => "hello", "str2" => "world"); $array2 = array( b"1" => 'hello', b"world", - "hello", + "hello", 'test'); var_dump(array_diff_assoc($array1, $array2)); diff --git a/ext/standard/tests/array/array_diff_assoc_variation2.phpt b/ext/standard/tests/array/array_diff_assoc_variation2.phpt index b625819c01..566d89973e 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation2.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation2.phpt @@ -61,7 +61,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -70,11 +70,11 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // binary data /*21*/ b"binary", (binary)"binary", - + // object data /*23*/ new classA(), diff --git a/ext/standard/tests/array/array_diff_assoc_variation3.phpt b/ext/standard/tests/array/array_diff_assoc_variation3.phpt index 1d4aaf2e43..80278ed9a5 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation3.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation3.phpt @@ -11,7 +11,7 @@ Test array_diff_assoc() function : variation - array containing different data t /* * Test how array_diff_assoc() compares indexed arrays containing different data types */ - + echo "\n*** Testing array_diff_assoc() : usage variations ***\n"; $array = array(1, 2, 3); @@ -38,7 +38,7 @@ $inputs = array( // int data /*1*/ -'int' => array( +'int' => array( 0, 1, 12345, @@ -46,7 +46,7 @@ $inputs = array( // float data /*2*/ -'float' => array( +'float' => array( 10.5, -10.5, 12.3456789000e10, @@ -66,7 +66,7 @@ $inputs = array( false, TRUE, FALSE), - + // empty data /*5*/ 'empty' => array( @@ -79,13 +79,13 @@ $inputs = array( "string", 'string', $heredoc), - + // binary data /*7*/ 'binary' => array( b"binary", (binary)"binary"), - + // object data /*8*/ 'object' => array( diff --git a/ext/standard/tests/array/array_diff_assoc_variation4.phpt b/ext/standard/tests/array/array_diff_assoc_variation4.phpt index c93f9c1d0f..047fe9ede1 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation4.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation4.phpt @@ -13,7 +13,7 @@ Test array_diff_assoc() function : usage variations - arrays with different data * Test how array_diff_assoc() compares arrays containing different data types * as keys */ - + echo "\n*** Testing array_diff_assoc() : usage variations ***\n"; $array = array(1, 2, 3); @@ -32,7 +32,7 @@ $inputs = array( // int data /*1*/ -'int' => array( +'int' => array( 0 => 'zero', 1 => 'one', 12345 => 'positive', @@ -40,7 +40,7 @@ $inputs = array( // float data /*2*/ -'float' => array( +'float' => array( 10.5 => 'float 1', -10.5 => 'float 2', .5 => 'float 3'), @@ -58,7 +58,7 @@ $inputs = array( false => 'boolf', TRUE => 'boolT', FALSE => 'boolF'), - + // empty data /*5*/ 'empty' => array( @@ -71,7 +71,7 @@ $inputs = array( "string" => 'stringd', 'string' => 'strings', $heredoc => 'stringh'), - + // binary data /*7*/ 'binary' => array( diff --git a/ext/standard/tests/array/array_diff_assoc_variation6.phpt b/ext/standard/tests/array/array_diff_assoc_variation6.phpt index e04d80724b..4d519b00f2 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation6.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation6.phpt @@ -17,51 +17,51 @@ Test array_diff_assoc() function : usage variations - strict string comparison c echo "*** Testing array_diff_assoc() : usage variations ***\n"; -$array = array ('zero', - 1 => 1, +$array = array ('zero', + 1 => 1, 'two' => 2.00000000000001); - + $inputs = array ( //default keys => string values /*1*/ array('2.00000000000001', '1', 'zero', 'a'), - + //numeric keys => string values -/*2*/ array(2 => '2.00000000000001', - 1 => '1', - 0 => 'zero', +/*2*/ array(2 => '2.00000000000001', + 1 => '1', + 0 => 'zero', 3 => 'a'), //string keys => string values -/*3*/ array('2' => '2.00000000000001', - '1' => '1', - '0' => 'zero', +/*3*/ array('2' => '2.00000000000001', + '1' => '1', + '0' => 'zero', '3' => 'a') , - + //default keys => numeric values /*4*/ array(2, 1, 0), - + //numeric keys => numeric values /*5*/ array(2 => 2, 1 => 1, 0 => 0), - + //string keys => numeric values -/*6*/ array('two' => 2, - '1' => 1, +/*6*/ array('two' => 2, + '1' => 1, '0' => 0), - + //defualt keys => float values /*7*/ array(2.00000000000001, 1.00, 0.01E-9), - + //numeric keys => float values /*8*/ array(2 => 2.00000000000001, 1 => 1.00, 0 => 0.01E-9), - + //string keys => float values -/*9*/ array ('two' => 2.00000000000001, - '1' => 1.00, +/*9*/ array ('two' => 2.00000000000001, + '1' => 1.00, '0' =>0.01E-9) ); diff --git a/ext/standard/tests/array/array_diff_assoc_variation8.phpt b/ext/standard/tests/array/array_diff_assoc_variation8.phpt index 54680957ab..52d3a2e98b 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation8.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation8.phpt @@ -21,7 +21,7 @@ echo "*** Testing array_diff_assoc() : variation ***\n"; $array_index = array('a', 'b', 'c', 0 => 'd', 'b'); //duplicate key (0), duplicate value (b) $array_assoc = array ('2' => 'c', //same key=>value pair, different order '1' => 'b', - '0' => 'a', + '0' => 'a', 'b' => '3', //key and value from array_index swapped 'c' => 2); //same as above, using integer diff --git a/ext/standard/tests/array/array_diff_assoc_variation9.phpt b/ext/standard/tests/array/array_diff_assoc_variation9.phpt index bc3e5417cc..55964711e3 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation9.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation9.phpt @@ -24,7 +24,7 @@ $array2 = array('sub_arraya' => array (1, 3, 5), echo "-- Compare two 2-D arrays --\n"; var_dump(array_diff_assoc($array1, $array2)); var_dump(array_diff_assoc($array2, $array1)); - + echo "\n-- Compare subarrays from two 2-D arrays --\n"; var_dump(array_diff_assoc($array1['sub_array1'], $array2['sub_arraya'])); var_dump(array_diff_assoc($array2['sub_arraya'], $array1['sub_array1'])); diff --git a/ext/standard/tests/array/array_diff_key_variation4.phpt b/ext/standard/tests/array/array_diff_key_variation4.phpt index 4201becefd..4b8a662930 100644 --- a/ext/standard/tests/array/array_diff_key_variation4.phpt +++ b/ext/standard/tests/array/array_diff_key_variation4.phpt @@ -10,7 +10,7 @@ Test array_diff_key() function : usage variation - Passing integer indexed array echo "*** Testing array_diff_key() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(-07 => '-07', 0xA => '0xA'); +$input_array = array(-07 => '-07', 0xA => '0xA'); $input_arrays = array( 'decimal indexed' => array(10 => '10', '-17' => '-17'), diff --git a/ext/standard/tests/array/array_diff_key_variation5.phpt b/ext/standard/tests/array/array_diff_key_variation5.phpt index ff8f3aff4b..e82f1759d4 100644 --- a/ext/standard/tests/array/array_diff_key_variation5.phpt +++ b/ext/standard/tests/array/array_diff_key_variation5.phpt @@ -10,8 +10,8 @@ Test array_diff_key() function : usage variation - Passing float indexed array echo "*** Testing array_diff_key() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(0 => '0', 10 => '10', -10 => '-10', 20 =>'20', -20 => '-20'); -$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5', -10.5 => '-10.5', 0.5 => '0.5'); +$input_array = array(0 => '0', 10 => '10', -10 => '-10', 20 =>'20', -20 => '-20'); +$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5', -10.5 => '-10.5', 0.5 => '0.5'); echo "\n-- Testing array_diff_key() function with float indexed array --\n"; // loop through each element of the array for arr1 diff --git a/ext/standard/tests/array/array_diff_key_variation6.phpt b/ext/standard/tests/array/array_diff_key_variation6.phpt index 8670d05257..71fb9881a1 100644 --- a/ext/standard/tests/array/array_diff_key_variation6.phpt +++ b/ext/standard/tests/array/array_diff_key_variation6.phpt @@ -10,7 +10,7 @@ Test array_diff_key() function : usage variation - Passing boolean indexed array echo "*** Testing array_diff_key() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(0 => '0', 1 => '1', -10 => '-10', 'true' => 1, 'false' => 0); +$input_array = array(0 => '0', 1 => '1', -10 => '-10', 'true' => 1, 'false' => 0); $boolean_indx_array = array(true => 'boolt', false => 'boolf', TRUE => 'boolT', FALSE => 'boolF'); echo "\n-- Testing array_diff_key() function with boolean indexed array --\n"; diff --git a/ext/standard/tests/array/array_diff_key_variation7.phpt b/ext/standard/tests/array/array_diff_key_variation7.phpt index d3acf8c88c..72da179f6d 100644 --- a/ext/standard/tests/array/array_diff_key_variation7.phpt +++ b/ext/standard/tests/array/array_diff_key_variation7.phpt @@ -10,7 +10,7 @@ Test array_diff_key() function : usage variation - Passing null,unset and undefi echo "*** Testing array_diff_key() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(10 => '10', "" => 'empty'); +$input_array = array(10 => '10', "" => 'empty'); //get an unset variable $unset_var = 10; @@ -27,7 +27,7 @@ foreach($input_arrays as $key =>$value) { // loop through each element of the array for arr1 var_dump( array_diff_key($input_array, $value) ); var_dump( array_diff_key($value, $input_array) ); -} +} ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/array/array_diff_key_variation8.phpt b/ext/standard/tests/array/array_diff_key_variation8.phpt index 7134b4e52d..bbe3921ca0 100644 --- a/ext/standard/tests/array/array_diff_key_variation8.phpt +++ b/ext/standard/tests/array/array_diff_key_variation8.phpt @@ -13,18 +13,18 @@ echo "*** Testing array_diff_key() : usage variation ***\n"; $array1 = array( 'first' => array('blue' => 1, 'red' => 2), - + 'second' => array('yellow' => 7), - + 'third' => array(0 => 'zero'), ); $array2 = array ( 'first' => array('blue' => 1, 'red' => 2,), - + 'second' => array('cyan' => 8), - + 'fourth' => array(2 => 'two'), ); diff --git a/ext/standard/tests/array/array_diff_uassoc_variation10.phpt b/ext/standard/tests/array/array_diff_uassoc_variation10.phpt index db0476ae34..4af3023c03 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation10.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation10.phpt @@ -11,13 +11,13 @@ Test array_diff_uassoc() function : usage variation - Passing float indexed arra echo "*** Testing array_diff_uassoc() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(0 => '0', 10 => '10', -10 => '-10', 20 =>'20', -20 => '-20'); -$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5', -10.5 => '-10.5', 0.5 => '0.5'); +$input_array = array(0 => '0', 10 => '10', -10 => '-10', 20 =>'20', -20 => '-20'); +$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5', -10.5 => '-10.5', 0.5 => '0.5'); echo "\n-- Testing array_diff_key() function with float indexed array --\n"; var_dump( array_diff_uassoc($input_array, $float_indx_array, "strcasecmp") ); var_dump( array_diff_uassoc($float_indx_array, $input_array, "strcasecmp") ); - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation11.phpt b/ext/standard/tests/array/array_diff_uassoc_variation11.phpt index f2e945840f..6d03dc5fa9 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation11.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation11.phpt @@ -11,13 +11,13 @@ Test array_diff_uassoc() function : usage variation - Passing boolean indexed ar echo "*** Testing array_diff_uassoc() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(0 => '0', 1 => '1', -10 => '-10', 'true' => 1, 'false' => 0); +$input_array = array(0 => '0', 1 => '1', -10 => '-10', 'true' => 1, 'false' => 0); $boolean_indx_array = array(true => 'boolt', false => 'boolf', TRUE => 'boolT', FALSE => 'boolF'); echo "\n-- Testing array_diff_key() function with float indexed array --\n"; var_dump( array_diff_uassoc($input_array, $boolean_indx_array, "strcasecmp") ); var_dump( array_diff_uassoc($boolean_indx_array, $input_array, "strcasecmp") ); - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation12.phpt b/ext/standard/tests/array/array_diff_uassoc_variation12.phpt index 656faf4793..1b18d37d7b 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation12.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation12.phpt @@ -11,7 +11,7 @@ Test array_diff_uassoc() function : usage variation - Passing null,unset and und echo "*** Testing array_diff_uassoc() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(10 => '10', "" => ''); +$input_array = array(10 => '10', "" => ''); //get an unset variable $unset_var = 10; @@ -27,8 +27,8 @@ foreach($input_arrays as $key =>$value) { echo "\n--$key--\n"; var_dump( array_diff_uassoc($input_array, $value, "strcasecmp") ); var_dump( array_diff_uassoc($value, $input_array, "strcasecmp") ); -} - +} + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation9.phpt b/ext/standard/tests/array/array_diff_uassoc_variation9.phpt index cb4672773d..eb4833bc75 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation9.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation9.phpt @@ -11,7 +11,7 @@ Test array_diff_uassoc() function : usage variation - Passing integer indexed ar echo "*** Testing array_diff_uassoc() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(10 => 10, 12 => 12); +$input_array = array(10 => 10, 12 => 12); $input_arrays = array( 'decimal indexed' => array(10 => 10, -17 => -17), @@ -23,8 +23,8 @@ foreach($input_arrays as $key =>$value) { echo "\n--$key--\n"; var_dump( array_diff_uassoc($input_array, $value, "strcasecmp") ); var_dump( array_diff_uassoc($value, $input_array, "strcasecmp") ); -} - +} + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/array/array_diff_ukey_variation5.phpt b/ext/standard/tests/array/array_diff_ukey_variation5.phpt index eae2cbb915..8d0a5cffc9 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation5.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation5.phpt @@ -13,18 +13,18 @@ echo "*** Testing array_diff_ukey() : usage variation ***\n"; $array1 = array( 'first' => array('blue' => 1, 'red' => 2), - + 'second' => array('yellow' => 7), - + 'third' => array(0 => 'zero'), ); $array2 = array ( 'first' => array('blue' => 1, 'red' => 2,), - + 'second' => array('cyan' => 8), - + 'fourth' => array(2 => 'two'), ); diff --git a/ext/standard/tests/array/array_diff_ukey_variation6.phpt b/ext/standard/tests/array/array_diff_ukey_variation6.phpt index ab94239696..713967c9c1 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation6.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation6.phpt @@ -10,7 +10,7 @@ Test array_diff_ukey() function : usage variation - Passing integer indexed arra echo "*** Testing array_diff_ukey() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(-07 => '-07', 0xA => '0xA'); +$input_array = array(-07 => '-07', 0xA => '0xA'); $input_arrays = array( 'decimal indexed' => array(10 => '10', '-17' => '-17'), diff --git a/ext/standard/tests/array/array_diff_ukey_variation7.phpt b/ext/standard/tests/array/array_diff_ukey_variation7.phpt index d499fe73c1..d76bae5232 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation7.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation7.phpt @@ -10,8 +10,8 @@ Test array_diff_ukey() function : usage variation - Passing float indexed array echo "*** Testing array_diff_ukey() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(0 => '0', 10 => '10', -10 => '-10', 20 =>'20'); -$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5', -30.5 => '-30.5'); +$input_array = array(0 => '0', 10 => '10', -10 => '-10', 20 =>'20'); +$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5', -30.5 => '-30.5'); function key_compare_func($key1, $key2) { diff --git a/ext/standard/tests/array/array_diff_ukey_variation8.phpt b/ext/standard/tests/array/array_diff_ukey_variation8.phpt index c3dbdc1376..cf0e3e221d 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation8.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation8.phpt @@ -10,7 +10,7 @@ Test array_diff_ukey() function : usage variation - Passing boolean indexed arra echo "*** Testing array_diff_ukey() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(0 => '0', 1 => '1', -10 => '-10', 'true' => 1, 'false' => 0); +$input_array = array(0 => '0', 1 => '1', -10 => '-10', 'true' => 1, 'false' => 0); $boolean_indx_array = array(true => 'boolt', false => 'boolf', TRUE => 'boolT', FALSE => 'boolF'); function key_compare_func($key1, $key2) diff --git a/ext/standard/tests/array/array_diff_ukey_variation9.phpt b/ext/standard/tests/array/array_diff_ukey_variation9.phpt index c211bfe88b..d75aac0715 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation9.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation9.phpt @@ -10,7 +10,7 @@ Test array_diff_ukey() function : usage variation - Passing null,unset and undef echo "*** Testing array_diff_ukey() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(10 => '10', "" => 'empty'); +$input_array = array(10 => '10', "" => 'empty'); //get an unset variable $unset_var = 10; @@ -26,7 +26,7 @@ foreach($input_arrays as $key =>$value) { echo "\n--$key--\n"; var_dump( array_diff_ukey($value, $input_array, 'strcasecmp') ); var_dump( array_diff_ukey($input_array, $value, 'strcasecmp') ); -} +} ?> ===DONE=== diff --git a/ext/standard/tests/array/array_diff_variation1.phpt b/ext/standard/tests/array/array_diff_variation1.phpt index bfe7ac439e..1349db4adf 100644 --- a/ext/standard/tests/array/array_diff_variation1.phpt +++ b/ext/standard/tests/array/array_diff_variation1.phpt @@ -61,7 +61,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -70,11 +70,11 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // binary data /*21*/ b"binary", (binary)"binary", - + // object data /*23*/ new classA(), diff --git a/ext/standard/tests/array/array_diff_variation10.phpt b/ext/standard/tests/array/array_diff_variation10.phpt index ec748c2884..ec9291f9f8 100644 --- a/ext/standard/tests/array/array_diff_variation10.phpt +++ b/ext/standard/tests/array/array_diff_variation10.phpt @@ -15,15 +15,15 @@ Test array_diff() function : usage variations - binary safe checking echo "*** Testing array_diff() : usage variations ***\n"; -$array1 = array( b"1", - b"hello", - "world", - "str1" => "hello", +$array1 = array( b"1", + b"hello", + "world", + "str1" => "hello", "str2" => "world"); $array2 = array( b"1" => 'hello', b"world", - "hello", + "hello", 'test'); var_dump(array_diff($array1, $array2)); diff --git a/ext/standard/tests/array/array_diff_variation2.phpt b/ext/standard/tests/array/array_diff_variation2.phpt index 7f3f36c9e6..3d76714ca7 100644 --- a/ext/standard/tests/array/array_diff_variation2.phpt +++ b/ext/standard/tests/array/array_diff_variation2.phpt @@ -61,7 +61,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -70,7 +70,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // binary data /*21*/ b"binary", (binary)"binary", diff --git a/ext/standard/tests/array/array_diff_variation3.phpt b/ext/standard/tests/array/array_diff_variation3.phpt index 5888c3b1ba..08f921c38d 100644 --- a/ext/standard/tests/array/array_diff_variation3.phpt +++ b/ext/standard/tests/array/array_diff_variation3.phpt @@ -50,7 +50,7 @@ $values = array( .5), /*4*/ -"null" => array( +"null" => array( // null data NULL, null), @@ -64,7 +64,7 @@ $values = array( FALSE), /*6*/ -"empty" => array( +"empty" => array( // empty data "", ''), @@ -75,20 +75,20 @@ $values = array( "string", 'string', $heredoc), - -/*8*/ + +/*8*/ "binary" => array( // binary data b"binary", (binary)"binary"), - -/*9*/ + +/*9*/ "undefined" => array( // undefined data @$undefined_var), /*10*/ -"unset" => array( +"unset" => array( // unset data @$unset_var) ); diff --git a/ext/standard/tests/array/array_diff_variation4.phpt b/ext/standard/tests/array/array_diff_variation4.phpt index 01fb1a43ef..17c8db1c35 100644 --- a/ext/standard/tests/array/array_diff_variation4.phpt +++ b/ext/standard/tests/array/array_diff_variation4.phpt @@ -50,7 +50,7 @@ $values = array( .5), /*4*/ -"null" => array( +"null" => array( // null data NULL, null), @@ -64,7 +64,7 @@ $values = array( FALSE), /*6*/ -"empty" => array( +"empty" => array( // empty data "", ''), @@ -75,20 +75,20 @@ $values = array( "string", 'string', $heredoc), - -/*8*/ + +/*8*/ "binary" => array( // binary data b"binary", (binary)"binary"), - -/*9*/ + +/*9*/ "undefined" => array( // undefined data @$undefined_var), /*10*/ -"unset" => array( +"unset" => array( // unset data @$unset_var) ); diff --git a/ext/standard/tests/array/array_diff_variation5.phpt b/ext/standard/tests/array/array_diff_variation5.phpt index 71667f67fa..67b978845d 100644 --- a/ext/standard/tests/array/array_diff_variation5.phpt +++ b/ext/standard/tests/array/array_diff_variation5.phpt @@ -18,7 +18,7 @@ echo "*** Testing array_diff() : usage variations ***\n"; $arr_int = array(1, 2, 3); $arr_float = array(1.00, 2.00, 3.00); $arr_int_str = array('1', '2', '3'); -$arr_float_str = array('1.00', '2.00', '3.00'); +$arr_float_str = array('1.00', '2.00', '3.00'); print "-- Compare integers and floats: --\n"; var_dump(array_diff($arr_int, $arr_float)); diff --git a/ext/standard/tests/array/array_diff_variation6.phpt b/ext/standard/tests/array/array_diff_variation6.phpt index 9a71db570c..392715657c 100644 --- a/ext/standard/tests/array/array_diff_variation6.phpt +++ b/ext/standard/tests/array/array_diff_variation6.phpt @@ -20,7 +20,7 @@ echo "*** Testing array_diff() : usage variations ***\n"; $array_index = array('a', 'b', 'c', 0 => 'd', 'b'); //duplicate key (0), duplicate value (b) $array_assoc = array ('2' => 'c', //same key=>value pair, different order '1' => 'b', - '0' => 'a', + '0' => 'a', 'b' => '3', //key and value from array_index swapped 'c' => 2); //same as above, using integer diff --git a/ext/standard/tests/array/array_fill_basic.phpt b/ext/standard/tests/array/array_fill_basic.phpt index a368bbaf93..0ac3d08bc9 100644 --- a/ext/standard/tests/array/array_fill_basic.phpt +++ b/ext/standard/tests/array/array_fill_basic.phpt @@ -18,7 +18,7 @@ HERE_DOC; // array of possible valid values for 'val' argument $values = array ( - + /* 1 */ NULL, 0, 1, @@ -38,7 +38,7 @@ for($i = 0; $i < count($values); $i ++) var_dump( array_fill($start_key,$num,$val) ); $counter++; -} +} echo "Done"; ?> diff --git a/ext/standard/tests/array/array_fill_keys_error.phpt b/ext/standard/tests/array/array_fill_keys_error.phpt index 012a729d62..e4aba5f0f7 100644 --- a/ext/standard/tests/array/array_fill_keys_error.phpt +++ b/ext/standard/tests/array/array_fill_keys_error.phpt @@ -5,7 +5,7 @@ Test array_fill_keys() function : error conditions /* Prototype : proto array array_fill_keys(array keys, mixed val) * Description: Create an array using the elements of the first parameter as keys each initialized to val * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_fill_keys() : error conditions ***\n"; diff --git a/ext/standard/tests/array/array_fill_keys_variation1.phpt b/ext/standard/tests/array/array_fill_keys_variation1.phpt index 9fab89d7f2..ea27fbdf77 100644 --- a/ext/standard/tests/array/array_fill_keys_variation1.phpt +++ b/ext/standard/tests/array/array_fill_keys_variation1.phpt @@ -5,7 +5,7 @@ Test array_fill_keys() function : variation of parameter /* Prototype : proto array array_fill_keys(array keys, mixed val) * Description: Create an array using the elements of the first parameter as keys each initialized to val * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ diff --git a/ext/standard/tests/array/array_fill_keys_variation2.phpt b/ext/standard/tests/array/array_fill_keys_variation2.phpt index 1c9382eb09..368a3c8729 100644 --- a/ext/standard/tests/array/array_fill_keys_variation2.phpt +++ b/ext/standard/tests/array/array_fill_keys_variation2.phpt @@ -5,7 +5,7 @@ Test array_fill_keys() function : variation of parameter /* Prototype : proto array array_fill_keys(array keys, mixed val) * Description: Create an array using the elements of the first parameter as keys each initialized to val * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ /* Testing with reference types for the arguments */ diff --git a/ext/standard/tests/array/array_fill_keys_variation3.phpt b/ext/standard/tests/array/array_fill_keys_variation3.phpt index c6eee72175..aac8915935 100644 --- a/ext/standard/tests/array/array_fill_keys_variation3.phpt +++ b/ext/standard/tests/array/array_fill_keys_variation3.phpt @@ -5,7 +5,7 @@ Test array_fill_keys() function : variation of parameter /* Prototype : proto array array_fill_keys(array keys, mixed val) * Description: Create an array using the elements of the first parameter as keys each initialized to val * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ /* Testing with unexpected argument types */ diff --git a/ext/standard/tests/array/array_fill_keys_variation4.phpt b/ext/standard/tests/array/array_fill_keys_variation4.phpt index 209443db08..20ba8248f9 100644 --- a/ext/standard/tests/array/array_fill_keys_variation4.phpt +++ b/ext/standard/tests/array/array_fill_keys_variation4.phpt @@ -5,7 +5,7 @@ Test array_fill_keys() function : variation of parameter /* Prototype : proto array array_fill_keys(array keys, mixed val) * Description: Create an array using the elements of the first parameter as keys each initialized to val * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ /* Testing with unexpected argument types */ diff --git a/ext/standard/tests/array/array_fill_object.phpt b/ext/standard/tests/array/array_fill_object.phpt index aa1db044cc..bed1cc210f 100644 --- a/ext/standard/tests/array/array_fill_object.phpt +++ b/ext/standard/tests/array/array_fill_object.phpt @@ -85,7 +85,7 @@ class Test3 public static $test3_static = 0; protected $member1; var $var1 = 30; - var $var2; + var $var2; function __construct($value1 , $value2) { @@ -127,7 +127,7 @@ class Test4 class Child_test4 extends Test4 { var $var1; - + function __construct($value1 , $value2 , $value3 , $value4) { parent::__construct($value1 , $value2 , $value3); @@ -142,7 +142,7 @@ abstract class AbstractClass private $member2; protected $member3; var $var1 = 30; - + abstract protected function display(); } @@ -173,7 +173,7 @@ class Template1 implements iTemplate //array of object values for 'val' argument $objects = array( - + /* 1 */ new Test(), new Test1(100 , 101), new Child_test1(100 , 101 , 102), diff --git a/ext/standard/tests/array/array_fill_variation1.phpt b/ext/standard/tests/array/array_fill_variation1.phpt index 5701f79b48..54ec0ec880 100644 --- a/ext/standard/tests/array/array_fill_variation1.phpt +++ b/ext/standard/tests/array/array_fill_variation1.phpt @@ -95,9 +95,9 @@ for($index = 0; $index < count($values); $index ++) { echo "-- Iteration $counter --\n"; $start_key = $values[$index]; - + var_dump( array_fill($start_key,$num,$val) ); - + $counter ++; } diff --git a/ext/standard/tests/array/array_fill_variation1_64bit.phpt b/ext/standard/tests/array/array_fill_variation1_64bit.phpt index 699e98b1b3..9872d256fa 100644 --- a/ext/standard/tests/array/array_fill_variation1_64bit.phpt +++ b/ext/standard/tests/array/array_fill_variation1_64bit.phpt @@ -95,9 +95,9 @@ for($index = 0; $index < count($values); $index ++) { echo "-- Iteration $counter --\n"; $start_key = $values[$index]; - + var_dump( array_fill($start_key,$num,$val) ); - + $counter ++; } diff --git a/ext/standard/tests/array/array_fill_variation2.phpt b/ext/standard/tests/array/array_fill_variation2.phpt index d3955fdaaa..0d1ec464b7 100644 --- a/ext/standard/tests/array/array_fill_variation2.phpt +++ b/ext/standard/tests/array/array_fill_variation2.phpt @@ -88,7 +88,7 @@ for($index = 0; $index < count($values); $index ++) $num = $values[$index]; var_dump( array_fill($start_key,$num,$val) ); - + $counter ++; } diff --git a/ext/standard/tests/array/array_fill_variation3.phpt b/ext/standard/tests/array/array_fill_variation3.phpt index 4a463a9c0e..96531197ea 100644 --- a/ext/standard/tests/array/array_fill_variation3.phpt +++ b/ext/standard/tests/array/array_fill_variation3.phpt @@ -55,9 +55,9 @@ for($index = 0; $index < count($values); $index ++) { echo "-- Iteration $counter --\n"; $val = $values[$index]; - + var_dump( array_fill($start_key , $num , $val) ); - + $counter++; } diff --git a/ext/standard/tests/array/array_fill_variation4.phpt b/ext/standard/tests/array/array_fill_variation4.phpt index d3f9e4c1e7..d469774026 100644 --- a/ext/standard/tests/array/array_fill_variation4.phpt +++ b/ext/standard/tests/array/array_fill_variation4.phpt @@ -35,11 +35,11 @@ for($i =0; $i < count($values); $i ++) { echo "-- Iteration $counter --\n"; $val = $values[$i]; - + var_dump( array_fill($start_key,$num,array_fill($start_key,$num,$val)) ); - + $counter++; -} +} echo "Done"; ?> diff --git a/ext/standard/tests/array/array_fill_variation5.phpt b/ext/standard/tests/array/array_fill_variation5.phpt index 341e0cf565..5253fb4c1f 100644 --- a/ext/standard/tests/array/array_fill_variation5.phpt +++ b/ext/standard/tests/array/array_fill_variation5.phpt @@ -20,7 +20,7 @@ $num = 2; //array of different types of array values for 'val' argument $values = array( - + /* 1 */ array(), array(1 , 2 , 3 , 4), array(1 => "Hi" , 2 => "Hello"), @@ -44,7 +44,7 @@ for($i = 0; $i < count($values); $i++) { echo "-- Iteration $counter --\n"; $val = $values[$i]; - + var_dump( array_fill($start_key , $num , $val) ); $counter++; diff --git a/ext/standard/tests/array/array_filter.phpt b/ext/standard/tests/array/array_filter.phpt index 94f8e39331..ba27a59c96 100644 --- a/ext/standard/tests/array/array_filter.phpt +++ b/ext/standard/tests/array/array_filter.phpt @@ -31,7 +31,7 @@ var_dump(array_filter("", null)); var_dump(array_filter($array1, 1)); echo '== DONE =='; -?> +?> --EXPECTF-- Odd : array(3) { diff --git a/ext/standard/tests/array/array_filter_object.phpt b/ext/standard/tests/array/array_filter_object.phpt index de782fe69b..2126b4c482 100644 --- a/ext/standard/tests/array/array_filter_object.phpt +++ b/ext/standard/tests/array/array_filter_object.phpt @@ -42,7 +42,7 @@ abstract class AbstractClass class ChildClass extends AbstractClass { private $var3; - public function emptyMethod() { + public function emptyMethod() { echo "defined in child"; } } @@ -51,7 +51,7 @@ class ChildClass extends AbstractClass class FinalClass { private $var4; - final function finalMethod() { + final function finalMethod() { echo 'This can not be overloaded'; } } diff --git a/ext/standard/tests/array/array_filter_variation1.phpt b/ext/standard/tests/array/array_filter_variation1.phpt index bbcff3818c..c9c1ab7564 100644 --- a/ext/standard/tests/array/array_filter_variation1.phpt +++ b/ext/standard/tests/array/array_filter_variation1.phpt @@ -76,7 +76,7 @@ $input_values = array( // object data /*20*/ new MyClass(), - + // resource data $fp, diff --git a/ext/standard/tests/array/array_filter_variation4.phpt b/ext/standard/tests/array/array_filter_variation4.phpt index 03a08835b9..45ac232aed 100644 --- a/ext/standard/tests/array/array_filter_variation4.phpt +++ b/ext/standard/tests/array/array_filter_variation4.phpt @@ -46,7 +46,7 @@ var_dump( array_filter($input, "callback3") ); // callback function with parameter and with return value function callback4($input) { - if($input > 0 ) { + if($input > 0 ) { return true; } else { diff --git a/ext/standard/tests/array/array_filter_variation5.phpt b/ext/standard/tests/array/array_filter_variation5.phpt index f35c321376..af83fcbc94 100644 --- a/ext/standard/tests/array/array_filter_variation5.phpt +++ b/ext/standard/tests/array/array_filter_variation5.phpt @@ -55,13 +55,13 @@ $input = array( ); // With default callback function -var_dump( array_filter($input) ); +var_dump( array_filter($input) ); // With callback function which returns always true -var_dump( array_filter($input, 'always_true') ); +var_dump( array_filter($input, 'always_true') ); // With callback function which returns always false -var_dump( array_filter($input, 'always_false') ); +var_dump( array_filter($input, 'always_false') ); echo "Done" ?> diff --git a/ext/standard/tests/array/array_filter_variation6.phpt b/ext/standard/tests/array/array_filter_variation6.phpt index 2e7ea77dca..108f474513 100644 --- a/ext/standard/tests/array/array_filter_variation6.phpt +++ b/ext/standard/tests/array/array_filter_variation6.phpt @@ -29,7 +29,7 @@ function callback($input) return false; } } - + // initializing variables $value1 = array(1, 2, 8); $value2 = array(5, 6, 4); @@ -39,7 +39,7 @@ $input = array(&$value1, 10, &$value2, 'value'); var_dump( array_filter($input, 'callback') ); // with default 'callback' argument -var_dump( array_filter($input) ); +var_dump( array_filter($input) ); echo "Done" ?> diff --git a/ext/standard/tests/array/array_flip.phpt b/ext/standard/tests/array/array_flip.phpt index c268f5aaf6..c2c29b2952 100644 --- a/ext/standard/tests/array/array_flip.phpt +++ b/ext/standard/tests/array/array_flip.phpt @@ -2,15 +2,15 @@ basic array_flip test --FILE-- <?php -$trans = array("a" => 1, - "b" => 1, - "c" => 2, - "z" => 0, +$trans = array("a" => 1, + "b" => 1, + "c" => 2, + "z" => 0, "d" => TRUE, "E" => FALSE, "F" => NULL, - 0 => "G", - 1 => "h", + 0 => "G", + 1 => "h", 2 => "i"); $trans = array_flip($trans); var_dump($trans); diff --git a/ext/standard/tests/array/array_flip_basic.phpt b/ext/standard/tests/array/array_flip_basic.phpt index ab326b4ab6..a081a81939 100644 --- a/ext/standard/tests/array/array_flip_basic.phpt +++ b/ext/standard/tests/array/array_flip_basic.phpt @@ -10,7 +10,7 @@ Test array_flip() function : basic functionality echo "*** Testing array_flip() : basic functionality ***\n"; // array with default keys - numeric values -$input = array(1, 2); +$input = array(1, 2); var_dump( array_flip($input) ); // array with default keys - string values @@ -18,7 +18,7 @@ $input = array('value1', "value2"); var_dump( array_flip($input) ); // associative arrays - key as string -$input = array('key1' => 1, "key2" => 2); +$input = array('key1' => 1, "key2" => 2); var_dump( array_flip($input) ); // associative arrays - key as numeric diff --git a/ext/standard/tests/array/array_flip_variation1.phpt b/ext/standard/tests/array/array_flip_variation1.phpt index 9fbfdf0139..8df3a11eea 100644 --- a/ext/standard/tests/array/array_flip_variation1.phpt +++ b/ext/standard/tests/array/array_flip_variation1.phpt @@ -24,7 +24,7 @@ class MyClass //resource variable $fp = fopen(__FILE__,'r'); - + //array of values for 'input' argument $values = array( // int data diff --git a/ext/standard/tests/array/array_flip_variation4.phpt b/ext/standard/tests/array/array_flip_variation4.phpt index 2420c7e00f..405e518b63 100644 --- a/ext/standard/tests/array/array_flip_variation4.phpt +++ b/ext/standard/tests/array/array_flip_variation4.phpt @@ -38,7 +38,7 @@ $input = array( 'bool_value2' => false, 'bool_value3' => TRUE, 'bool_value4' => FALSE, - + // null values 'null_value1' => null, @@ -51,7 +51,7 @@ $input = array( // resource value 'resource_value' => $fp, ); - + var_dump( array_flip($input) ); // closing resource diff --git a/ext/standard/tests/array/array_intersect_assoc_variation1.phpt b/ext/standard/tests/array/array_intersect_assoc_variation1.phpt index 406e82a86f..ca11b7cc9b 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation1.phpt @@ -20,7 +20,7 @@ echo "*** Testing array_intersect_assoc() : Passing non-array values to \$arr1 a $arr2 = array(1, 2); // additional array to be passed for intersection -$arr3 = array(1, 2, "one" => 1, "two" => 2); +$arr3 = array(1, 2, "one" => 1, "two" => 2); // get an unset variable $unset_var = 10; @@ -71,7 +71,7 @@ $arrays = array( // empty data /*16*/ "", '', - + // string data /*18*/ "string", 'string', @@ -94,7 +94,7 @@ $arrays = array( $iterator = 1; foreach($arrays as $unexpected_value) { echo "\n-- Iteration $iterator --"; - + // Calling array_intersect_assoc() with default arguments var_dump( array_intersect_assoc($unexpected_value, $arr2) ); diff --git a/ext/standard/tests/array/array_intersect_assoc_variation2.phpt b/ext/standard/tests/array/array_intersect_assoc_variation2.phpt index 59ba9048d3..274da6f7b2 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation2.phpt @@ -71,7 +71,7 @@ $arrays = array( // empty data /*16*/ "", '', - + // string data /*18*/ "string", 'string', @@ -94,7 +94,7 @@ $arrays = array( $iterator = 1; foreach($arrays as $unexpected_value) { echo "\n-- Iteration $iterator --"; - + // Calling array_intersect_assoc() with default arguments var_dump( array_intersect_assoc($arr1,$unexpected_value) ); diff --git a/ext/standard/tests/array/array_intersect_assoc_variation5.phpt b/ext/standard/tests/array/array_intersect_assoc_variation5.phpt index 0aa109933a..3a86aa9466 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation5.phpt @@ -60,7 +60,7 @@ $arrays = array ( // array to be passsed to $arr2 argument $arr2 = array(0 => 0, 2 => "float", 4 => "f3", 33333333 => "f4", - "\tHello" => 111, 2.2, 'color', "Hello world" => "string", + "\tHello" => 111, 2.2, 'color', "Hello world" => "string", "pen\n" => 33, 133 => "int"); // loop through each sub-array within $arrrays to check the behavior of array_intersect_assoc() diff --git a/ext/standard/tests/array/array_intersect_assoc_variation7.phpt b/ext/standard/tests/array/array_intersect_assoc_variation7.phpt index ba2f79a7ec..9ffbaac77a 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation7.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation7.phpt @@ -60,14 +60,14 @@ $arrays = array ( /*10*/ array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp), // array with mixed values -/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", - 'resource' => $fp, "int" => 133, "float" => 444.432, +/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", + 'resource' => $fp, "int" => 133, "float" => 444.432, "unset" => @$unset_var, "heredoc" => $heredoc) ); // array to be passsed to $arr2 argument -$arr2 = array(0 => "0", 1, "two" => 2, "float" => 2.3333, "f1" => 1.2, - "f4" => 33333333.333, 111 => "\tHello", 3.3 => 'pen\n', '\v\fworld', +$arr2 = array(0 => "0", 1, "two" => 2, "float" => 2.3333, "f1" => 1.2, + "f4" => 33333333.333, 111 => "\tHello", 3.3 => 'pen\n', '\v\fworld', "heredoc" => "Hello world", 11 => new classA(), "resource" => $fp, "int" => 133, 222 => "fruit"); diff --git a/ext/standard/tests/array/array_intersect_assoc_variation8.phpt b/ext/standard/tests/array/array_intersect_assoc_variation8.phpt index 6ec8fb08d7..a287f4742f 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation8.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation8.phpt @@ -60,8 +60,8 @@ $arrays = array ( /*10*/ array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp), // array with mixed values -/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", - 'resource' => $fp, "int" => 133, "float" => 444.432, +/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", + 'resource' => $fp, "int" => 133, "float" => 444.432, "unset" => @$unset_var, "heredoc" => $heredoc) ); diff --git a/ext/standard/tests/array/array_intersect_assoc_variation9.phpt b/ext/standard/tests/array/array_intersect_assoc_variation9.phpt index 338d40936e..48a502fcc4 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation9.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation9.phpt @@ -18,7 +18,7 @@ echo "*** Testing array_intersect_assoc() : passing two dimensional array to bot // two dimensional arrays for $arr1 and $arr2 argument $arr1 = array ( - + // arrays with default keys array(1, 2, "hello", 'world'), array(1, 2, 3, 4), @@ -26,7 +26,7 @@ $arr1 = array ( // arrays with explicit keys array(1 => "one", 2 => "two", 3 => "three"), array("ten" => 10, "twenty" => 20.00, "thirty" => 30) -); +); $arr2 = array ( array(1, 2, 3, 4), diff --git a/ext/standard/tests/array/array_intersect_key_variation4.phpt b/ext/standard/tests/array/array_intersect_key_variation4.phpt index 24e649fe15..396248728a 100644 --- a/ext/standard/tests/array/array_intersect_key_variation4.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation4.phpt @@ -10,7 +10,7 @@ Test array_intersect_key() function : usage variation - Passing integer indexed echo "*** Testing array_intersect_key() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(0 => '0', -1 => '-1' , 02 => 'two', -07 => '-07', 0xA => '0xA', -0xC => '-0xc'); +$input_array = array(0 => '0', -1 => '-1' , 02 => 'two', -07 => '-07', 0xA => '0xA', -0xC => '-0xc'); $input_arrays = array( 'decimal indexed' => array(10 => '10', '-17' => '-17'), diff --git a/ext/standard/tests/array/array_intersect_key_variation5.phpt b/ext/standard/tests/array/array_intersect_key_variation5.phpt index c89add62ec..cf53919256 100644 --- a/ext/standard/tests/array/array_intersect_key_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation5.phpt @@ -10,8 +10,8 @@ Test array_intersect_key() function : usage variation - Passing float indexed ar echo "*** Testing array_intersect_key() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(0 => '0', 10 => '10' , -10 => '-10'); -$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5' , -10.5 => '-10.5', 0.5 => '0.5'); +$input_array = array(0 => '0', 10 => '10' , -10 => '-10'); +$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5' , -10.5 => '-10.5', 0.5 => '0.5'); echo "\n-- Testing array_intersect_key() function with float indexed array --\n"; var_dump( array_intersect_key($input_array, $float_indx_array) ); diff --git a/ext/standard/tests/array/array_intersect_key_variation6.phpt b/ext/standard/tests/array/array_intersect_key_variation6.phpt index b671e11e92..fa6bf02776 100644 --- a/ext/standard/tests/array/array_intersect_key_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation6.phpt @@ -10,7 +10,7 @@ Test array_intersect_key() function : usage variation - Passing boolean indexed echo "*** Testing array_intersect_key() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(0 => '0', 1 => '1' , -10 => '-10'); +$input_array = array(0 => '0', 1 => '1' , -10 => '-10'); $boolean_indx_array = array(true => 'boolt', false => 'boolf', TRUE => 'boolT', FALSE => 'boolF'); echo "\n-- Testing array_intersect_key() function with boolean indexed array --\n"; diff --git a/ext/standard/tests/array/array_intersect_key_variation7.phpt b/ext/standard/tests/array/array_intersect_key_variation7.phpt index 4dabf8d1b7..2698681d8e 100644 --- a/ext/standard/tests/array/array_intersect_key_variation7.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation7.phpt @@ -10,7 +10,7 @@ Test array_intersect_key() function : usage variation - Passing null,unset and u echo "*** Testing array_intersect_key() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(0 => '0', 1 => '1' , -10 => '-10' , null => 'null'); +$input_array = array(0 => '0', 1 => '1' , -10 => '-10' , null => 'null'); //get an unset variable $unset_var = 10; unset ($unset_var); @@ -25,7 +25,7 @@ foreach($input_arrays as $key =>$value) { echo "\n--$key--\n"; var_dump( array_intersect_key($input_array, $value) ); var_dump( array_intersect_key($value,$input_array ) ); -} +} ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/array/array_intersect_key_variation8.phpt b/ext/standard/tests/array/array_intersect_key_variation8.phpt index 5792930afc..29d1f3ba7e 100644 --- a/ext/standard/tests/array/array_intersect_key_variation8.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation8.phpt @@ -13,22 +13,22 @@ echo "*** Testing array_intersect_key() : usage variation ***\n"; $array1 = array( 'first' => array('blue' => 1, 'red' => 2), - + 'second' => array('yellow' => 7), - + 'third' => array(0 =>'zero'), ); $array2 = array ( 'first' => array('blue' => 1, 'red' => 2,), - + 'second' => array('cyan' => 8), - + 'fourth' => array(2 => 'two'), ); var_dump( array_intersect_key($array1, $array2) ); -var_dump( array_intersect_key($array2,$array1 ) ); +var_dump( array_intersect_key($array2,$array1 ) ); ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt index 9fda4da434..8f0bfd4753 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt @@ -18,11 +18,11 @@ class MyClass static function static_compare_func($a, $b) { return strcasecmp($a, $b); } - + public function class_compare_func($a, $b) { return strcasecmp($a, $b); } - + } echo "\n-- Testing array_intersect_uassoc() function using class with static method as callback --\n"; diff --git a/ext/standard/tests/array/array_intersect_ukey_error.phpt b/ext/standard/tests/array/array_intersect_ukey_error.phpt index bb052fbf76..1d449e8fb0 100644 --- a/ext/standard/tests/array/array_intersect_ukey_error.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_error.phpt @@ -19,7 +19,7 @@ function key_compare_func($key1, $key2) if ($key1 == $key2) return 0; else - return ($key1 > $key2)? 1:-1; + return ($key1 > $key2)? 1:-1; } //Test array_intersect_ukey with one more than the expected number of arguments diff --git a/ext/standard/tests/array/array_intersect_ukey_variation1.phpt b/ext/standard/tests/array/array_intersect_ukey_variation1.phpt index 4eb2253f9b..ab3e7d14b4 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation1.phpt @@ -19,7 +19,7 @@ function key_compare_func($key1, $key2) if ($key1 == $key2) return 0; else - return ($key1 > $key2)? 1:-1; + return ($key1 > $key2)? 1:-1; } //get an unset variable diff --git a/ext/standard/tests/array/array_intersect_ukey_variation2.phpt b/ext/standard/tests/array/array_intersect_ukey_variation2.phpt index 5bfe56065c..79bf2b07af 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation2.phpt @@ -19,7 +19,7 @@ function key_compare_func($key1, $key2) if ($key1 == $key2) return 0; else - return ($key1 > $key2)? 1:-1; + return ($key1 > $key2)? 1:-1; } //get an unset variable diff --git a/ext/standard/tests/array/array_intersect_ukey_variation4.phpt b/ext/standard/tests/array/array_intersect_ukey_variation4.phpt index 4d58cb7c2c..82ac583131 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation4.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation4.phpt @@ -20,7 +20,7 @@ function key_compare_func($key1, $key2) if ($key1 == $key2) return 0; else - return ($key1 > $key2)? 1:-1; + return ($key1 > $key2)? 1:-1; } //get an unset variable diff --git a/ext/standard/tests/array/array_intersect_ukey_variation5.phpt b/ext/standard/tests/array/array_intersect_ukey_variation5.phpt index b512b06040..10e5b7f099 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation5.phpt @@ -21,7 +21,7 @@ function key_compare_func($key1, $key2) if ($key1 == $key2) return 0; else - return ($key1 > $key2)? 1:-1; + return ($key1 > $key2)? 1:-1; } echo "\n-- Result of integers and floating point intersection --\n"; diff --git a/ext/standard/tests/array/array_intersect_ukey_variation6.phpt b/ext/standard/tests/array/array_intersect_ukey_variation6.phpt index 6231a657a9..6f5431b1b6 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation6.phpt @@ -20,7 +20,7 @@ function key_compare_func($key1, $key2) if ($key1 == $key2) return 0; else - return ($key1 > $key2)? 1:-1; + return ($key1 > $key2)? 1:-1; } echo "\n-- Result of floating points and strings containing integers intersection --\n"; diff --git a/ext/standard/tests/array/array_intersect_ukey_variation7.phpt b/ext/standard/tests/array/array_intersect_ukey_variation7.phpt index c79277df56..96fef2a48d 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation7.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation7.phpt @@ -21,7 +21,7 @@ function key_compare_func($key1, $key2) if ($key1 == $key2) return 0; else - return ($key1 > $key2)? 1:-1; + return ($key1 > $key2)? 1:-1; } echo "\n-- Result of strings containing integers intersection --\n"; diff --git a/ext/standard/tests/array/array_intersect_ukey_variation9.phpt b/ext/standard/tests/array/array_intersect_ukey_variation9.phpt index 38c91fca07..5094d54435 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation9.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation9.phpt @@ -18,11 +18,11 @@ class MyClass static function static_compare_func($key1, $key2) { return strcasecmp($key1, $key2); } - + public function class_compare_func($key1, $key2) { return strcasecmp($key1, $key2); } - + } echo "\n-- Testing array_intersect_ukey() function using class with static method as callback --\n"; diff --git a/ext/standard/tests/array/array_intersect_variation1.phpt b/ext/standard/tests/array/array_intersect_variation1.phpt index e171cbb7bf..f6836c1bda 100644 --- a/ext/standard/tests/array/array_intersect_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_variation1.phpt @@ -19,7 +19,7 @@ echo "*** Testing array_intersect() : Passing non-array values to \$arr1 argumen $arr2 = array(1, 2); // array to be passed to optional argument -$arr3 = array(1, 2, "one" => 1, "two" => 2); +$arr3 = array(1, 2, "one" => 1, "two" => 2); // get an unset variable $unset_var = 10; @@ -70,7 +70,7 @@ $arrays = array( // empty data /*16*/ "", '', - + // string data /*18*/ "string", 'string', @@ -93,7 +93,7 @@ $arrays = array( $iterator = 1; foreach($arrays as $unexpected_value) { echo "\n-- Iterator $iterator --"; - + // Calling array_intersect() with default arguments var_dump( array_intersect($unexpected_value,$arr2) ); diff --git a/ext/standard/tests/array/array_intersect_variation2.phpt b/ext/standard/tests/array/array_intersect_variation2.phpt index 976211deec..932841107e 100644 --- a/ext/standard/tests/array/array_intersect_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_variation2.phpt @@ -70,7 +70,7 @@ $arrays = array( // empty data /*16*/ "", '', - + // string data /*18*/ "string", 'string', @@ -93,7 +93,7 @@ $arrays = array( $iterator = 1; foreach($arrays as $unexpected_value) { echo "\n-- Iterator $iterator --"; - + // Calling array_intersect() with default arguments var_dump( array_intersect($arr1,$unexpected_value) ); diff --git a/ext/standard/tests/array/array_intersect_variation7.phpt b/ext/standard/tests/array/array_intersect_variation7.phpt index da1088c5ed..c6e12512f1 100644 --- a/ext/standard/tests/array/array_intersect_variation7.phpt +++ b/ext/standard/tests/array/array_intersect_variation7.phpt @@ -59,8 +59,8 @@ $arrays = array ( /*10*/ array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp), // array with mixed values -/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", - 'resource' => $fp, "int" => 133, "float" => 444.432, +/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", + 'resource' => $fp, "int" => 133, "float" => 444.432, "unset" => @$unset_var, "heredoc" => $heredoc) ); diff --git a/ext/standard/tests/array/array_intersect_variation8.phpt b/ext/standard/tests/array/array_intersect_variation8.phpt index 91eae49aab..de13518ade 100644 --- a/ext/standard/tests/array/array_intersect_variation8.phpt +++ b/ext/standard/tests/array/array_intersect_variation8.phpt @@ -59,8 +59,8 @@ $arrays = array ( /*10*/ array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp), // array with mixed values -/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", - 'resource' => $fp, "int" => 133, "float" => 444.432, +/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", + 'resource' => $fp, "int" => 133, "float" => 444.432, "unset" => @$unset_var, "heredoc" => $heredoc) ); diff --git a/ext/standard/tests/array/array_intersect_variation9.phpt b/ext/standard/tests/array/array_intersect_variation9.phpt index 0dba1af6d3..74d1c833e7 100644 --- a/ext/standard/tests/array/array_intersect_variation9.phpt +++ b/ext/standard/tests/array/array_intersect_variation9.phpt @@ -17,7 +17,7 @@ echo "*** Testing array_intersect() : passing two dimensional array to both \$ar // two dimensional arrays for $arr1 and $arr2 argument $arr1 = array ( - + // arrays with default keys array(1, 2, "hello", 'world'), array(1, 2, 3, 4), @@ -25,7 +25,7 @@ $arr1 = array ( // arrays with explicit keys array(1 => "one", 2 => "two", 3 => "three"), array("ten" => 10, "twenty" => 20.00, "thirty" => 30) -); +); $arr2 = array ( array(1, 2, 3, 4), diff --git a/ext/standard/tests/array/array_key_exists.phpt b/ext/standard/tests/array/array_key_exists.phpt index 95ca367284..c1d1cc2e8f 100644 --- a/ext/standard/tests/array/array_key_exists.phpt +++ b/ext/standard/tests/array/array_key_exists.phpt @@ -8,7 +8,7 @@ Test array_key_exists() function * Returns TRUE if the given key is set in the array. * key can be any value possible for an array index. * Also also works on objects. - */ + */ echo "*** Testing basic functionalities ***\n"; /* Arrays with regular values */ @@ -24,7 +24,7 @@ $search_arrays = array( ); /* keys to search in $search_arrays. $keys[0] is the key to be searched in $search_arrays[0] and so on */ -$keys = array( 1, 'a', 2, 4, "Name", "Red", 0, 3 ); +$keys = array( 1, 'a', 2, 4, "Name", "Red", 0, 3 ); $key_counter = 0; foreach ($search_arrays as $search_array) { @@ -74,21 +74,21 @@ var_dump( array_key_exists() ); // first args as array var_dump( array_key_exists(array(), array()) ); // second args as string -var_dump( array_key_exists("", "") ); +var_dump( array_key_exists("", "") ); // second args a integer -var_dump( array_key_exists(1, 1) ); +var_dump( array_key_exists(1, 1) ); // second args as NULL -var_dump( array_key_exists(1, NULL) ); +var_dump( array_key_exists(1, NULL) ); // second args as boolean -var_dump( array_key_exists(1, true) ); +var_dump( array_key_exists(1, true) ); // first args as boolean -var_dump( array_key_exists(false, true) ); +var_dump( array_key_exists(false, true) ); // second args as float -var_dump( array_key_exists(false, 17.5) ); +var_dump( array_key_exists(false, 17.5) ); // args more than expected -var_dump( array_key_exists(1, array(), array()) ); +var_dump( array_key_exists(1, array(), array()) ); // first argument as floating point value -var_dump( array_key_exists(17.5, array(1,23) ) ) ; +var_dump( array_key_exists(17.5, array(1,23) ) ) ; echo "\n*** Testing operation on objects ***\n"; class key_check @@ -118,7 +118,7 @@ var_dump(array_key_exists("var", $key_check_obj->arr)); //found, key is in memb var_dump( array_key_exists($key_check_obj, $key_check_obj) ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- *** Testing basic functionalities *** -- Iteration 1 -- bool(true) diff --git a/ext/standard/tests/array/array_key_exists_object1.phpt b/ext/standard/tests/array/array_key_exists_object1.phpt index 70fb49a725..e55ce93706 100644 --- a/ext/standard/tests/array/array_key_exists_object1.phpt +++ b/ext/standard/tests/array/array_key_exists_object1.phpt @@ -18,7 +18,7 @@ class myClass { var $var1; var $var2; var $var3; - + function __construct($a, $b, $c = null) { $this->var1 = $a; $this->var2 = $b; diff --git a/ext/standard/tests/array/array_key_exists_object2.phpt b/ext/standard/tests/array/array_key_exists_object2.phpt index 78c20c9c72..681f6413f9 100644 --- a/ext/standard/tests/array/array_key_exists_object2.phpt +++ b/ext/standard/tests/array/array_key_exists_object2.phpt @@ -18,7 +18,7 @@ class myClass { public $var1; protected $var2; private $var3; - + function __construct($a, $b, $c = null) { $this->var1 = $a; $this->var2 = $b; diff --git a/ext/standard/tests/array/array_key_exists_variation1.phpt b/ext/standard/tests/array/array_key_exists_variation1.phpt index 2f50d3e86f..b3df9783a6 100644 --- a/ext/standard/tests/array/array_key_exists_variation1.phpt +++ b/ext/standard/tests/array/array_key_exists_variation1.phpt @@ -62,7 +62,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -72,7 +72,7 @@ $inputs = array( /*19*/ "key", 'key', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/array/array_key_exists_variation2.phpt b/ext/standard/tests/array/array_key_exists_variation2.phpt index 30c498768e..183f0605c4 100644 --- a/ext/standard/tests/array/array_key_exists_variation2.phpt +++ b/ext/standard/tests/array/array_key_exists_variation2.phpt @@ -62,7 +62,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -72,7 +72,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/array/array_key_exists_variation5.phpt b/ext/standard/tests/array/array_key_exists_variation5.phpt index 2144fb893c..461a8719ea 100644 --- a/ext/standard/tests/array/array_key_exists_variation5.phpt +++ b/ext/standard/tests/array/array_key_exists_variation5.phpt @@ -14,8 +14,8 @@ Test array_key_exists() function : usage variations - multidimensional arrays echo "*** Testing array_key_exists() : usage variations ***\n"; -$multi_array = array ('zero' => 'val1', - 'one' => 'val2', +$multi_array = array ('zero' => 'val1', + 'one' => 'val2', 'sub1' => array (1, 2, 3)); echo "\n-- Attempt to match key in sub-array --\n"; diff --git a/ext/standard/tests/array/array_key_exists_variation6.phpt b/ext/standard/tests/array/array_key_exists_variation6.phpt index abfba0a4c3..4efca6cb2d 100644 --- a/ext/standard/tests/array/array_key_exists_variation6.phpt +++ b/ext/standard/tests/array/array_key_exists_variation6.phpt @@ -20,8 +20,8 @@ $unset = 10; unset($unset); $array = array ('null' => null, 'NULL' => NULL, - 'empty single quoted string' => '', - "empty double quoted string" => "", + 'empty single quoted string' => '', + "empty double quoted string" => "", 'undefined variable' => @$undefined, 'unset variable' => @$unset); @@ -30,7 +30,7 @@ foreach($array as $name => $input) { $iterator = 1; echo "\n-- Key in \$search array is : $name --\n"; $search[$input] = 'test'; - + //iterate through array again to see which values are considered equal foreach($array as $key) { echo "Iteration $iterator: "; diff --git a/ext/standard/tests/array/array_key_exists_variation8.phpt b/ext/standard/tests/array/array_key_exists_variation8.phpt index 522fd67e99..9dc1f0626c 100644 --- a/ext/standard/tests/array/array_key_exists_variation8.phpt +++ b/ext/standard/tests/array/array_key_exists_variation8.phpt @@ -42,7 +42,7 @@ $inputs = array( -10.5 => 'negative', .5 => 'half', ), - + 'extreme floats' => array( 12.3456789000e10 => 'large', 12.3456789000E-10 => 'small', @@ -65,7 +65,7 @@ $inputs = array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*5*/ 'empty double quotes' => array( "" => 'emptyd', diff --git a/ext/standard/tests/array/array_keys_variation_001.phpt b/ext/standard/tests/array/array_keys_variation_001.phpt index a6203fbbf5..bda5700c3a 100644 --- a/ext/standard/tests/array/array_keys_variation_001.phpt +++ b/ext/standard/tests/array/array_keys_variation_001.phpt @@ -23,7 +23,7 @@ $i = 0; /* loop through to test array_keys() with different arrays */ foreach ($arrays as $array) { echo "\n-- Iteration $i --\n"; - var_dump(array_keys($array)); + var_dump(array_keys($array)); $i++; } diff --git a/ext/standard/tests/array/array_keys_variation_002.phpt b/ext/standard/tests/array/array_keys_variation_002.phpt index 1e7f0df4ad..8378cfbf0d 100644 --- a/ext/standard/tests/array/array_keys_variation_002.phpt +++ b/ext/standard/tests/array/array_keys_variation_002.phpt @@ -11,7 +11,7 @@ echo "\n*** Testing array_keys() on range of values ***\n"; $arr_range = array( 2147483647 => 1, 2147483648 => 2, - -2147483647 => 3, + -2147483647 => 3, -2147483648 => 4, -2147483649 => 5, -0 => 6, diff --git a/ext/standard/tests/array/array_keys_variation_002_64bit.phpt b/ext/standard/tests/array/array_keys_variation_002_64bit.phpt index 04f574d810..dd35a77642 100644 --- a/ext/standard/tests/array/array_keys_variation_002_64bit.phpt +++ b/ext/standard/tests/array/array_keys_variation_002_64bit.phpt @@ -11,7 +11,7 @@ echo "\n*** Testing array_keys() on range of values ***\n"; $arr_range = array( 2147483647 => 1, 2147483648 => 2, - -2147483647 => 3, + -2147483647 => 3, -2147483648 => 4, -2147483649 => 5, -0 => 6, diff --git a/ext/standard/tests/array/array_keys_variation_003.phpt b/ext/standard/tests/array/array_keys_variation_003.phpt index b3a97a0dfb..adb2baea66 100644 --- a/ext/standard/tests/array/array_keys_variation_003.phpt +++ b/ext/standard/tests/array/array_keys_variation_003.phpt @@ -9,7 +9,7 @@ $types_arr = array( FALSE => FALSE, 1 => 1, 0 => 0, - -1 => -1, + -1 => -1, "1" => "1", "0" => "0", "-1" => "-1", @@ -21,7 +21,7 @@ $types_arr = array( $values = array(TRUE, FALSE, 1, 0, -1, "1", "0", "-1", NULL, array(), "php", ""); foreach ($values as $value){ var_dump($value); - var_dump(array_keys($types_arr, $value)); + var_dump(array_keys($types_arr, $value)); } echo "Done\n"; diff --git a/ext/standard/tests/array/array_keys_variation_004.phpt b/ext/standard/tests/array/array_keys_variation_004.phpt index 081660d51b..8198a75e23 100644 --- a/ext/standard/tests/array/array_keys_variation_004.phpt +++ b/ext/standard/tests/array/array_keys_variation_004.phpt @@ -9,7 +9,7 @@ $types_arr = array( FALSE => FALSE, 1 => 1, 0 => 0, - -1 => -1, + -1 => -1, "1" => "1", "0" => "0", "-1" => "-1", diff --git a/ext/standard/tests/array/array_keys_variation_005.phpt b/ext/standard/tests/array/array_keys_variation_005.phpt index ee37400801..6fa5e4225d 100644 --- a/ext/standard/tests/array/array_keys_variation_005.phpt +++ b/ext/standard/tests/array/array_keys_variation_005.phpt @@ -8,7 +8,7 @@ $resource1 = fopen( __FILE__, "r"); $resource2 = opendir( "." ); /* creating an array with resource types as elements */ -$arr_resource = array($resource1, $resource2); +$arr_resource = array($resource1, $resource2); var_dump(array_keys($arr_resource, $resource1)); // loose type checking var_dump(array_keys($arr_resource, $resource1, TRUE)); // strict type checking diff --git a/ext/standard/tests/array/array_map_001.phpt b/ext/standard/tests/array/array_map_001.phpt index 087e3ba284..c5d78c257e 100644 --- a/ext/standard/tests/array/array_map_001.phpt +++ b/ext/standard/tests/array/array_map_001.phpt @@ -5,18 +5,18 @@ array_map() and exceptions in the callback $a = array(1,2,3); -function foo() { - throw new exception(1); -} +function foo() { + throw new exception(1); +} -try { - array_map("foo", $a, array(2,3)); +try { + array_map("foo", $a, array(2,3)); } catch (Exception $e) { var_dump("exception caught!"); } echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(17) "exception caught!" Done diff --git a/ext/standard/tests/array/array_map_variation17.phpt b/ext/standard/tests/array/array_map_variation17.phpt index d9440bb2c1..e2176df760 100644 --- a/ext/standard/tests/array/array_map_variation17.phpt +++ b/ext/standard/tests/array/array_map_variation17.phpt @@ -47,7 +47,7 @@ $unexpected_callbacks = array( false, TRUE, FALSE, - + // empty data /*14*/ "", '', diff --git a/ext/standard/tests/array/array_map_variation18.phpt b/ext/standard/tests/array/array_map_variation18.phpt index ef235e730c..4c85d12e88 100644 --- a/ext/standard/tests/array/array_map_variation18.phpt +++ b/ext/standard/tests/array/array_map_variation18.phpt @@ -67,7 +67,7 @@ $unexpected_inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -76,7 +76,7 @@ $unexpected_inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/standard/tests/array/array_map_variation4.phpt b/ext/standard/tests/array/array_map_variation4.phpt index fcc4090632..d99a529e3a 100644 --- a/ext/standard/tests/array/array_map_variation4.phpt +++ b/ext/standard/tests/array/array_map_variation4.phpt @@ -61,8 +61,8 @@ $arrays = array ( array(new classA() => 11, @$unset_var => "hello", $fp => 'resource'), // array with mixed values -/*11*/ array('hello' => 1, new classA() => 2, "fruit" => 2.2, - $fp => 'resource', 133 => "int", 444.432 => "float", +/*11*/ array('hello' => 1, new classA() => 2, "fruit" => 2.2, + $fp => 'resource', 133 => "int", 444.432 => "float", @$unset_var => "unset", $heredoc => "heredoc") ); diff --git a/ext/standard/tests/array/array_map_variation5.phpt b/ext/standard/tests/array/array_map_variation5.phpt index 55f1569211..e286095576 100644 --- a/ext/standard/tests/array/array_map_variation5.phpt +++ b/ext/standard/tests/array/array_map_variation5.phpt @@ -61,8 +61,8 @@ $arrays = array ( array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp), // array with mixed values -/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", - 'resource' => $fp, "int" => 133, "float" => 444.432, +/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", + 'resource' => $fp, "int" => 133, "float" => 444.432, "unset" => @$unset_var, "heredoc" => $heredoc) ); diff --git a/ext/standard/tests/array/array_map_variation6.phpt b/ext/standard/tests/array/array_map_variation6.phpt index 9b6ee42e2a..e0ab99b042 100644 --- a/ext/standard/tests/array/array_map_variation6.phpt +++ b/ext/standard/tests/array/array_map_variation6.phpt @@ -25,7 +25,7 @@ $arr1 = array( array('a', 'b'), array(1, 2, 'a', 'b'), array(1 => 'a', 'b' => 2) -); +); var_dump( array_map('callback', $arr1)); echo "Done"; diff --git a/ext/standard/tests/array/array_merge.phpt b/ext/standard/tests/array/array_merge.phpt index 245f59e745..205260b2a5 100644 --- a/ext/standard/tests/array/array_merge.phpt +++ b/ext/standard/tests/array/array_merge.phpt @@ -16,7 +16,7 @@ $begin_array = array( array( -2.44444 => 12), array( "a" => 1, "b" => -2.344, "b" => "string", "c" => NULL, "d" => -2.344), array( 4 => 1, 3 => -2.344, "3" => "string", "2" => NULL,1 => -2.344), - array( NULL, 1.23 => "Hi", "string" => "hello", + array( NULL, 1.23 => "Hi", "string" => "hello", array("" => "World", "-2.34" => "a", "0" => "b")) ); @@ -27,7 +27,7 @@ $end_array = array( array( -2.44444 => 12), array( "a" => 1, "b" => -2.344, "b" => "string", "c" => NULL, "d" => -2.344), array( 4 => 1, 3 => -2.344, "3" => "string", "2" => NULL, 1=> -2.344), - array( NULL, 1.23 => "Hi", "string" => "hello", + array( NULL, 1.23 => "Hi", "string" => "hello", array("" => "World", "-2.34" => "a", "0" => "b")) ); @@ -41,7 +41,7 @@ foreach($begin_array as $first) { $result = array_merge($first, $second); print_r($result); $count_inner++; - } + } $count_outer++; } @@ -64,7 +64,7 @@ var_dump( array_merge( $end_array[0], echo "\n*** Testing single array argument ***\n"; /* Empty array */ -var_dump(array_merge(array())); +var_dump(array_merge(array())); /* associative array with string keys, which will not be re-indexed */ var_dump(array_merge($begin_array[4])); @@ -86,7 +86,7 @@ var_dump(array_merge($begin_array[0], $begin_array[1], 100)); var_dump(array_merge($begin_array[0], $begin_array[1], $arr4)); echo "Done\n"; -?> +?> --EXPECTF-- *** Testing array_merge() basic functionality *** diff --git a/ext/standard/tests/array/array_merge_recursive_variation1.phpt b/ext/standard/tests/array/array_merge_recursive_variation1.phpt index 63731d2ad7..67a45e33c8 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation1.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation1.phpt @@ -89,15 +89,15 @@ $arr2 = array(1, array("hello", 'world')); $iterator = 1; foreach($arrays as $arr1) { echo "\n-- Iteration $iterator --"; - + // with default argument echo "\n-- With default argument --"; var_dump( array_merge_recursive($arr1) ); - + // with more arguments echo "-- With more arguments --"; var_dump( array_merge_recursive($arr1, $arr2) ); - + $iterator++; } diff --git a/ext/standard/tests/array/array_merge_recursive_variation10.phpt b/ext/standard/tests/array/array_merge_recursive_variation10.phpt index 06595d5130..224b594a8a 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation10.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation10.phpt @@ -15,7 +15,7 @@ Test array_merge_recursive() function : usage variations - two dimensional array echo "*** Testing array_merge_recursive() : two dimensional array for \$arr1 argument ***\n"; // initialize the 2-d array -$arr1 = array( +$arr1 = array( array(1, 2, 3, 1), "array" => array("hello", "world", "str1" => "hello", "str2" => 'world'), array(1 => "one", 2 => "two", "one", 'two'), diff --git a/ext/standard/tests/array/array_merge_recursive_variation3.phpt b/ext/standard/tests/array/array_merge_recursive_variation3.phpt index 8a76a67153..12d225a0d5 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation3.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation3.phpt @@ -92,7 +92,7 @@ foreach($arrays as $arr1) { $iterator++; } - + echo "Done"; ?> --EXPECT-- diff --git a/ext/standard/tests/array/array_merge_recursive_variation4.phpt b/ext/standard/tests/array/array_merge_recursive_variation4.phpt index b497acec7e..dfbfc56337 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation4.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation4.phpt @@ -74,7 +74,7 @@ foreach($arrays as $arr1) { // close the file resource used fclose($fp); - + echo "Done"; ?> --EXPECTF-- diff --git a/ext/standard/tests/array/array_merge_recursive_variation5.phpt b/ext/standard/tests/array/array_merge_recursive_variation5.phpt index 3b251220ea..76e2ee399c 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation5.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation5.phpt @@ -74,7 +74,7 @@ foreach($arrays as $arr1) { // close the file resource used fclose($fp); - + echo "Done"; ?> --EXPECTF-- diff --git a/ext/standard/tests/array/array_merge_recursive_variation8.phpt b/ext/standard/tests/array/array_merge_recursive_variation8.phpt index 255ed070aa..ff76ed959c 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation8.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation8.phpt @@ -18,7 +18,7 @@ $arr1 = array(b"1", b"hello" => "hello", b"world", "str1" => b"hello", "str2" => // initialize the second argument $arr2 = array(b"str1" => b"binary", b"hello" => "binary", b"str2" => b"binary"); - + echo "-- With default argument --\n"; var_dump( array_merge_recursive($arr1) ); diff --git a/ext/standard/tests/array/array_merge_variation1.phpt b/ext/standard/tests/array/array_merge_variation1.phpt index 96996edcf4..76821fae0f 100644 --- a/ext/standard/tests/array/array_merge_variation1.phpt +++ b/ext/standard/tests/array/array_merge_variation1.phpt @@ -61,7 +61,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -71,7 +71,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/array/array_merge_variation10.phpt b/ext/standard/tests/array/array_merge_variation10.phpt index 46403fac9e..00a197a29e 100644 --- a/ext/standard/tests/array/array_merge_variation10.phpt +++ b/ext/standard/tests/array/array_merge_variation10.phpt @@ -7,7 +7,7 @@ Test array_merge() function : usage variations - position of internal array poin * Source code: ext/standard/array.c */ -/* +/* * Check the position of the internal array pointer after calling array_merge(). * This test is also passing more than two arguments to array_merge(). */ diff --git a/ext/standard/tests/array/array_merge_variation2.phpt b/ext/standard/tests/array/array_merge_variation2.phpt index 30a405c623..7b67b4840d 100644 --- a/ext/standard/tests/array/array_merge_variation2.phpt +++ b/ext/standard/tests/array/array_merge_variation2.phpt @@ -61,7 +61,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -71,7 +71,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/array/array_merge_variation3.phpt b/ext/standard/tests/array/array_merge_variation3.phpt index 717968adb8..6eec1d98e5 100644 --- a/ext/standard/tests/array/array_merge_variation3.phpt +++ b/ext/standard/tests/array/array_merge_variation3.phpt @@ -70,13 +70,13 @@ $inputs = array( TRUE, FALSE, ), - + // empty data /*5*/ 'empty string' => array( "", '', ), - + /*6*/ 'empty array' => array( ), @@ -86,7 +86,7 @@ $inputs = array( 'string', $heredoc, ), - + // object data /*8*/ 'object' => array( new classA(), diff --git a/ext/standard/tests/array/array_merge_variation4.phpt b/ext/standard/tests/array/array_merge_variation4.phpt index ad7d7fe5dc..05e520d67f 100644 --- a/ext/standard/tests/array/array_merge_variation4.phpt +++ b/ext/standard/tests/array/array_merge_variation4.phpt @@ -43,7 +43,7 @@ $inputs = array( -10.5 => 'negative', .5 => 'half', ), - + /*3*/ 'extreme floats' => array( 12.3456789000e10 => 'large', 12.3456789000E-10 => 'small', @@ -53,7 +53,7 @@ $inputs = array( /*4*/ 'null uppercase' => array( NULL => 'null 1', ), - + /*5*/ 'null lowercase' => array( null => 'null 2', ), @@ -63,17 +63,17 @@ $inputs = array( true => 'lowert', false => 'lowerf', ), - + /*7*/ 'bool uppercase' => array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*8*/ 'empty double quotes' => array( "" => 'emptyd', ), - + /*9*/ 'empty single quotes' => array( '' => 'emptys', ), diff --git a/ext/standard/tests/array/array_multisort_basic1.phpt b/ext/standard/tests/array/array_multisort_basic1.phpt index 7d33596630..79248b0cbc 100644 --- a/ext/standard/tests/array/array_multisort_basic1.phpt +++ b/ext/standard/tests/array/array_multisort_basic1.phpt @@ -5,7 +5,7 @@ Test array_multisort() function : basic functionality /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...]) * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : basic functionality ***\n"; diff --git a/ext/standard/tests/array/array_multisort_basic2.phpt b/ext/standard/tests/array/array_multisort_basic2.phpt index 682543bc9f..af59731558 100644 --- a/ext/standard/tests/array/array_multisort_basic2.phpt +++ b/ext/standard/tests/array/array_multisort_basic2.phpt @@ -5,7 +5,7 @@ Test array_multisort() function : basic functionality /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...]) * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : basic functionality - renumbering of numeric keys ***\n"; diff --git a/ext/standard/tests/array/array_multisort_case.phpt b/ext/standard/tests/array/array_multisort_case.phpt index f766e5fc1d..ce4be6bd9a 100644 --- a/ext/standard/tests/array/array_multisort_case.phpt +++ b/ext/standard/tests/array/array_multisort_case.phpt @@ -5,7 +5,7 @@ Test array_multisort() function : case-sensitive /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE], ...]) * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : case-sensitive\n"; diff --git a/ext/standard/tests/array/array_multisort_error.phpt b/ext/standard/tests/array/array_multisort_error.phpt index 5956630f84..d1ea4663d2 100644 --- a/ext/standard/tests/array/array_multisort_error.phpt +++ b/ext/standard/tests/array/array_multisort_error.phpt @@ -5,7 +5,7 @@ Test array_multisort() function : error conditions /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...]) * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : error conditions ***\n"; diff --git a/ext/standard/tests/array/array_multisort_incase.phpt b/ext/standard/tests/array/array_multisort_incase.phpt index 46d55ae065..b03c2f2d33 100644 --- a/ext/standard/tests/array/array_multisort_incase.phpt +++ b/ext/standard/tests/array/array_multisort_incase.phpt @@ -5,7 +5,7 @@ Test array_multisort() function : case-insensitive /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE], ...]) * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : case-insensitive\n"; diff --git a/ext/standard/tests/array/array_multisort_natural.phpt b/ext/standard/tests/array/array_multisort_natural.phpt index 35576c481c..66f57d7257 100644 --- a/ext/standard/tests/array/array_multisort_natural.phpt +++ b/ext/standard/tests/array/array_multisort_natural.phpt @@ -5,7 +5,7 @@ Test array_multisort() function : natural sorting /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE], ...]) * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : natural sorting\n"; diff --git a/ext/standard/tests/array/array_multisort_natural_case.phpt b/ext/standard/tests/array/array_multisort_natural_case.phpt index 163819ef96..21d6844864 100644 --- a/ext/standard/tests/array/array_multisort_natural_case.phpt +++ b/ext/standard/tests/array/array_multisort_natural_case.phpt @@ -5,7 +5,7 @@ Test array_multisort() function : natural sorting case-sensitive /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE], ...]) * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : natural sorting case-sensitive\n"; diff --git a/ext/standard/tests/array/array_multisort_natural_incase.phpt b/ext/standard/tests/array/array_multisort_natural_incase.phpt index 1ada637f0e..f84b73c773 100644 --- a/ext/standard/tests/array/array_multisort_natural_incase.phpt +++ b/ext/standard/tests/array/array_multisort_natural_incase.phpt @@ -5,7 +5,7 @@ Test array_multisort() function : natural sorting case-insensitive /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE], ...]) * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : natural sorting case-insensitive\n"; diff --git a/ext/standard/tests/array/array_multisort_variation1.phpt b/ext/standard/tests/array/array_multisort_variation1.phpt index 93c265922e..e761a9649c 100644 --- a/ext/standard/tests/array/array_multisort_variation1.phpt +++ b/ext/standard/tests/array/array_multisort_variation1.phpt @@ -5,7 +5,7 @@ Test array_multisort() function : usage variation /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...]) * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_multisort_variation10.phpt b/ext/standard/tests/array/array_multisort_variation10.phpt index e4e9075562..e6c068e276 100644 --- a/ext/standard/tests/array/array_multisort_variation10.phpt +++ b/ext/standard/tests/array/array_multisort_variation10.phpt @@ -5,7 +5,7 @@ Test array_multisort() function : usage variation - testing with anonymous arrar /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...]) * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : Testing with anonymous arguments ***\n"; diff --git a/ext/standard/tests/array/array_multisort_variation2.phpt b/ext/standard/tests/array/array_multisort_variation2.phpt index 86210eeb49..ab2bfcca3d 100644 --- a/ext/standard/tests/array/array_multisort_variation2.phpt +++ b/ext/standard/tests/array/array_multisort_variation2.phpt @@ -5,7 +5,7 @@ Test array_multisort() function : usage variation /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...]) * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_multisort_variation3.phpt b/ext/standard/tests/array/array_multisort_variation3.phpt index b2cdb05ece..49bae0ff34 100644 --- a/ext/standard/tests/array/array_multisort_variation3.phpt +++ b/ext/standard/tests/array/array_multisort_variation3.phpt @@ -5,7 +5,7 @@ Test array_multisort() function : usage variation /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...]) * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_multisort_variation4.phpt b/ext/standard/tests/array/array_multisort_variation4.phpt index 76eb9ab04b..6ec0f5720c 100644 --- a/ext/standard/tests/array/array_multisort_variation4.phpt +++ b/ext/standard/tests/array/array_multisort_variation4.phpt @@ -5,7 +5,7 @@ Test array_multisort() function : usage variation - testing with multiple array /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...]) * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : Testing with multiple array arguments ***\n"; diff --git a/ext/standard/tests/array/array_multisort_variation5.phpt b/ext/standard/tests/array/array_multisort_variation5.phpt index 66504ca798..bb18e9893f 100644 --- a/ext/standard/tests/array/array_multisort_variation5.phpt +++ b/ext/standard/tests/array/array_multisort_variation5.phpt @@ -5,7 +5,7 @@ Test array_multisort() function : usage variation - testing with multiple array /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...]) * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : Testing all array sort specifiers ***\n"; diff --git a/ext/standard/tests/array/array_multisort_variation6.phpt b/ext/standard/tests/array/array_multisort_variation6.phpt index 81bd1d1acd..70b03a4bd0 100644 --- a/ext/standard/tests/array/array_multisort_variation6.phpt +++ b/ext/standard/tests/array/array_multisort_variation6.phpt @@ -5,7 +5,7 @@ Test array_multisort() function : usage variation - testing with multiple array /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...]) * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : Testing all array sort specifiers ***\n"; diff --git a/ext/standard/tests/array/array_multisort_variation7.phpt b/ext/standard/tests/array/array_multisort_variation7.phpt index 996c183fcd..7c6dd5f135 100644 --- a/ext/standard/tests/array/array_multisort_variation7.phpt +++ b/ext/standard/tests/array/array_multisort_variation7.phpt @@ -5,7 +5,7 @@ Test array_multisort() function : usage variation - test sort order of all types /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...]) * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : usage variation - test sort order of all types***\n"; diff --git a/ext/standard/tests/array/array_multisort_variation8.phpt b/ext/standard/tests/array/array_multisort_variation8.phpt index 90c66a97cc..1765315337 100644 --- a/ext/standard/tests/array/array_multisort_variation8.phpt +++ b/ext/standard/tests/array/array_multisort_variation8.phpt @@ -5,7 +5,7 @@ Test array_multisort() function : usage variation - test sort order of all types /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...]) * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : usage variation - test sort order of all types***\n"; diff --git a/ext/standard/tests/array/array_multisort_variation9.phpt b/ext/standard/tests/array/array_multisort_variation9.phpt index cc4b8d147b..7c76919d23 100644 --- a/ext/standard/tests/array/array_multisort_variation9.phpt +++ b/ext/standard/tests/array/array_multisort_variation9.phpt @@ -5,7 +5,7 @@ Test array_multisort() function : usage variation - test sort order of all types /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...]) * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : usage variation - test sort order of all types***\n"; diff --git a/ext/standard/tests/array/array_pad.phpt b/ext/standard/tests/array/array_pad.phpt index add9b3c8e5..c267516730 100644 --- a/ext/standard/tests/array/array_pad.phpt +++ b/ext/standard/tests/array/array_pad.phpt @@ -20,7 +20,7 @@ var_dump(array_pad("", 2000000, 0)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: array_pad() expects exactly 3 parameters, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/array/array_pad_variation2.phpt b/ext/standard/tests/array/array_pad_variation2.phpt index 69de77ee97..77a2d6e949 100644 --- a/ext/standard/tests/array/array_pad_variation2.phpt +++ b/ext/standard/tests/array/array_pad_variation2.phpt @@ -71,7 +71,7 @@ $pad_sizes = array( // object data /*21*/ new classA(), - + // undefined data /*22*/ @$undefined_var, diff --git a/ext/standard/tests/array/array_pad_variation3.phpt b/ext/standard/tests/array/array_pad_variation3.phpt index 75df118220..b761d615a7 100644 --- a/ext/standard/tests/array/array_pad_variation3.phpt +++ b/ext/standard/tests/array/array_pad_variation3.phpt @@ -7,7 +7,7 @@ Test array_pad() function : usage variations - possible values for 'pad_value' a * Source code: ext/standard/array.c */ -/* +/* * Testing array_pad() function for expected behavior by passing * different possible values for $pad_value argument. * $input and $pad_size arguments take fixed value. @@ -97,7 +97,7 @@ $pad_values = array( // unset data /*30*/ @$unset_var, - + // resource variable /*31*/ $fp, diff --git a/ext/standard/tests/array/array_pop.phpt b/ext/standard/tests/array/array_pop.phpt index 2336d2a394..843a618f2e 100644 --- a/ext/standard/tests/array/array_pop.phpt +++ b/ext/standard/tests/array/array_pop.phpt @@ -32,13 +32,13 @@ echo "\n*** Normal testing with various array inputs ***\n"; $counter = 1; foreach( $mixed_array as $sub_array ) -{ +{ echo "\n-- Input Array for Iteration $counter is --\n"; print_r( $sub_array ); echo "\nOutput after Pop is :\n"; var_dump( array_pop($sub_array) ); $counter++; -} +} echo"\nDone"; ?> diff --git a/ext/standard/tests/array/array_product_error.phpt b/ext/standard/tests/array/array_product_error.phpt index 79f7cb4a08..4aaf2112b9 100644 --- a/ext/standard/tests/array/array_product_error.phpt +++ b/ext/standard/tests/array/array_product_error.phpt @@ -5,7 +5,7 @@ Test array_product() function : error conditions /* Prototype : mixed array_product(array input) * Description: Returns the product of the array entries * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_product() : error conditions ***\n"; diff --git a/ext/standard/tests/array/array_product_variation1.phpt b/ext/standard/tests/array/array_product_variation1.phpt index cd2ed71ae6..799e7ea0ca 100644 --- a/ext/standard/tests/array/array_product_variation1.phpt +++ b/ext/standard/tests/array/array_product_variation1.phpt @@ -5,7 +5,7 @@ Test array_product() function : variation /* Prototype : mixed array_product(array input) * Description: Returns the product of the array entries * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_product() : variation - using non numeric values ***\n"; @@ -15,7 +15,7 @@ class A { } $fp = fopen(__FILE__, "r"); -$types = array("boolean (true)" => true, "boolean (false)" => false, +$types = array("boolean (true)" => true, "boolean (false)" => false, "string" => "hello", "numeric string" => "12", "resource" => $fp, "object" => new A(), "null" => null, "array" => array(3,2)); diff --git a/ext/standard/tests/array/array_product_variation2.phpt b/ext/standard/tests/array/array_product_variation2.phpt index 79821981a0..0f81835c17 100644 --- a/ext/standard/tests/array/array_product_variation2.phpt +++ b/ext/standard/tests/array/array_product_variation2.phpt @@ -5,7 +5,7 @@ Test array_product() function : variation /* Prototype : mixed array_product(array input) * Description: Returns the product of the array entries * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_product() : variations ***\n"; diff --git a/ext/standard/tests/array/array_product_variation3.phpt b/ext/standard/tests/array/array_product_variation3.phpt index e2b5e3efe8..9202ef20c8 100644 --- a/ext/standard/tests/array/array_product_variation3.phpt +++ b/ext/standard/tests/array/array_product_variation3.phpt @@ -5,7 +5,7 @@ Test array_product() function : variation /* Prototype : mixed array_product(array input) * Description: Returns the product of the array entries * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_product() : variations - negative numbers***\n"; diff --git a/ext/standard/tests/array/array_product_variation4.phpt b/ext/standard/tests/array/array_product_variation4.phpt index f2b9f2bc29..51d0c12ca6 100644 --- a/ext/standard/tests/array/array_product_variation4.phpt +++ b/ext/standard/tests/array/array_product_variation4.phpt @@ -5,7 +5,7 @@ Test array_product() function : variation /* Prototype : mixed array_product(array input) * Description: Returns the product of the array entries * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_product() : variations ***\n"; diff --git a/ext/standard/tests/array/array_product_variation5.phpt b/ext/standard/tests/array/array_product_variation5.phpt index 687ea89c38..36e9f5708a 100644 --- a/ext/standard/tests/array/array_product_variation5.phpt +++ b/ext/standard/tests/array/array_product_variation5.phpt @@ -5,7 +5,7 @@ Test array_product() function : usage variation /* Prototype : mixed array_product(array input) * Description: Returns the product of the array entries * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_product() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_push.phpt b/ext/standard/tests/array/array_push.phpt index 829100c54c..52e754f94d 100644 --- a/ext/standard/tests/array/array_push.phpt +++ b/ext/standard/tests/array/array_push.phpt @@ -54,13 +54,13 @@ echo "\n*** Testing with various array inputs ***\n"; $counter = 1; foreach( $mixed_array as $sub_array ) -{ +{ echo "\n-- Input Array for Iteration $counter is --\n"; print_r( $sub_array ); echo "\nOutput after push is :\n"; var_dump( array_push($sub_array, 22, "abc") ); $counter++; -} +} /* Checking for return value and the new array formed from push operation */ echo "\n*** Checking for return value and the new array formed from push operation ***\n"; diff --git a/ext/standard/tests/array/array_push_variation1.phpt b/ext/standard/tests/array/array_push_variation1.phpt index 14125fcb87..766d8459d1 100644 --- a/ext/standard/tests/array/array_push_variation1.phpt +++ b/ext/standard/tests/array/array_push_variation1.phpt @@ -61,7 +61,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -71,7 +71,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/array/array_push_variation2.phpt b/ext/standard/tests/array/array_push_variation2.phpt index 9e31a7628a..0cb14b5039 100644 --- a/ext/standard/tests/array/array_push_variation2.phpt +++ b/ext/standard/tests/array/array_push_variation2.phpt @@ -61,7 +61,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -71,7 +71,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/array/array_push_variation6.phpt b/ext/standard/tests/array/array_push_variation6.phpt index 903a7a5ef4..3cf0d7f91c 100644 --- a/ext/standard/tests/array/array_push_variation6.phpt +++ b/ext/standard/tests/array/array_push_variation6.phpt @@ -42,7 +42,7 @@ $inputs = array( -10.5 => 'negative', .5 => 'half', ), - + 'extreme floats' => array( 12.3456789000e10 => 'large', 12.3456789000E-10 => 'small', @@ -65,7 +65,7 @@ $inputs = array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*5*/ 'empty double quotes' => array( "" => 'emptyd', diff --git a/ext/standard/tests/array/array_rand.phpt b/ext/standard/tests/array/array_rand.phpt index 678892b6e0..db432dc9b4 100644 --- a/ext/standard/tests/array/array_rand.phpt +++ b/ext/standard/tests/array/array_rand.phpt @@ -15,7 +15,7 @@ var_dump(array_rand(array(1,2,3), 2)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: array_rand() expects at least 1 parameter, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/array/array_rand_basic2.phpt b/ext/standard/tests/array/array_rand_basic2.phpt index e18fede4bd..b9e75c9679 100644 --- a/ext/standard/tests/array/array_rand_basic2.phpt +++ b/ext/standard/tests/array/array_rand_basic2.phpt @@ -16,7 +16,7 @@ echo "*** Testing array_rand() : with associative array ***\n"; // Initialise the 'input' and 'num_req' variables $input = array( - 'one' => 1, 'two' => 2, 'three' => 3, + 'one' => 1, 'two' => 2, 'three' => 3, 'FoUr' => 'four', '#5' => 5, 'SIX' => 'six', "seven" => 7, "#8" => "eight", "nine" => "NINE" ); diff --git a/ext/standard/tests/array/array_rand_variation1.phpt b/ext/standard/tests/array/array_rand_variation1.phpt index 1847e60dc6..4e3e13462b 100644 --- a/ext/standard/tests/array/array_rand_variation1.phpt +++ b/ext/standard/tests/array/array_rand_variation1.phpt @@ -28,7 +28,7 @@ $fp = fopen(__FILE__, "r"); class test { var $t = 10; - function __toString() + function __toString() { return "object"; } @@ -48,8 +48,8 @@ $values = array( -10.5, 12.3456789000e10, 12.3456789000E-10, - .5, - + .5, + // null data /*10*/ NULL, null, @@ -88,7 +88,7 @@ $count = 1; foreach($values as $value) { echo "\n-- Iteration $count --\n"; var_dump( array_rand($value,$num_req) ); - $count++; + $count++; }; // closing the resource diff --git a/ext/standard/tests/array/array_rand_variation2.phpt b/ext/standard/tests/array/array_rand_variation2.phpt index 44967ffd8c..9978673e50 100644 --- a/ext/standard/tests/array/array_rand_variation2.phpt +++ b/ext/standard/tests/array/array_rand_variation2.phpt @@ -82,7 +82,7 @@ $values = array( $count = 1; foreach($values as $value) { echo "\n-- Iteration $count --\n"; - var_dump( array_rand($input,$value) ); + var_dump( array_rand($input,$value) ); $count++; }; diff --git a/ext/standard/tests/array/array_rand_variation3.phpt b/ext/standard/tests/array/array_rand_variation3.phpt index 81194a135d..b858a13e7d 100644 --- a/ext/standard/tests/array/array_rand_variation3.phpt +++ b/ext/standard/tests/array/array_rand_variation3.phpt @@ -21,7 +21,7 @@ $input = array( // array with float values array(1.23, -1.23, 0.34, -0.34, 0e2, 2e-3, -2e2, -40e-2), - + // array with single quoted strings /*3*/ array('one', '123numbers', 'hello\tworld', 'hello world\0', '12.34floatnum'), @@ -33,7 +33,7 @@ $input = array( // array with hexa values array(0x123, -0x123, 0xabc, 0xABC, 0xab), - + // array with null values /*7*/ array(null, NULL, "\0", Null, NuLl) diff --git a/ext/standard/tests/array/array_rand_variation4.phpt b/ext/standard/tests/array/array_rand_variation4.phpt index 74dada0aa0..f2a665185a 100644 --- a/ext/standard/tests/array/array_rand_variation4.phpt +++ b/ext/standard/tests/array/array_rand_variation4.phpt @@ -16,12 +16,12 @@ echo "*** Testing array_rand() : with associative arrays ***\n"; // initialise associative arrays $asso_arrays = array( - + // array with numeric keys /*1*/ array(1 => 'one', 2 => 2, 1234567890 => 'big', -1 => 'negative key', 2.3 => 'float key', 0 => "zero key", 0.2 => 'decimal key', 2e2 => 'exp key1', -2e3 => 'negative exp key'), - + // array with string keys array('one' => 1, "two" => 2.0, "three" => 'three', '12twelve' => 12.00, "" => 'empty string', " " => "space key"), @@ -42,7 +42,7 @@ $asso_arrays = array( "\t" => "tab as key", "'" => 'single quote as key', '"' => 'double quote as key', "\0" => "null char as key") ); - + /* looping to test array_rand() function with different arrays having * different types of keys */ @@ -59,10 +59,10 @@ foreach($asso_arrays as $input) { var_dump( array_rand($input, 1) ); // with $num_req=1 echo"\nWith num_req = 2\n"; var_dump( array_rand($input, 2) ); // with $num_req=2 - + $counter++; } // end of for loop - + echo "Done"; ?> diff --git a/ext/standard/tests/array/array_rand_variation5.phpt b/ext/standard/tests/array/array_rand_variation5.phpt index 44f5cd8573..734c6267b9 100644 --- a/ext/standard/tests/array/array_rand_variation5.phpt +++ b/ext/standard/tests/array/array_rand_variation5.phpt @@ -22,7 +22,7 @@ $input = array( 0xabc => 2748, 0x12f => '303', 0xff => "255", 0123 => 83, 012 => 10, 010 => "8" ); - + // Testing array_rand() function with various invalid 'req_num' values // with valid num_req values echo"\n-- With default num_req value --\n"; @@ -39,7 +39,7 @@ echo"\n-- With num_req = -2 --\n"; var_dump( array_rand($input, -2) ); // with $num_req=-2 echo"\n-- With num_req more than number of members in 'input' array --\n"; var_dump( array_rand($input, 13) ); // with $num_req=13 - + echo "Done"; ?> diff --git a/ext/standard/tests/array/array_reduce.phpt b/ext/standard/tests/array/array_reduce.phpt index 9d702ebce0..4a73a8eb95 100644 --- a/ext/standard/tests/array/array_reduce.phpt +++ b/ext/standard/tests/array/array_reduce.phpt @@ -36,7 +36,7 @@ $initial = null; var_dump(array_reduce($array, 'reduce_null', $initial), $initial); echo "\nDone"; -?> +?> --EXPECT-- *** Testing array_reduce() to integer *** int(61) diff --git a/ext/standard/tests/array/array_reduce_error.phpt b/ext/standard/tests/array/array_reduce_error.phpt index 954aa43d76..0cbb2c6428 100644 --- a/ext/standard/tests/array/array_reduce_error.phpt +++ b/ext/standard/tests/array/array_reduce_error.phpt @@ -5,7 +5,7 @@ Test array_reduce() function : error conditions /* Prototype : mixed array_reduce(array input, mixed callback [, int initial]) * Description: Iteratively reduce the array to a single value via the callback. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_reduce() : error conditions ***\n"; diff --git a/ext/standard/tests/array/array_reduce_variation1.phpt b/ext/standard/tests/array/array_reduce_variation1.phpt index e4bbea8bf0..a2a396b556 100644 --- a/ext/standard/tests/array/array_reduce_variation1.phpt +++ b/ext/standard/tests/array/array_reduce_variation1.phpt @@ -5,7 +5,7 @@ Test array_reduce() function : variation /* Prototype : mixed array_reduce(array input, mixed callback [, int initial]) * Description: Iteratively reduce the array to a single value via the callback. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_reduce() : variation ***\n"; diff --git a/ext/standard/tests/array/array_reduce_variation2.phpt b/ext/standard/tests/array/array_reduce_variation2.phpt index 35b2d38f40..d1cb97e2c4 100644 --- a/ext/standard/tests/array/array_reduce_variation2.phpt +++ b/ext/standard/tests/array/array_reduce_variation2.phpt @@ -5,7 +5,7 @@ Test array_reduce() function : variation - invalid parameters /* Prototype : mixed array_reduce(array input, mixed callback [, int initial]) * Description: Iteratively reduce the array to a single value via the callback. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_reduce() : variation - invalid parameters ***\n"; diff --git a/ext/standard/tests/array/array_reduce_variation3.phpt b/ext/standard/tests/array/array_reduce_variation3.phpt index a359d425db..274259129d 100644 --- a/ext/standard/tests/array/array_reduce_variation3.phpt +++ b/ext/standard/tests/array/array_reduce_variation3.phpt @@ -5,7 +5,7 @@ Test array_reduce() function : variation - object callbacks /* Prototype : mixed array_reduce(array input, mixed callback [, int initial]) * Description: Iteratively reduce the array to a single value via the callback. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_reduce() : variation - object callbacks ***\n"; diff --git a/ext/standard/tests/array/array_reverse_variation1.phpt b/ext/standard/tests/array/array_reverse_variation1.phpt index 70c5d5fa3d..b2936c171c 100644 --- a/ext/standard/tests/array/array_reverse_variation1.phpt +++ b/ext/standard/tests/array/array_reverse_variation1.phpt @@ -58,12 +58,12 @@ $arrays = array ( // empty data /*16*/ "", '', - + // string data 'Hello world', "Hello world", $heredoc_string, - + // object data /*21*/ new classA(), diff --git a/ext/standard/tests/array/array_reverse_variation4.phpt b/ext/standard/tests/array/array_reverse_variation4.phpt index e3f0254f52..a71ec8311d 100644 --- a/ext/standard/tests/array/array_reverse_variation4.phpt +++ b/ext/standard/tests/array/array_reverse_variation4.phpt @@ -43,11 +43,11 @@ $arrays = array ( array(0 => "0"), array(1 => "1"), array(1 => "1", 2 => "2", 3 => "3", 4 => "4"), - + // arrays with float keys /*5*/ array(2.3333 => "float"), array(1.2 => "f1", 3.33 => "f2", 4.89999922839999 => "f3", 33333333.333333 => "f4"), - + // arrays with string keys array("\tHello" => 111, "re\td" => "color", "\v\fworld" => 2.2, "pen\n" => 33), /*8*/ array("\tHello" => 111, "re\td" => "color", "\v\fworld" => 2.2, "pen\n" => 33), diff --git a/ext/standard/tests/array/array_reverse_variation5.phpt b/ext/standard/tests/array/array_reverse_variation5.phpt index 6c4c952240..5c889ee118 100644 --- a/ext/standard/tests/array/array_reverse_variation5.phpt +++ b/ext/standard/tests/array/array_reverse_variation5.phpt @@ -46,11 +46,11 @@ $arrays = array ( array('0' => 0), array("1" => 1), array("one" => 1, 'two' => 2, "three" => 3, 4 => 4), - + // arrays with float values /*5*/ array("float" => 2.3333), array("f1" => 1.2, 'f2' => 3.33, 3 => 4.89999922839999, 'f4' => 33333333.333333), - + // arrays with string values array(111 => "\tHello", "red" => "col\tor", 2 => "\v\fworld", 3.3 => "pen\n"), /*8*/ array(111 => '\tHello', "red" => 'col\tor', 2 => '\v\fworld', 3.3 => 'pen\n'), diff --git a/ext/standard/tests/array/array_reverse_variation6.phpt b/ext/standard/tests/array/array_reverse_variation6.phpt index edbefd345f..e48673ec1d 100644 --- a/ext/standard/tests/array/array_reverse_variation6.phpt +++ b/ext/standard/tests/array/array_reverse_variation6.phpt @@ -15,7 +15,7 @@ echo "*** Testing array_reverse() : usage variations ***\n"; // Initializing the 2-d arrays $two_dimensional_array = array( - + // associative array array('color' => 'red', 'item' => 'pen', 'place' => 'LA'), @@ -24,7 +24,7 @@ $two_dimensional_array = array( // combination of numeric and associative arrays array('a' => 'green', 'red', 'brown', 33, 88, 'orange', 'item' => 'ball') -); +); // calling array_reverse() with various types of 2-d arrays // with default arguments diff --git a/ext/standard/tests/array/array_search1.phpt b/ext/standard/tests/array/array_search1.phpt index 81dd55db62..49563f9712 100644 --- a/ext/standard/tests/array/array_search1.phpt +++ b/ext/standard/tests/array/array_search1.phpt @@ -18,7 +18,7 @@ var_dump(array_search(-1,$a, true)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: array_search() expects at least 2 parameters, 1 given in %s on line %d NULL diff --git a/ext/standard/tests/array/array_search_variation1.phpt b/ext/standard/tests/array/array_search_variation1.phpt index 094767dacd..6c52a3bfed 100644 --- a/ext/standard/tests/array/array_search_variation1.phpt +++ b/ext/standard/tests/array/array_search_variation1.phpt @@ -19,7 +19,7 @@ $arrays = array ( array(TRUE, FALSE), array("", array()), array("abcd\x00abcd\x00abcd"), - array("abcd\tabcd\nabcd\rabcd\0abcdefghij") + array("abcd\tabcd\nabcd\rabcd\0abcdefghij") ); $array_compare = array ( @@ -49,15 +49,15 @@ foreach($arrays as $array) { foreach($array_compare as $compare) { echo "-- Iteration $counter --\n"; //strict option OFF - var_dump(array_search($compare,$array)); + var_dump(array_search($compare,$array)); //strict option ON - var_dump(array_search($compare,$array,TRUE)); + var_dump(array_search($compare,$array,TRUE)); //strict option OFF - var_dump(array_search($compare,$array,FALSE)); + var_dump(array_search($compare,$array,FALSE)); $counter++; } } - + echo "Done\n"; ?> --EXPECT-- diff --git a/ext/standard/tests/array/array_search_variation2.phpt b/ext/standard/tests/array/array_search_variation2.phpt index a8bac04edb..fa43841984 100644 --- a/ext/standard/tests/array/array_search_variation2.phpt +++ b/ext/standard/tests/array/array_search_variation2.phpt @@ -16,10 +16,10 @@ $misc_array = array ( 'a', 'key' =>'d', 3, - ".001" =>-67, + ".001" =>-67, "-.051" =>"k", 0.091 =>"-.08", - "e" =>"5", + "e" =>"5", "y" =>NULL, NULL =>"", 0, @@ -39,11 +39,11 @@ $counter = 1; foreach($array_type as $type) { echo "-- Iteration $counter --\n"; //loose type checking - var_dump( array_search($type,$misc_array ) ); + var_dump( array_search($type,$misc_array ) ); //strict type checking - var_dump( array_search($type,$misc_array,true) ); + var_dump( array_search($type,$misc_array,true) ); //loose type checking - var_dump( array_search($type,$misc_array,false) ); + var_dump( array_search($type,$misc_array,false) ); $counter++; } diff --git a/ext/standard/tests/array/array_search_variation3.phpt b/ext/standard/tests/array/array_search_variation3.phpt index 8af089a72c..41b0b5bb20 100644 --- a/ext/standard/tests/array/array_search_variation3.phpt +++ b/ext/standard/tests/array/array_search_variation3.phpt @@ -11,7 +11,7 @@ Test array_search() function : usage variations - haystack as sub-array/object /* checking for sub-arrays with array_search() */ echo "*** Testing sub-arrays with array_search() ***\n"; $sub_array = array ( - "one", + "one", array(1, 2 => "two", "three" => 3), 4 => "four", "five" => 5, @@ -19,7 +19,7 @@ $sub_array = array ( ); var_dump( array_search("four", $sub_array) ); //checking for element in a sub-array -var_dump( array_search(3, $sub_array[1]) ); +var_dump( array_search(3, $sub_array[1]) ); var_dump( array_search(array('','i'), $sub_array) ); /* checking for objects in array_search() */ @@ -33,11 +33,11 @@ class array_search_check { $array_search_obj = new array_search_check(); //creating new object //error: as wrong datatype for second argument -var_dump( array_search("array_var", $array_search_obj) ); +var_dump( array_search("array_var", $array_search_obj) ); //error: as wrong datatype for second argument -var_dump( array_search("foo", $array_search_obj) ); +var_dump( array_search("foo", $array_search_obj) ); //element found as "one" exists in array $array_var -var_dump( array_search("one", $array_search_obj->array_var) ); +var_dump( array_search("one", $array_search_obj->array_var) ); echo "Done\n"; ?> diff --git a/ext/standard/tests/array/array_search_variation4.phpt b/ext/standard/tests/array/array_search_variation4.phpt index 95656899ce..2355008261 100644 --- a/ext/standard/tests/array/array_search_variation4.phpt +++ b/ext/standard/tests/array/array_search_variation4.phpt @@ -20,37 +20,37 @@ $dir_handle = opendir( dirname(__FILE__) ); $resources = array($file_handle, $dir_handle); // search for resouce type in the resource array -var_dump( array_search($file_handle, $resources, true) ); +var_dump( array_search($file_handle, $resources, true) ); //checking for (int) type resource -var_dump( array_search((int)$dir_handle, $resources, true) ); +var_dump( array_search((int)$dir_handle, $resources, true) ); /* Miscellenous input check */ echo "\n*** Testing miscelleneos inputs with array_search() ***\n"; //matching "Good" in array(0,"hello"), result:true in loose type check -var_dump( array_search("Good", array(0,"hello")) ); +var_dump( array_search("Good", array(0,"hello")) ); //false in strict mode -var_dump( array_search("Good", array(0,"hello"), TRUE) ); +var_dump( array_search("Good", array(0,"hello"), TRUE) ); //matching integer 0 in array("this"), result:true in loose type check -var_dump( array_search(0, array("this")) ); +var_dump( array_search(0, array("this")) ); // false in strict mode -var_dump( array_search(0, array("this")),TRUE ); +var_dump( array_search(0, array("this")),TRUE ); //matching string "this" in array(0), result:true in loose type check -var_dump( array_search("this", array(0)) ); +var_dump( array_search("this", array(0)) ); // false in stric mode -var_dump( array_search("this", array(0), TRUE) ); +var_dump( array_search("this", array(0), TRUE) ); //checking for type FALSE in multidimensional array with loose checking, result:false in loose type check var_dump( array_search(FALSE, array("a"=> TRUE, "b"=> TRUE, - array("c"=> TRUE, "d"=>TRUE) - ) - ) - ); + array("c"=> TRUE, "d"=>TRUE) + ) + ) + ); //matching string having integer in beginning, result:true in loose type check -var_dump( array_search('123abc', array(123)) ); +var_dump( array_search('123abc', array(123)) ); var_dump( array_search('123abc', array(123), TRUE) ); // false in strict mode echo "Done\n"; diff --git a/ext/standard/tests/array/array_shift_variation1.phpt b/ext/standard/tests/array/array_shift_variation1.phpt index cef9af8b8a..14615a1f61 100644 --- a/ext/standard/tests/array/array_shift_variation1.phpt +++ b/ext/standard/tests/array/array_shift_variation1.phpt @@ -58,7 +58,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -67,7 +67,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/standard/tests/array/array_shift_variation2.phpt b/ext/standard/tests/array/array_shift_variation2.phpt index 2b3adc605f..f1a2bc9bfc 100644 --- a/ext/standard/tests/array/array_shift_variation2.phpt +++ b/ext/standard/tests/array/array_shift_variation2.phpt @@ -67,13 +67,13 @@ $inputs = array( TRUE, FALSE, ), - + // empty data /*5*/ 'empty string' => array( "", '', ), - + /*6*/ 'empty array' => array( ), @@ -83,7 +83,7 @@ $inputs = array( 'string', $heredoc, ), - + // object data /*8*/ 'object' => array( new classA(), diff --git a/ext/standard/tests/array/array_shift_variation3.phpt b/ext/standard/tests/array/array_shift_variation3.phpt index d3a359fab8..303d295e12 100644 --- a/ext/standard/tests/array/array_shift_variation3.phpt +++ b/ext/standard/tests/array/array_shift_variation3.phpt @@ -39,7 +39,7 @@ $inputs = array( -10.5 => 'negative', .5 => 'half', ), - + /*3*/ 'extreme floats' => array( 12.3456789000e10 => 'large', 12.3456789000E-10 => 'small', @@ -49,7 +49,7 @@ $inputs = array( /*4*/ 'null uppercase' => array( NULL => 'null 1', ), - + /*5*/ 'null lowercase' => array( null => 'null 2', ), @@ -59,17 +59,17 @@ $inputs = array( true => 'lowert', false => 'lowerf', ), - + /*7*/ 'bool uppercase' => array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*8*/ 'empty double quotes' => array( "" => 'emptyd', ), - + /*9*/ 'empty single quotes' => array( '' => 'emptys', ), diff --git a/ext/standard/tests/array/array_slice_variation11.phpt b/ext/standard/tests/array/array_slice_variation11.phpt index 2e2bfc4fc0..54de5740dd 100644 --- a/ext/standard/tests/array/array_slice_variation11.phpt +++ b/ext/standard/tests/array/array_slice_variation11.phpt @@ -61,7 +61,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -71,7 +71,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/array/array_slice_variation2.phpt b/ext/standard/tests/array/array_slice_variation2.phpt index 1d3be8127d..0af0959989 100644 --- a/ext/standard/tests/array/array_slice_variation2.phpt +++ b/ext/standard/tests/array/array_slice_variation2.phpt @@ -63,7 +63,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', diff --git a/ext/standard/tests/array/array_slice_variation3.phpt b/ext/standard/tests/array/array_slice_variation3.phpt index 32bfc045c6..40deacabb7 100644 --- a/ext/standard/tests/array/array_slice_variation3.phpt +++ b/ext/standard/tests/array/array_slice_variation3.phpt @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', diff --git a/ext/standard/tests/array/array_slice_variation4.phpt b/ext/standard/tests/array/array_slice_variation4.phpt index 40bfad3332..90a1ac4a35 100644 --- a/ext/standard/tests/array/array_slice_variation4.phpt +++ b/ext/standard/tests/array/array_slice_variation4.phpt @@ -60,7 +60,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -70,7 +70,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/array/array_slice_variation7.phpt b/ext/standard/tests/array/array_slice_variation7.phpt index fd0bfd822d..96c8462df6 100644 --- a/ext/standard/tests/array/array_slice_variation7.phpt +++ b/ext/standard/tests/array/array_slice_variation7.phpt @@ -44,7 +44,7 @@ $inputs = array( -10.5 => 'negative', .5 => 'half', ), - + /*3*/ 'extreme floats' => array( 12.3456789000e6 => 'large', 12.3456789000E-10 => 'small', @@ -54,7 +54,7 @@ $inputs = array( /*4*/ 'null uppercase' => array( NULL => 'null 1', ), - + /*5*/ 'null lowercase' => array( null => 'null 2', ), @@ -64,17 +64,17 @@ $inputs = array( true => 'lowert', false => 'lowerf', ), - + /*7*/ 'bool uppercase' => array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*8*/ 'empty double quotes' => array( "" => 'emptyd', ), - + /*9*/ 'empty single quotes' => array( '' => 'emptys', ), diff --git a/ext/standard/tests/array/array_splice_basic.phpt b/ext/standard/tests/array/array_splice_basic.phpt index e96303d13a..9a96ccb362 100644 --- a/ext/standard/tests/array/array_splice_basic.phpt +++ b/ext/standard/tests/array/array_splice_basic.phpt @@ -2,10 +2,10 @@ Test array_splice(): basic functionality --FILE-- <?php -/* +/* * proto array array_splice(array input, int offset [, int length [, array replacement]]) * Function is implemented in ext/standard/array.c -*/ +*/ echo "*** Testing array_splice() basic operations ***\n"; echo "test truncation \n"; diff --git a/ext/standard/tests/array/array_splice_errors.phpt b/ext/standard/tests/array/array_splice_errors.phpt index bdcd9913cf..18148fbff2 100644 --- a/ext/standard/tests/array/array_splice_errors.phpt +++ b/ext/standard/tests/array/array_splice_errors.phpt @@ -2,10 +2,10 @@ Test array_splice() function : error conditions --FILE-- <?php -/* +/* * proto array array_splice(array input, int offset [, int length [, array replacement]]) * Function is implemented in ext/standard/array.c -*/ +*/ echo "\n*** Testing error conditions of array_splice() ***\n"; diff --git a/ext/standard/tests/array/array_splice_variation1.phpt b/ext/standard/tests/array/array_splice_variation1.phpt index 9ba94f6633..ecd6f67eb0 100644 --- a/ext/standard/tests/array/array_splice_variation1.phpt +++ b/ext/standard/tests/array/array_splice_variation1.phpt @@ -2,10 +2,10 @@ Test array_splice() function : usage variations - references --FILE-- <?php -/* +/* * proto array array_splice(array input, int offset [, int length [, array replacement]]) * Function is implemented in ext/standard/array.c -*/ +*/ echo "test behaviour when input array is in a reference set\n"; diff --git a/ext/standard/tests/array/array_splice_variation2.phpt b/ext/standard/tests/array/array_splice_variation2.phpt index 516339c7e8..42692918d1 100644 --- a/ext/standard/tests/array/array_splice_variation2.phpt +++ b/ext/standard/tests/array/array_splice_variation2.phpt @@ -2,10 +2,10 @@ Test array_splice() function : usage variations - additional parameters --FILE-- <?php -/* +/* * proto array array_splice(array input, int offset [, int length [, array replacement]]) * Function is implemented in ext/standard/array.c -*/ +*/ $array=array(0,1,2); var_dump (array_splice($array,1,1,3,4,5,6,7,8,9)); diff --git a/ext/standard/tests/array/array_splice_variation3.phpt b/ext/standard/tests/array/array_splice_variation3.phpt index 33ec80e5a8..9c1a7c86ab 100644 --- a/ext/standard/tests/array/array_splice_variation3.phpt +++ b/ext/standard/tests/array/array_splice_variation3.phpt @@ -2,10 +2,10 @@ Test array_splice() function : usage variations - lengths and offsets --FILE-- <?php -/* +/* * proto array array_splice(array input, int offset [, int length [, array replacement]]) * Function is implemented in ext/standard/array.c -*/ +*/ echo "*** array_splice() function : usage variations - lengths and offsets\n"; diff --git a/ext/standard/tests/array/array_splice_variation4.phpt b/ext/standard/tests/array/array_splice_variation4.phpt index d1cc501c6b..ddd966780e 100644 --- a/ext/standard/tests/array/array_splice_variation4.phpt +++ b/ext/standard/tests/array/array_splice_variation4.phpt @@ -2,10 +2,10 @@ Test array_splice() function : usage variations - non array replacement values --FILE-- <?php -/* +/* * proto array array_splice(array input, int offset [, int length [, array replacement]]) * Function is implemented in ext/standard/array.c -*/ +*/ function test_splice ($replacement) { diff --git a/ext/standard/tests/array/array_sum_variation1.phpt b/ext/standard/tests/array/array_sum_variation1.phpt index 55b249616a..c795c2acd1 100644 --- a/ext/standard/tests/array/array_sum_variation1.phpt +++ b/ext/standard/tests/array/array_sum_variation1.phpt @@ -8,7 +8,7 @@ Test array_sum() function : usage variations - unexpected values for 'input' arg */ /* -* Passing different scalar/nonscalar values as 'input' argument to array_sum() +* Passing different scalar/nonscalar values as 'input' argument to array_sum() */ echo "*** Testing array_sum() : unexpected values for 'input' ***\n"; diff --git a/ext/standard/tests/array/array_sum_variation3.phpt b/ext/standard/tests/array/array_sum_variation3.phpt index 7f1a756bec..25b565cd26 100644 --- a/ext/standard/tests/array/array_sum_variation3.phpt +++ b/ext/standard/tests/array/array_sum_variation3.phpt @@ -26,7 +26,7 @@ $float_input = array( 1.2E2, 23.4E3, -4.1E2, 0.2E2, 2.1E-2, .5E3); var_dump( array_sum($float_input) ); // Mixed float array -$float_input = array( +$float_input = array( 1.2, 0.5 -5.8, @@ -39,7 +39,7 @@ $float_input = array( ); echo "-- Mixed float array --\n"; var_dump( array_sum($float_input) ); - + echo "Done" ?> --EXPECT-- diff --git a/ext/standard/tests/array/array_udiff_assoc_error.phpt b/ext/standard/tests/array/array_udiff_assoc_error.phpt index ec1cc062ed..eec33b0530 100644 --- a/ext/standard/tests/array/array_udiff_assoc_error.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_error.phpt @@ -5,7 +5,7 @@ Test array_udiff_assoc() function : error conditions /* Prototype : array array_udiff_assoc(array arr1, array arr2 [, array ...], callback key_comp_func) * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff_assoc() : error conditions ***\n"; diff --git a/ext/standard/tests/array/array_udiff_assoc_variation.phpt b/ext/standard/tests/array/array_udiff_assoc_variation.phpt index f824244f6f..c813e9383b 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation.phpt @@ -5,7 +5,7 @@ Test array_udiff_assoc() function : variation /* Prototype : array array_udiff_assoc(array arr1, array arr2 [, array ...], callback key_comp_func) * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff_assoc() : variation - testing with multiple array arguments ***\n"; diff --git a/ext/standard/tests/array/array_udiff_assoc_variation1.phpt b/ext/standard/tests/array/array_udiff_assoc_variation1.phpt index 108d2a3ff0..44b78a75f1 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation1.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation1.phpt @@ -5,7 +5,7 @@ Test array_udiff_assoc() function : usage variation /* Prototype : array array_udiff_assoc(array arr1, array arr2 [, array ...], callback key_comp_func) * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff_assoc() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_udiff_assoc_variation2.phpt b/ext/standard/tests/array/array_udiff_assoc_variation2.phpt index d022a4e82f..bdc0b01596 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation2.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation2.phpt @@ -5,7 +5,7 @@ Test array_udiff_assoc() function : usage variation /* Prototype : array array_udiff_assoc(array arr1, array arr2 [, array ...], callback key_comp_func) * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff_assoc() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_udiff_assoc_variation3.phpt b/ext/standard/tests/array/array_udiff_assoc_variation3.phpt index e693afff87..324aacbca3 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation3.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation3.phpt @@ -5,7 +5,7 @@ Test array_udiff_assoc() function : usage variation /* Prototype : array array_udiff_assoc(array arr1, array arr2 [, array ...], callback key_comp_func) * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff_assoc() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_udiff_assoc_variation4.phpt b/ext/standard/tests/array/array_udiff_assoc_variation4.phpt index c5634dbcd7..bcd748fe01 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation4.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation4.phpt @@ -5,7 +5,7 @@ Test array_udiff_assoc() function : usage variation /* Prototype : array array_udiff_assoc(array arr1, array arr2 [, array ...], callback key_comp_func) * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff_assoc() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_udiff_assoc_variation5.phpt b/ext/standard/tests/array/array_udiff_assoc_variation5.phpt index 5eb21cd723..680f65c6cf 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation5.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation5.phpt @@ -5,7 +5,7 @@ Test array_udiff_assoc() function : usage variation - incorrect comparison funct /* Prototype : array array_udiff_assoc(array arr1, array arr2 [, array ...], callback key_comp_func) * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ diff --git a/ext/standard/tests/array/array_udiff_error.phpt b/ext/standard/tests/array/array_udiff_error.phpt index dc9657756e..c3063d3046 100644 --- a/ext/standard/tests/array/array_udiff_error.phpt +++ b/ext/standard/tests/array/array_udiff_error.phpt @@ -5,7 +5,7 @@ Test array_udiff() function : error conditions /* Prototype : array array_udiff(array arr1, array arr2 [, array ...], callback data_comp_func) * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff() : error conditions ***\n"; diff --git a/ext/standard/tests/array/array_udiff_uassoc_error.phpt b/ext/standard/tests/array/array_udiff_uassoc_error.phpt index e7d27e65db..c157a53946 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_error.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_error.phpt @@ -5,7 +5,7 @@ Test array_udiff_uassoc() function : error conditions /* Prototype : array array_udiff_uassoc(array arr1, array arr2 [, array ...], callback data_comp_func, callback key_comp_func) * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff_uassoc() : error conditions ***\n"; diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt index e55a600e48..8773f6c4ff 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt @@ -5,7 +5,7 @@ Test array_udiff_uassoc() function : usage variation /* Prototype : array array_udiff_uassoc(array arr1, array arr2 [, array ...], callback data_comp_func, callback key_comp_func) * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff_uassoc() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt index 73edbfe0bb..2cc56ba057 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt @@ -5,7 +5,7 @@ Test array_udiff_uassoc() function : usage variation /* Prototype : array array_udiff_uassoc(array arr1, array arr2 [, array ...], callback data_comp_func, callback key_comp_func) * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff_uassoc() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation3.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation3.phpt index 76afda098b..7096451e8a 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation3.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation3.phpt @@ -5,7 +5,7 @@ Test array_udiff_uassoc() function : usage variation /* Prototype : array array_udiff_uassoc(array arr1, array arr2 [, array ...], callback data_comp_func, callback key_comp_func) * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff_uassoc() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation4.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation4.phpt index 0beb15ff77..31d14a5120 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation4.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation4.phpt @@ -5,7 +5,7 @@ Test array_udiff_uassoc() function : usage variation /* Prototype : array array_udiff_uassoc(array arr1, array arr2 [, array ...], callback data_comp_func, callback key_comp_func) * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff_uassoc() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation5.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation5.phpt index f78261a1eb..12a2f32ecf 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation5.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation5.phpt @@ -5,7 +5,7 @@ Test array_udiff_uassoc() function : usage variation /* Prototype : array array_udiff_uassoc(array arr1, array arr2 [, array ...], callback data_comp_func, callback key_comp_func) * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff_uassoc() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt index f8ca5300ca..39def47e24 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt @@ -5,7 +5,7 @@ Test array_udiff_uassoc() function : usage variation /* Prototype : array array_udiff_uassoc(array arr1, array arr2 [, array ...], callback data_comp_func, callback key_comp_func) * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff_uassoc() : usage variation - differing comparison functions***\n"; diff --git a/ext/standard/tests/array/array_udiff_variation1.phpt b/ext/standard/tests/array/array_udiff_variation1.phpt index b32324a2dd..02db27173c 100644 --- a/ext/standard/tests/array/array_udiff_variation1.phpt +++ b/ext/standard/tests/array/array_udiff_variation1.phpt @@ -5,7 +5,7 @@ Test array_udiff() function : usage variation /* Prototype : array array_udiff(array arr1, array arr2 [, array ...], callback data_comp_func) * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_udiff_variation2.phpt b/ext/standard/tests/array/array_udiff_variation2.phpt index 4281ffcd18..c58822feaa 100644 --- a/ext/standard/tests/array/array_udiff_variation2.phpt +++ b/ext/standard/tests/array/array_udiff_variation2.phpt @@ -5,7 +5,7 @@ Test array_udiff() function : usage variation /* Prototype : array array_udiff(array arr1, array arr2 [, array ...], callback data_comp_func) * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_udiff_variation3.phpt b/ext/standard/tests/array/array_udiff_variation3.phpt index aeeee89bf1..1f5532ee06 100644 --- a/ext/standard/tests/array/array_udiff_variation3.phpt +++ b/ext/standard/tests/array/array_udiff_variation3.phpt @@ -5,7 +5,7 @@ Test array_udiff() function : usage variation /* Prototype : array array_udiff(array arr1, array arr2 [, array ...], callback data_comp_func) * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_udiff_variation4.phpt b/ext/standard/tests/array/array_udiff_variation4.phpt index 1048c82cc1..d46ca719bb 100644 --- a/ext/standard/tests/array/array_udiff_variation4.phpt +++ b/ext/standard/tests/array/array_udiff_variation4.phpt @@ -5,7 +5,7 @@ Test array_udiff() function : usage variation /* Prototype : array array_udiff(array arr1, array arr2 [, array ...], callback data_comp_func) * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_udiff_variation5.phpt b/ext/standard/tests/array/array_udiff_variation5.phpt index a391cb4eb6..76f8a29135 100644 --- a/ext/standard/tests/array/array_udiff_variation5.phpt +++ b/ext/standard/tests/array/array_udiff_variation5.phpt @@ -5,7 +5,7 @@ Test array_udiff() function : usage variation /* Prototype : array array_udiff(array arr1, array arr2 [, array ...], callback data_comp_func) * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt b/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt index 076dbf16fb..b9837e7954 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt @@ -5,7 +5,7 @@ Test array_uintersect_assoc() function : basic functionality - testing with mult /* Prototype : array array_uintersect_assoc(array arr1, array arr2 [, array ...], callback data_compare_func) * Description: U * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_assoc() : basic functionality - testing with multiple array arguments ***\n"; diff --git a/ext/standard/tests/array/array_uintersect_assoc_error.phpt b/ext/standard/tests/array/array_uintersect_assoc_error.phpt index 73fc61e397..fd491622f1 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_error.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_error.phpt @@ -5,7 +5,7 @@ Test array_uintersect_assoc() function : error conditions /* Prototype : array array_uintersect_assoc(array arr1, array arr2 [, array ...], callback data_compare_func) * Description: U * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_assoc() : error conditions ***\n"; diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt index 634d036464..c94d8f744f 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt @@ -5,7 +5,7 @@ Test array_uintersect_assoc() function : usage variation /* Prototype : array array_uintersect_assoc(array arr1, array arr2 [, array ...], callback data_compare_func) * Description: U * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_assoc() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt index eed4afa6be..97b88c1b0f 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt @@ -5,7 +5,7 @@ Test array_uintersect_assoc() function : usage variation /* Prototype : array array_uintersect_assoc(array arr1, array arr2 [, array ...], callback data_compare_func) * Description: U * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_assoc() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation3.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation3.phpt index a76fca0f5c..aabd8a68df 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation3.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation3.phpt @@ -5,7 +5,7 @@ Test array_uintersect_assoc() function : usage variation /* Prototype : array array_uintersect_assoc(array arr1, array arr2 [, array ...], callback data_compare_func) * Description: U * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_assoc() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation4.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation4.phpt index 0c8973f084..dca5b9d5f0 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation4.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation4.phpt @@ -5,7 +5,7 @@ Test array_uintersect_assoc() function : usage variation /* Prototype : array array_uintersect_assoc(array arr1, array arr2 [, array ...], callback data_compare_func) * Description: U * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_assoc() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt index 802934b37d..e7f5f6d725 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt @@ -5,7 +5,7 @@ Test array_uintersect_assoc() function : usage variation - differing comparison /* Prototype : array array_uintersect_assoc(array arr1, array arr2 [, array ...], callback data_compare_func) * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_assoc() : usage variation - differing comparison functions***\n"; diff --git a/ext/standard/tests/array/array_uintersect_error.phpt b/ext/standard/tests/array/array_uintersect_error.phpt index 1b25db4345..230247e52d 100644 --- a/ext/standard/tests/array/array_uintersect_error.phpt +++ b/ext/standard/tests/array/array_uintersect_error.phpt @@ -5,7 +5,7 @@ Test array_uintersect() function : error conditions /* Prototype : array array_uintersect(array arr1, array arr2 [, array ...], callback data_compare_func) * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect() : error conditions ***\n"; diff --git a/ext/standard/tests/array/array_uintersect_uassoc_error.phpt b/ext/standard/tests/array/array_uintersect_uassoc_error.phpt index c7391eeda9..b10de85f88 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_error.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_error.phpt @@ -5,7 +5,7 @@ Test array_uintersect_uassoc() function : error conditions /* Prototype : array array_uintersect_uassoc(array arr1, array arr2 [, array ...], callback data_compare_func, callback key_compare_func) * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_uassoc() : error conditions ***\n"; diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt index de0f4ebeb5..1a6d501bce 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt @@ -5,7 +5,7 @@ Test array_uintersect_uassoc() function : usage variation /* Prototype : array array_uintersect_uassoc(array arr1, array arr2 [, array ...], callback data_compare_func, callback key_compare_func) * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_uassoc() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt index ffe8ccfd9a..1279428982 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt @@ -5,7 +5,7 @@ Test array_uintersect_uassoc() function : usage variation /* Prototype : array array_uintersect_uassoc(array arr1, array arr2 [, array ...], callback data_compare_func, callback key_compare_func) * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_uassoc() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation3.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation3.phpt index 860a1661a6..87991b532e 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation3.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation3.phpt @@ -5,7 +5,7 @@ Test array_uintersect_uassoc() function : usage variation /* Prototype : array array_uintersect_uassoc(array arr1, array arr2 [, array ...], callback data_compare_func, callback key_compare_func) * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_uassoc() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation4.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation4.phpt index a3963184c3..ed563ca499 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation4.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation4.phpt @@ -5,7 +5,7 @@ Test array_uintersect_uassoc() function : usage variation /* Prototype : array array_uintersect_uassoc(array arr1, array arr2 [, array ...], callback data_compare_func, callback key_compare_func) * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_uassoc() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation5.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation5.phpt index 432f1c5a44..4f0c361287 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation5.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation5.phpt @@ -5,7 +5,7 @@ Test array_uintersect_uassoc() function : usage variation /* Prototype : array array_uintersect_uassoc(array arr1, array arr2 [, array ...], callback data_compare_func, callback key_compare_func) * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_uassoc() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt index 782821f4a7..e8f7974577 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt @@ -5,7 +5,7 @@ Test array_uintersect_uassoc() function : usage variation - incorrect callbacks /* Prototype : array array_uintersect_uassoc(array arr1, array arr2 [, array ...], callback data_compare_func, callback key_compare_func) * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_uassoc() : usage variation - incorrect callbacks ***\n"; diff --git a/ext/standard/tests/array/array_uintersect_variation1.phpt b/ext/standard/tests/array/array_uintersect_variation1.phpt index c26ace67df..0c5f406b1e 100644 --- a/ext/standard/tests/array/array_uintersect_variation1.phpt +++ b/ext/standard/tests/array/array_uintersect_variation1.phpt @@ -5,7 +5,7 @@ Test array_uintersect() function : usage variation /* Prototype : array array_uintersect(array arr1, array arr2 [, array ...], callback data_compare_func) * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_uintersect_variation2.phpt b/ext/standard/tests/array/array_uintersect_variation2.phpt index ed34d69a1c..6ce6ca0306 100644 --- a/ext/standard/tests/array/array_uintersect_variation2.phpt +++ b/ext/standard/tests/array/array_uintersect_variation2.phpt @@ -5,7 +5,7 @@ Test array_uintersect() function : usage variation /* Prototype : array array_uintersect(array arr1, array arr2 [, array ...], callback data_compare_func) * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_uintersect_variation3.phpt b/ext/standard/tests/array/array_uintersect_variation3.phpt index 707ba113c8..8cc9598e57 100644 --- a/ext/standard/tests/array/array_uintersect_variation3.phpt +++ b/ext/standard/tests/array/array_uintersect_variation3.phpt @@ -5,7 +5,7 @@ Test array_uintersect() function : usage variation /* Prototype : array array_uintersect(array arr1, array arr2 [, array ...], callback data_compare_func) * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_uintersect_variation4.phpt b/ext/standard/tests/array/array_uintersect_variation4.phpt index 7ecf7a6395..0c189fd765 100644 --- a/ext/standard/tests/array/array_uintersect_variation4.phpt +++ b/ext/standard/tests/array/array_uintersect_variation4.phpt @@ -5,7 +5,7 @@ Test array_uintersect() function : usage variation /* Prototype : array array_uintersect(array arr1, array arr2 [, array ...], callback data_compare_func) * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_uintersect_variation5.phpt b/ext/standard/tests/array/array_uintersect_variation5.phpt index 04051dbf5e..9c41db3acd 100644 --- a/ext/standard/tests/array/array_uintersect_variation5.phpt +++ b/ext/standard/tests/array/array_uintersect_variation5.phpt @@ -5,7 +5,7 @@ Test array_uintersect() function : usage variation - differing comparison functi /* Prototype : array array_uintersect(array arr1, array arr2 [, array ...], callback data_compare_func) * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect() : usage variation - differing comparison functions***\n"; diff --git a/ext/standard/tests/array/array_unique_variation2.phpt b/ext/standard/tests/array/array_unique_variation2.phpt index 470cd284d0..176017c86a 100644 --- a/ext/standard/tests/array/array_unique_variation2.phpt +++ b/ext/standard/tests/array/array_unique_variation2.phpt @@ -77,7 +77,7 @@ foreach($inputs as $input) { var_dump( array_unique($input, SORT_STRING) ); $iterator++; } - + echo "Done"; ?> --EXPECT-- diff --git a/ext/standard/tests/array/array_unique_variation3.phpt b/ext/standard/tests/array/array_unique_variation3.phpt index 49103c8154..4d82e5f71d 100644 --- a/ext/standard/tests/array/array_unique_variation3.phpt +++ b/ext/standard/tests/array/array_unique_variation3.phpt @@ -62,7 +62,7 @@ foreach($inputs as $input) { } fclose($fp); - + echo "Done"; ?> --EXPECTF-- diff --git a/ext/standard/tests/array/array_unique_variation4.phpt b/ext/standard/tests/array/array_unique_variation4.phpt index a1fc13e94d..8a6392fb9c 100644 --- a/ext/standard/tests/array/array_unique_variation4.phpt +++ b/ext/standard/tests/array/array_unique_variation4.phpt @@ -62,7 +62,7 @@ foreach($inputs as $input) { } fclose($fp); - + echo "Done"; ?> --EXPECTF-- diff --git a/ext/standard/tests/array/array_unique_variation8.phpt b/ext/standard/tests/array/array_unique_variation8.phpt index 8b67adfbab..b2b2c5556c 100644 --- a/ext/standard/tests/array/array_unique_variation8.phpt +++ b/ext/standard/tests/array/array_unique_variation8.phpt @@ -15,7 +15,7 @@ Test array_unique() function : usage variations - two dimensional arrays echo "*** Testing array_unique() : two dimensional array for \$input argument ***\n"; // initialize the 2-d array -$input = array( +$input = array( array(1, 2, 3, 1), array("hello", "world", "str1" => "hello", "str2" => 'world'), array(1 => "one", 2 => "two", "one", 'two'), diff --git a/ext/standard/tests/array/array_unshift.phpt b/ext/standard/tests/array/array_unshift.phpt index ebcf19041f..9b474277a9 100644 --- a/ext/standard/tests/array/array_unshift.phpt +++ b/ext/standard/tests/array/array_unshift.phpt @@ -14,7 +14,7 @@ var_dump($a); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(1) array(1) { [0]=> diff --git a/ext/standard/tests/array/array_unshift_basic1.phpt b/ext/standard/tests/array/array_unshift_basic1.phpt index c041a47756..9427a1cb24 100644 --- a/ext/standard/tests/array/array_unshift_basic1.phpt +++ b/ext/standard/tests/array/array_unshift_basic1.phpt @@ -7,7 +7,7 @@ Test array_unshift() function : basic functionality - array with default keys fo * Source code: ext/standard/array.c */ -/* +/* * Testing array_unshift() by giving array with default keys for $array argument */ diff --git a/ext/standard/tests/array/array_unshift_basic2.phpt b/ext/standard/tests/array/array_unshift_basic2.phpt index eec6412042..4be6b8d1e5 100644 --- a/ext/standard/tests/array/array_unshift_basic2.phpt +++ b/ext/standard/tests/array/array_unshift_basic2.phpt @@ -7,7 +7,7 @@ Test array_unshift() function : basic functionality - associative arrays for 'ar * Source code: ext/standard/array.c */ -/* +/* * Testing array_unshift() by giving associative arrays for $array argument */ diff --git a/ext/standard/tests/array/array_unshift_variation2.phpt b/ext/standard/tests/array/array_unshift_variation2.phpt index 064309b53f..c8073ecaa1 100644 --- a/ext/standard/tests/array/array_unshift_variation2.phpt +++ b/ext/standard/tests/array/array_unshift_variation2.phpt @@ -44,7 +44,7 @@ $vars = array( 1, 12345, -2345, - + // float data /*5*/ 10.5, -10.5, @@ -58,7 +58,7 @@ $vars = array( array(1), array(1, 2), array('color' => 'red', 'item' => 'pen'), - + // null data /*15*/ NULL, null, @@ -68,7 +68,7 @@ $vars = array( false, TRUE, FALSE, - + // empty data /*21*/ "", '', @@ -86,7 +86,7 @@ $vars = array( // unset data @$unset_var, - + // resource variable /*29*/ $fp ); @@ -103,7 +103,7 @@ foreach($vars as $var) { var_dump( array_unshift($temp_array, $var) ); // dump the resulting array - var_dump($temp_array); + var_dump($temp_array); /* with optional arguments */ // returns element count in the resulting array after arguments are pushed to diff --git a/ext/standard/tests/array/array_unshift_variation4.phpt b/ext/standard/tests/array/array_unshift_variation4.phpt index 25c9159a11..d3f901d1f0 100644 --- a/ext/standard/tests/array/array_unshift_variation4.phpt +++ b/ext/standard/tests/array/array_unshift_variation4.phpt @@ -52,13 +52,13 @@ $arrays = array ( // arrays with float keys /*5*/ array(2.3333 => "float"), array(1.2 => "f1", 3.33 => "f2", - 4.89999922839999 => "f3", + 4.89999922839999 => "f3", 33333333.333333 => "f4"), // arrays with string keys /*7*/ array('\tHello' => 111, 're\td' => "color", '\v\fworld' => 2.2, 'pen\n' => 33), - array("\tHello" => 111, "re\td" => "color", + array("\tHello" => 111, "re\td" => "color", "\v\fworld" => 2.2, "pen\n" => 33), array("hello", $heredoc => "string"), // heredoc diff --git a/ext/standard/tests/array/array_unshift_variation5.phpt b/ext/standard/tests/array/array_unshift_variation5.phpt index 7f083694af..48f12e9dc8 100644 --- a/ext/standard/tests/array/array_unshift_variation5.phpt +++ b/ext/standard/tests/array/array_unshift_variation5.phpt @@ -2,7 +2,7 @@ Test array_unshift() function : usage variations - assoc. array with diff values for 'array' argument --INI-- precision=12 ---FILE-- +--FILE-- <?php /* Prototype : int array_unshift(array $array, mixed $var [, mixed ...]) * Description: Pushes elements onto the beginning of the array @@ -14,11 +14,11 @@ precision=12 * associative arrays having different possible values to $array argument. * The $var argument passed is a fixed value */ - + echo "*** Testing array_unshift() : associative array with different values ***\n"; // get an unset variable -$unset_var = 10; +$unset_var = 10; unset ($unset_var); // get a resource variable diff --git a/ext/standard/tests/array/array_unshift_variation7.phpt b/ext/standard/tests/array/array_unshift_variation7.phpt index a54e2ce9f5..e41d4bdced 100644 --- a/ext/standard/tests/array/array_unshift_variation7.phpt +++ b/ext/standard/tests/array/array_unshift_variation7.phpt @@ -37,7 +37,7 @@ foreach($vars as $var) { // returns element count in the resulting array after arguments are pushed to // beginning of the given array var_dump( array_unshift($temp_array, $var) ); - + // dump the resulting array var_dump($temp_array); @@ -46,7 +46,7 @@ foreach($vars as $var) { // beginning of the given array $temp_array = $array; var_dump( array_unshift($temp_array, $var, "hello", 'world') ); - + // dump the resulting array var_dump($temp_array); $iterator++; diff --git a/ext/standard/tests/array/array_unshift_variation8.phpt b/ext/standard/tests/array/array_unshift_variation8.phpt index a184ec44c2..7a9f9720c1 100644 --- a/ext/standard/tests/array/array_unshift_variation8.phpt +++ b/ext/standard/tests/array/array_unshift_variation8.phpt @@ -32,12 +32,12 @@ $iterator = 1; foreach($vars as $var) { echo "-- Iteration $iterator --\n"; $temp_array = $array; // assign $array to another temporary $temp_array - + /* with default argument */ // returns element count in the resulting array after arguments are pushed to // beginning of the given array var_dump( array_unshift($temp_array, $var) ); - + // dump the resulting array var_dump($temp_array); diff --git a/ext/standard/tests/array/array_unshift_variation9.phpt b/ext/standard/tests/array/array_unshift_variation9.phpt index 89d867df92..f4c57351ed 100644 --- a/ext/standard/tests/array/array_unshift_variation9.phpt +++ b/ext/standard/tests/array/array_unshift_variation9.phpt @@ -18,13 +18,13 @@ echo "*** Testing array_unshift() : heredoc strings for \$var argument ***\n"; // heredoc with empty value $empty_string = <<<EOT EOT; - + // heredoc with blank line $blank_line = <<<EOT EOT; - + // heredoc with multiline string $multiline_string = <<<EOT hello world @@ -77,7 +77,7 @@ foreach($vars as $var) { // returns element count in the resulting array after arguments are pushed to // beginning of the given array var_dump( array_unshift($temp_array, $var) ); - + // dump the resulting array var_dump($temp_array); @@ -86,7 +86,7 @@ foreach($vars as $var) { // beginning of the given array $temp_array = $array; var_dump( array_unshift($temp_array, $var, "hello", 'world') ); - + // dump the resulting array var_dump($temp_array); $iterator++; diff --git a/ext/standard/tests/array/array_values_errors.phpt b/ext/standard/tests/array/array_values_errors.phpt index 82e5e04956..4f723c2b3b 100644 --- a/ext/standard/tests/array/array_values_errors.phpt +++ b/ext/standard/tests/array/array_values_errors.phpt @@ -16,7 +16,7 @@ var_dump( array_values(new stdclass) ); // object echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- *** Testing error conditions *** Warning: array_values() expects exactly 1 parameter, 0 given in %s on line %d diff --git a/ext/standard/tests/array/array_values_variation.phpt b/ext/standard/tests/array/array_values_variation.phpt index 15da1a621e..15eb77dac0 100644 --- a/ext/standard/tests/array/array_values_variation.phpt +++ b/ext/standard/tests/array/array_values_variation.phpt @@ -19,8 +19,8 @@ var_dump( array_values($arr_resource) ); echo "\n*** Testing array_values() with range checking ***\n"; $arr_range = array( - 2147483647, - 2147483648, + 2147483647, + 2147483648, -2147483647, -2147483648, -0, @@ -35,7 +35,7 @@ var_dump( array_values(array()) ); // null array echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- *** Testing array_values() with resource type *** array(2) { [0]=> diff --git a/ext/standard/tests/array/array_values_variation1.phpt b/ext/standard/tests/array/array_values_variation1.phpt index ba6649695d..19b2fb73fa 100644 --- a/ext/standard/tests/array/array_values_variation1.phpt +++ b/ext/standard/tests/array/array_values_variation1.phpt @@ -58,7 +58,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -68,7 +68,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/array/array_values_variation2.phpt b/ext/standard/tests/array/array_values_variation2.phpt index c7e9ad3f71..b939354da5 100644 --- a/ext/standard/tests/array/array_values_variation2.phpt +++ b/ext/standard/tests/array/array_values_variation2.phpt @@ -66,13 +66,13 @@ $inputs = array( TRUE, FALSE, ), - + // empty data /*5*/ 'empty string' => array( "", '', ), - + /*6*/ 'empty array' => array( ), @@ -82,7 +82,7 @@ $inputs = array( 'string', $heredoc, ), - + // object data /*8*/ 'object' => array( new classA(), diff --git a/ext/standard/tests/array/array_values_variation3.phpt b/ext/standard/tests/array/array_values_variation3.phpt index d036cfdebe..69359b409c 100644 --- a/ext/standard/tests/array/array_values_variation3.phpt +++ b/ext/standard/tests/array/array_values_variation3.phpt @@ -40,7 +40,7 @@ $inputs = array( -10.5 => 'negative', .5 => 'half', ), - + /*3*/ 'extreme floats' => array( 12.3456789000e10 => 'large', 12.3456789000E-10 => 'small', @@ -50,7 +50,7 @@ $inputs = array( /*4*/ 'null uppercase' => array( NULL => 'null 1', ), - + /*5*/ 'null lowercase' => array( null => 'null 2', ), @@ -60,17 +60,17 @@ $inputs = array( true => 'lowert', false => 'lowerf', ), - + /*7*/ 'bool uppercase' => array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*8*/ 'empty double quotes' => array( "" => 'emptyd', ), - + /*9*/ 'empty single quotes' => array( '' => 'emptys', ), diff --git a/ext/standard/tests/array/array_values_variation_64bit.phpt b/ext/standard/tests/array/array_values_variation_64bit.phpt index 8b1e2c0b0e..066d35da84 100644 --- a/ext/standard/tests/array/array_values_variation_64bit.phpt +++ b/ext/standard/tests/array/array_values_variation_64bit.phpt @@ -19,8 +19,8 @@ var_dump( array_values($arr_resource) ); echo "\n*** Testing array_values() with range checking ***\n"; $arr_range = array( - 2147483647, - 2147483648, + 2147483647, + 2147483648, -2147483647, -2147483648, -0, @@ -34,7 +34,7 @@ var_dump( array_values(array(1,2,3)) ); var_dump( array_values(array()) ); // null array ?> ---EXPECTF-- +--EXPECTF-- *** Testing array_values() with resource type *** array(2) { [0]=> diff --git a/ext/standard/tests/array/array_walk.phpt b/ext/standard/tests/array/array_walk.phpt index d3ef3750b0..7cd8a8cf7a 100644 --- a/ext/standard/tests/array/array_walk.phpt +++ b/ext/standard/tests/array/array_walk.phpt @@ -30,7 +30,7 @@ try { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: array_walk() expects at least 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/array/array_walk_basic2.phpt b/ext/standard/tests/array/array_walk_basic2.phpt index 3ef15605e7..b1412f4b97 100644 --- a/ext/standard/tests/array/array_walk_basic2.phpt +++ b/ext/standard/tests/array/array_walk_basic2.phpt @@ -18,7 +18,7 @@ $fruits = array("d" => "lemon", "a" => "orange", "b" => "banana", "c" => "apple" * key - key in key/value pair * prefix - string to be added * Description : alters the array values by appending prefix string - */ + */ function test_alter(&$item, $key, $prefix) { // dump the arguments to check that they are passed diff --git a/ext/standard/tests/array/array_walk_closure.phpt b/ext/standard/tests/array/array_walk_closure.phpt index 846e8a01af..0a5d854582 100644 --- a/ext/standard/tests/array/array_walk_closure.phpt +++ b/ext/standard/tests/array/array_walk_closure.phpt @@ -93,7 +93,7 @@ try { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: array_walk() expects at least 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/array/array_walk_error2.phpt b/ext/standard/tests/array/array_walk_error2.phpt index fd3cbf5037..e39320d1ec 100644 --- a/ext/standard/tests/array/array_walk_error2.phpt +++ b/ext/standard/tests/array/array_walk_error2.phpt @@ -35,12 +35,12 @@ try { // expected: Warning is suppressed try { - var_dump( @array_walk($input, "callback1") ); + var_dump( @array_walk($input, "callback1") ); } catch (Throwable $e) { echo "Exception: " . $e->getMessage() . "\n"; } try { - var_dump( @array_walk($input, "callback2", 4) ); + var_dump( @array_walk($input, "callback2", 4) ); } catch (Throwable $e) { echo "Exception: " . $e->getMessage() . "\n"; } diff --git a/ext/standard/tests/array/array_walk_object1.phpt b/ext/standard/tests/array/array_walk_object1.phpt index 3bd83fdab2..fe51143a60 100644 --- a/ext/standard/tests/array/array_walk_object1.phpt +++ b/ext/standard/tests/array/array_walk_object1.phpt @@ -40,10 +40,10 @@ class MyClass $this->pub_value = $setVal; $this->pro_value = $setVal; } -}; +}; // object for 'input' argument -$input = new MyClass(10); +$input = new MyClass(10); var_dump( array_walk($input, "callback", 1)); diff --git a/ext/standard/tests/array/array_walk_object2.phpt b/ext/standard/tests/array/array_walk_object2.phpt index 97606a6592..1be79f7241 100644 --- a/ext/standard/tests/array/array_walk_object2.phpt +++ b/ext/standard/tests/array/array_walk_object2.phpt @@ -21,7 +21,7 @@ echo "*** Testing array_walk() : array of objects ***\n"; * Description : Function adds the addvalue to each element of an array */ function callback_private($value, $key, $addValue) -{ +{ echo "value : "; var_dump($value->getValue()); echo "key : "; @@ -58,7 +58,7 @@ class MyClass { return $this->pro_value; } -}; +}; // array containing objects of MyClass $input = array ( @@ -73,7 +73,7 @@ var_dump( array_walk($input, "callback_private", 1)); echo "-- For public member --\n"; var_dump( array_walk($input, "callback_public")); echo "-- For protected member --\n"; -var_dump( array_walk($input, "callback_protected")); +var_dump( array_walk($input, "callback_protected")); echo "Done" ?> diff --git a/ext/standard/tests/array/array_walk_objects.phpt b/ext/standard/tests/array/array_walk_objects.phpt index f9214d25a5..fc04304fc5 100644 --- a/ext/standard/tests/array/array_walk_objects.phpt +++ b/ext/standard/tests/array/array_walk_objects.phpt @@ -3,8 +3,8 @@ array_walk() and objects --FILE-- <?php -function walk($key, $value) { - var_dump($value, $key); +function walk($key, $value) { + var_dump($value, $key); } class test { @@ -28,7 +28,7 @@ array_walk($var, "walk"); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(3) "foo" string(3) "foo" string(3) "bar" diff --git a/ext/standard/tests/array/array_walk_rec_objects.phpt b/ext/standard/tests/array/array_walk_rec_objects.phpt index d2fa9b86eb..a83c227a3b 100644 --- a/ext/standard/tests/array/array_walk_rec_objects.phpt +++ b/ext/standard/tests/array/array_walk_rec_objects.phpt @@ -3,8 +3,8 @@ array_walk_recursive() and objects --FILE-- <?php -function walk($key, $value) { - var_dump($value, $key); +function walk($key, $value) { + var_dump($value, $key); } class test { @@ -28,7 +28,7 @@ array_walk_recursive($var, "walk"); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(3) "foo" string(3) "foo" string(3) "bar" diff --git a/ext/standard/tests/array/array_walk_recursive1.phpt b/ext/standard/tests/array/array_walk_recursive1.phpt index 07f09c5263..962f133e4c 100644 --- a/ext/standard/tests/array/array_walk_recursive1.phpt +++ b/ext/standard/tests/array/array_walk_recursive1.phpt @@ -30,7 +30,7 @@ try { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: array_walk_recursive() expects at least 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/array/array_walk_recursive_basic2.phpt b/ext/standard/tests/array/array_walk_recursive_basic2.phpt index a049c0b812..40d5e1eb2b 100644 --- a/ext/standard/tests/array/array_walk_recursive_basic2.phpt +++ b/ext/standard/tests/array/array_walk_recursive_basic2.phpt @@ -18,7 +18,7 @@ $fruits = array("a" => "lemon", "b" => array( "c" => "orange", "d" => "banana"), * key - key in key/value pair * prefix - string to be added * Description : alters the array values by appending prefix string - */ + */ function test_alter(&$item, $key, $prefix) { // dump the arguments to check that they are passed diff --git a/ext/standard/tests/array/array_walk_recursive_error2.phpt b/ext/standard/tests/array/array_walk_recursive_error2.phpt index 5a077c6886..8b5e92a0e0 100644 --- a/ext/standard/tests/array/array_walk_recursive_error2.phpt +++ b/ext/standard/tests/array/array_walk_recursive_error2.phpt @@ -35,12 +35,12 @@ try { // expected: Warning is suppressed try { - var_dump( @array_walk_recursive($input, "callback1") ); + var_dump( @array_walk_recursive($input, "callback1") ); } catch (Throwable $e) { echo "Exception: " . $e->getMessage() . "\n"; } try { - var_dump( @array_walk_recursive($input, "callback2", 4) ); + var_dump( @array_walk_recursive($input, "callback2", 4) ); } catch (Throwable $e) { echo "Exception: " . $e->getMessage() . "\n"; } diff --git a/ext/standard/tests/array/array_walk_recursive_object1.phpt b/ext/standard/tests/array/array_walk_recursive_object1.phpt index 5c01c55817..d68d1554dc 100644 --- a/ext/standard/tests/array/array_walk_recursive_object1.phpt +++ b/ext/standard/tests/array/array_walk_recursive_object1.phpt @@ -38,10 +38,10 @@ class MyClass $this->pub_value = $setVal; $this->pro_value = $setVal; } -}; +}; // object for 'input' argument -$input = new MyClass(10); +$input = new MyClass(10); var_dump( array_walk_recursive($input, "callback", 1)); diff --git a/ext/standard/tests/array/array_walk_recursive_object2.phpt b/ext/standard/tests/array/array_walk_recursive_object2.phpt index 87d8e49d95..42855b0a68 100644 --- a/ext/standard/tests/array/array_walk_recursive_object2.phpt +++ b/ext/standard/tests/array/array_walk_recursive_object2.phpt @@ -21,7 +21,7 @@ echo "*** Testing array_walk_recursive() : array of objects ***\n"; * Description : Function adds the addvalue to each element of an array */ function callback_private($value, $key, $addValue) -{ +{ echo "value : "; var_dump($value->getValue()); echo "key : "; @@ -58,7 +58,7 @@ class MyClass { return $this->pro_value; } -}; +}; // array containing objects of MyClass $input = array ( @@ -75,7 +75,7 @@ var_dump( array_walk_recursive($input, "callback_private", 1)); echo "-- For public member --\n"; var_dump( array_walk_recursive($input, "callback_public")); echo "-- For protected member --\n"; -var_dump( array_walk_recursive($input, "callback_protected")); +var_dump( array_walk_recursive($input, "callback_protected")); echo "Done" ?> diff --git a/ext/standard/tests/array/array_walk_recursive_variation1.phpt b/ext/standard/tests/array/array_walk_recursive_variation1.phpt index 5b8c0b1d1d..105c1af4f1 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation1.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation1.phpt @@ -65,7 +65,7 @@ $input_values = array( // empty data /* 16*/ "", - '', + '', // string data /* 18*/ "string", diff --git a/ext/standard/tests/array/array_walk_recursive_variation3.phpt b/ext/standard/tests/array/array_walk_recursive_variation3.phpt index 96c93d6f35..2db65ff20f 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation3.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation3.phpt @@ -29,10 +29,10 @@ echo "*** Testing array_walk_recursive() : 'input' array with different values** // different arrays as input $input_values = array( - + // integer values /*1*/ array(array(1, 0, -10), array(023, -041), array(0x5A, 0X1F, -0x6E)), - + // float value array(array(3.4, 0.8, -2.9), array(6.25e2, 8.20E-3)), @@ -58,7 +58,7 @@ $input_values = array( for($count = 0; $count < count($input_values); $count++) { echo "\n-- Iteration ".($count + 1)." --\n"; var_dump( array_walk_recursive($input_values[$count], "print_value", $count+1)); -} +} echo "Done" ?> --EXPECT-- diff --git a/ext/standard/tests/array/array_walk_recursive_variation7.phpt b/ext/standard/tests/array/array_walk_recursive_variation7.phpt index bc0d205900..c07a353d38 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation7.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation7.phpt @@ -30,7 +30,7 @@ echo "-- Anonymous function with three arguments --\n"; var_dump( array_walk_recursive($input, function($value, $key, $user_data) { var_dump($key); var_dump($value); var_dump($user_data); echo "\n"; }, 10)); echo "-- Anonymous function with one more argument --\n"; -var_dump( array_walk_recursive($input, function($value, $key, $user_data) { var_dump($key); var_dump($value); var_dump($user_data); echo "\n"; }, 20, 30)); +var_dump( array_walk_recursive($input, function($value, $key, $user_data) { var_dump($key); var_dump($value); var_dump($user_data); echo "\n"; }, 20, 30)); echo "-- Anonymous function with null argument --\n"; var_dump( array_walk_recursive( $input, function() { echo "1\n"; })); diff --git a/ext/standard/tests/array/array_walk_recursive_variation9.phpt b/ext/standard/tests/array/array_walk_recursive_variation9.phpt index 780d779a7e..46a58fa53b 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation9.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation9.phpt @@ -46,7 +46,7 @@ function callback_no_parameter() var_dump( array_walk_recursive($input, 'callback_no_parameter')); echo "-- passing one more parameter to function with two parameters --\n"; -var_dump( array_walk_recursive($input, 'callback_two_parameter', 10)); +var_dump( array_walk_recursive($input, 'callback_two_parameter', 10)); echo "Done" ?> diff --git a/ext/standard/tests/array/array_walk_variation1.phpt b/ext/standard/tests/array/array_walk_variation1.phpt index 4121f1a5a1..e1698ab4d6 100644 --- a/ext/standard/tests/array/array_walk_variation1.phpt +++ b/ext/standard/tests/array/array_walk_variation1.phpt @@ -65,7 +65,7 @@ $input_values = array( // empty data /* 16*/ "", - '', + '', // string data /* 18*/ "string", diff --git a/ext/standard/tests/array/array_walk_variation3.phpt b/ext/standard/tests/array/array_walk_variation3.phpt index 964853705c..34d7a8c2ec 100644 --- a/ext/standard/tests/array/array_walk_variation3.phpt +++ b/ext/standard/tests/array/array_walk_variation3.phpt @@ -29,10 +29,10 @@ echo "*** Testing array_walk() : 'input' array with different values***\n"; // different arrays as input $input_values = array( - + // integer values /*1*/ array(1, 0, -10, 023, -041, 0x5A, 0X1F, -0x6E), - + // float value array(3.4, 0.8, -2.9, 6.25e2, 8.20E-3), @@ -58,7 +58,7 @@ $input_values = array( for($count = 0; $count < count($input_values); $count++) { echo "\n-- Iteration ".($count + 1)." --\n"; var_dump( array_walk($input_values[$count], "print_value", $count+1)); -} +} echo "Done" ?> --EXPECT-- diff --git a/ext/standard/tests/array/array_walk_variation7.phpt b/ext/standard/tests/array/array_walk_variation7.phpt index 692f276628..a411ae0b5c 100644 --- a/ext/standard/tests/array/array_walk_variation7.phpt +++ b/ext/standard/tests/array/array_walk_variation7.phpt @@ -30,7 +30,7 @@ echo "-- Anonymous function with three arguments --\n"; var_dump( array_walk($input, function($value, $key, $user_data) { var_dump($key); var_dump($value); var_dump($user_data); echo "\n"; }, 10)); echo "-- Anonymous function with one more argument --\n"; -var_dump( array_walk($input, function($value, $key, $user_data) { var_dump($key); var_dump($value); var_dump($user_data); echo "\n"; }, 20, 30)); +var_dump( array_walk($input, function($value, $key, $user_data) { var_dump($key); var_dump($value); var_dump($user_data); echo "\n"; }, 20, 30)); echo "-- Anonymous function with null argument --\n"; var_dump( array_walk( $input, function() { echo "1\n"; })); diff --git a/ext/standard/tests/array/array_walk_variation9.phpt b/ext/standard/tests/array/array_walk_variation9.phpt index 3af6316c12..5f82ab65d8 100644 --- a/ext/standard/tests/array/array_walk_variation9.phpt +++ b/ext/standard/tests/array/array_walk_variation9.phpt @@ -46,7 +46,7 @@ function callback_no_parameter() var_dump( array_walk($input, 'callback_no_parameter')); echo "-- passing one more parameter to function with two parameters --\n"; -var_dump( array_walk($input, 'callback_two_parameter', 10)); +var_dump( array_walk($input, 'callback_two_parameter', 10)); echo "Done" ?> diff --git a/ext/standard/tests/array/arsort_object1.phpt b/ext/standard/tests/array/arsort_object1.phpt index f73696392e..40db0b4817 100644 --- a/ext/standard/tests/array/arsort_object1.phpt +++ b/ext/standard/tests/array/arsort_object1.phpt @@ -44,14 +44,14 @@ class for_string_arsort } // array of integer objects -$unsorted_int_obj = array ( +$unsorted_int_obj = array ( 1 => new for_integer_arsort(11), 2 => new for_integer_asort(66), 3 => new for_integer_arsort(23), 4 => new for_integer_asort(-5), 5 => new for_integer_arsort(0.001), 6 => new for_integer_asort(0) ); // array of string objects -$unsorted_str_obj = array ( +$unsorted_str_obj = array ( "a" => new for_string_arsort("axx"), "b" => new for_string_asort("t"), "c" => new for_string_arsort("w"), "d" => new for_string_asort("py"), "e" => new for_string_arsort("apple"), "f" => new for_string_asort("Orange"), diff --git a/ext/standard/tests/array/arsort_object2.phpt b/ext/standard/tests/array/arsort_object2.phpt index f5ed333623..1e674ffd3a 100644 --- a/ext/standard/tests/array/arsort_object2.phpt +++ b/ext/standard/tests/array/arsort_object2.phpt @@ -21,7 +21,7 @@ class for_integer_arsort { public $public_class_value; private $private_class_value; - protected $protected_class_value; + protected $protected_class_value; // initializing object member value function __construct($value1, $value2,$value3){ $this->public_class_value = $value1; @@ -36,7 +36,7 @@ class for_string_arsort { public $public_class_value; private $private_class_value; - protected $protected_class_value; + protected $protected_class_value; // initializing object member value function __construct($value1, $value2,$value3){ $this->public_class_value = $value1; @@ -51,13 +51,13 @@ class for_string_arsort } // array of integer objects -$unsorted_int_obj = array ( +$unsorted_int_obj = array ( 1 => new for_integer_arsort(11, 33,2), 2 => new for_integer_asort(44, 66,3), 3 => new for_integer_arsort(23, 32,6), 4 => new for_integer_asort(-88, -5,-4), ); // array of string objects -$unsorted_str_obj = array ( +$unsorted_str_obj = array ( "a" => new for_string_arsort("axx","AXX","d"), "b" => new for_string_asort("T", "t","q"), "c" => new for_string_arsort("w", "W","c"), "d" => new for_string_asort("PY", "py","s"), ); diff --git a/ext/standard/tests/array/arsort_variation1.phpt b/ext/standard/tests/array/arsort_variation1.phpt index c32e377295..947d8f07a9 100644 --- a/ext/standard/tests/array/arsort_variation1.phpt +++ b/ext/standard/tests/array/arsort_variation1.phpt @@ -76,7 +76,7 @@ $unexpected_values = array ( // loop though each element of the array and check the working of arsort() // when $array argument is supplied with different values from $unexpected_values echo "\n-- Testing arsort() by supplying different unexpected values for 'array' argument --\n"; -echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; +echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; $counter = 1; for($index = 0; $index < count($unexpected_values); $index ++) { diff --git a/ext/standard/tests/array/arsort_variation10.phpt b/ext/standard/tests/array/arsort_variation10.phpt index 0520e455c6..093be7e61c 100644 --- a/ext/standard/tests/array/arsort_variation10.phpt +++ b/ext/standard/tests/array/arsort_variation10.phpt @@ -18,8 +18,8 @@ Test arsort() function : usage variations - sort octal values echo "*** Testing arsort() : usage variations ***\n"; // an array contains unsorted octal values -$unsorted_oct_array = array ( - 01235 => 01235, 0321 => 0321, 0345 => 0345, 066 => 066, 0772 => 0772, +$unsorted_oct_array = array ( + 01235 => 01235, 0321 => 0321, 0345 => 0345, 066 => 066, 0772 => 0772, 077 => 077, -066 => -066, -0345 => -0345, 0 => 0 ); diff --git a/ext/standard/tests/array/arsort_variation2.phpt b/ext/standard/tests/array/arsort_variation2.phpt index b716b65793..e6674774ee 100644 --- a/ext/standard/tests/array/arsort_variation2.phpt +++ b/ext/standard/tests/array/arsort_variation2.phpt @@ -78,7 +78,7 @@ for($index = 0; $index < count($unexpected_values); $index ++) { echo "-- Iteration $counter --\n"; $value = $unexpected_values [$index]; $temp_array = $unsorted_values; - var_dump( arsort($temp_array, $value) ); + var_dump( arsort($temp_array, $value) ); var_dump($temp_array); $counter++; } diff --git a/ext/standard/tests/array/arsort_variation3.phpt b/ext/standard/tests/array/arsort_variation3.phpt index 765efe874d..ede832f26f 100644 --- a/ext/standard/tests/array/arsort_variation3.phpt +++ b/ext/standard/tests/array/arsort_variation3.phpt @@ -27,7 +27,7 @@ $various_arrays = array( // mixed value array array(1 => .0001, 2 => .0021, 3 => -.01, 4 => -1, 5 => 0, 6 => .09, 7 => 2, 8 => -.9, 9 => 10.6E-2, 10 => -10.6E-2, 11 => 33), - + // array values contains minimum and maximum ranges array(1 => 2147483647, 2 => 2147483648, 3 => -2147483647, 4 => -2147483648, 5 => -0, 6 => 0, 7 => -2147483649) ); @@ -42,20 +42,20 @@ echo "\n-- Testing arsort() by supplying various integer/float arrays --\n"; foreach ($various_arrays as $array) { echo "\n-- Iteration $count --\n"; - echo "- With default sort_flag -\n"; - $temp_array = $array; + echo "- With default sort_flag -\n"; + $temp_array = $array; var_dump(arsort($temp_array) ); var_dump($temp_array); // loop through $flag_value array and setting all possible flag values foreach($flag_value as $key => $flag){ echo "- Sort_flag = $key -\n"; - $temp_array = $array; + $temp_array = $array; var_dump(arsort($temp_array, $flag) ); var_dump($temp_array); - } + } $count++; -} +} echo "Done\n"; ?> diff --git a/ext/standard/tests/array/arsort_variation5.phpt b/ext/standard/tests/array/arsort_variation5.phpt index b7adf76eab..b8149c66a6 100644 --- a/ext/standard/tests/array/arsort_variation5.phpt +++ b/ext/standard/tests/array/arsort_variation5.phpt @@ -24,13 +24,13 @@ echo "*** Testing arsort() : usage variations ***\n"; $various_arrays = array ( // group of escape sequences - array ("null"=> null, "NULL" => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", - "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", + array ("null"=> null, "NULL" => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", + "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", "\ddd" => "\ddd", "\v" => "\v" ), // array contains combination of capital/small letters - array ('l' => "lemoN", 'O' => "Orange", 'b' => "banana", 'a' => "apple", 'Te' => "Test", + array ('l' => "lemoN", 'O' => "Orange", 'b' => "banana", 'a' => "apple", 'Te' => "Test", 'T' => "TTTT", 't' => "ttt", 'w' => "ww", 'x' => "x", 'X' => "X", 'o' => "oraNGe", 'B' => "BANANA" ) diff --git a/ext/standard/tests/array/arsort_variation8.phpt b/ext/standard/tests/array/arsort_variation8.phpt index d190408d54..1f948092a9 100644 --- a/ext/standard/tests/array/arsort_variation8.phpt +++ b/ext/standard/tests/array/arsort_variation8.phpt @@ -39,8 +39,8 @@ echo "\n-- Testing arsort() by supplying various arrays containing sub arrays -- // loop through to test arsort() with different arrays foreach ($various_arrays as $array) { - - echo "\n-- Iteration $count --\n"; + + echo "\n-- Iteration $count --\n"; // testing arsort() function by supplying different arrays, flag value is default echo "- With default sort_flag -\n"; $temp_array = $array; diff --git a/ext/standard/tests/array/asort_object1.phpt b/ext/standard/tests/array/asort_object1.phpt index ad54675d64..414c89086c 100644 --- a/ext/standard/tests/array/asort_object1.phpt +++ b/ext/standard/tests/array/asort_object1.phpt @@ -44,14 +44,14 @@ class for_string_asort } // array of integer objects -$unsorted_int_obj = array ( +$unsorted_int_obj = array ( 1 => new for_integer_asort(11), 2 => new for_integer_asort(66), 3 => new for_integer_asort(23), 4 => new for_integer_asort(-5), 5 => new for_integer_asort(0.001), 6 => new for_integer_asort(0) ); // array of string objects -$unsorted_str_obj = array ( +$unsorted_str_obj = array ( "a" => new for_string_asort("axx"), "b" => new for_string_asort("t"), "c" => new for_string_asort("w"), "d" => new for_string_asort("py"), "e" => new for_string_asort("apple"), "f" => new for_string_asort("Orange"), diff --git a/ext/standard/tests/array/asort_object2.phpt b/ext/standard/tests/array/asort_object2.phpt index be761205b2..dc5c4b9522 100644 --- a/ext/standard/tests/array/asort_object2.phpt +++ b/ext/standard/tests/array/asort_object2.phpt @@ -21,7 +21,7 @@ class for_integer_asort { public $public_class_value; private $private_class_value; - protected $protected_class_value; + protected $protected_class_value; // initializing object member value function __construct($value1, $value2,$value3){ $this->public_class_value = $value1; @@ -36,7 +36,7 @@ class for_string_asort { public $public_class_value; private $private_class_value; - protected $protected_class_value; + protected $protected_class_value; // initializing object member value function __construct($value1, $value2,$value3){ $this->public_class_value = $value1; @@ -51,13 +51,13 @@ class for_string_asort } // array of integer objects -$unsorted_int_obj = array ( +$unsorted_int_obj = array ( 1 => new for_integer_asort(11, 33,2), 2 => new for_integer_asort(44, 66,3), 3 => new for_integer_asort(23, 32,6), 4 => new for_integer_asort(-88, -5,-4), ); // array of string objects -$unsorted_str_obj = array ( +$unsorted_str_obj = array ( "a" => new for_string_asort("axx","AXX","d"), "b" => new for_string_asort("T", "t","q"), "c" => new for_string_asort("w", "W","c"), "d" => new for_string_asort("PY", "py","s"), ); diff --git a/ext/standard/tests/array/asort_variation1.phpt b/ext/standard/tests/array/asort_variation1.phpt index 07fc53787b..6ad5b4a6ea 100644 --- a/ext/standard/tests/array/asort_variation1.phpt +++ b/ext/standard/tests/array/asort_variation1.phpt @@ -76,7 +76,7 @@ $unexpected_values = array ( // loop though each element of the array and check the working of asort() // when $array argument is supplied with different values from $unexpected_values echo "\n-- Testing asort() by supplying different unexpected values for 'array' argument --\n"; -echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; +echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; $counter = 1; for($index = 0; $index < count($unexpected_values); $index ++) { diff --git a/ext/standard/tests/array/asort_variation10.phpt b/ext/standard/tests/array/asort_variation10.phpt index 793315e999..3762ce04a5 100644 --- a/ext/standard/tests/array/asort_variation10.phpt +++ b/ext/standard/tests/array/asort_variation10.phpt @@ -18,8 +18,8 @@ Test asort() function : usage variations - sort octal values echo "*** Testing asort() : usage variations ***\n"; // an array contains unsorted octal values -$unsorted_oct_array = array ( - 01235 => 01235, 0321 => 0321, 0345 => 0345, 066 => 066, 0772 => 0772, +$unsorted_oct_array = array ( + 01235 => 01235, 0321 => 0321, 0345 => 0345, 066 => 066, 0772 => 0772, 077 => 077, -066 => -066, -0345 => -0345, 0 => 0 ); diff --git a/ext/standard/tests/array/asort_variation2.phpt b/ext/standard/tests/array/asort_variation2.phpt index f58663cdaa..e8dda190df 100644 --- a/ext/standard/tests/array/asort_variation2.phpt +++ b/ext/standard/tests/array/asort_variation2.phpt @@ -78,7 +78,7 @@ for($index = 0; $index < count($unexpected_values); $index ++) { echo "-- Iteration $counter --\n"; $value = $unexpected_values [$index]; $temp_array = $unsorted_values; - var_dump( asort($temp_array, $value) ); + var_dump( asort($temp_array, $value) ); var_dump($temp_array); $counter++; } diff --git a/ext/standard/tests/array/asort_variation3.phpt b/ext/standard/tests/array/asort_variation3.phpt index a9d3f6afa3..1b201a9c2b 100644 --- a/ext/standard/tests/array/asort_variation3.phpt +++ b/ext/standard/tests/array/asort_variation3.phpt @@ -27,7 +27,7 @@ $various_arrays = array( // mixed value array array(1 => .0001, 2 => .0021, 3 => -.01, 4 => -1, 5 => 0, 6 => .09, 7 => 2, 8 => -.9, 9 => 10.6E-2, 10 => -10.6E-2, 11 => 33), - + // array values contains minimum and maximum ranges array(1 => 2147483647, 2 => 2147483648, 3 => -2147483647, 4 => -2147483648, 5 => -0, 6 => 0, 7 => -2147483649) ); @@ -42,20 +42,20 @@ echo "\n-- Testing asort() by supplying various integer/float arrays --\n"; foreach ($various_arrays as $array) { echo "\n-- Iteration $count --\n"; - echo "- With default sort_flag -\n"; - $temp_array = $array; + echo "- With default sort_flag -\n"; + $temp_array = $array; var_dump(asort($temp_array) ); var_dump($temp_array); // loop through $flag_value array and setting all possible flag values foreach($flag_value as $key => $flag){ echo "- Sort_flag = $key -\n"; - $temp_array = $array; + $temp_array = $array; var_dump(asort($temp_array, $flag) ); var_dump($temp_array); - } + } $count++; -} +} echo "Done\n"; ?> diff --git a/ext/standard/tests/array/asort_variation5.phpt b/ext/standard/tests/array/asort_variation5.phpt index e416a59ca6..bb0581a660 100644 --- a/ext/standard/tests/array/asort_variation5.phpt +++ b/ext/standard/tests/array/asort_variation5.phpt @@ -24,13 +24,13 @@ echo "*** Testing asort() : usage variations ***\n"; $various_arrays = array ( // group of escape sequences - array ("null"=> null, "NULL" => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", - "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", + array ("null"=> null, "NULL" => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", + "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", "\ddd" => "\ddd", "\v" => "\v" ), // array contains combination of capital/small letters - array ('l' => "lemoN", 'O' => "Orange", 'b' => "banana", 'a' => "apple", 'Te' => "Test", + array ('l' => "lemoN", 'O' => "Orange", 'b' => "banana", 'a' => "apple", 'Te' => "Test", 'T' => "TTTT", 't' => "ttt", 'w' => "ww", 'x' => "x", 'X' => "X", 'o' => "oraNGe", 'B' => "BANANA" ) diff --git a/ext/standard/tests/array/asort_variation8.phpt b/ext/standard/tests/array/asort_variation8.phpt index b097346dff..d53fb0d21c 100644 --- a/ext/standard/tests/array/asort_variation8.phpt +++ b/ext/standard/tests/array/asort_variation8.phpt @@ -39,8 +39,8 @@ echo "\n-- Testing asort() by supplying various arrays containing sub arrays --\ // loop through to test asort() with different arrays foreach ($various_arrays as $array) { - - echo "\n-- Iteration $count --\n"; + + echo "\n-- Iteration $count --\n"; // testing asort() function by supplying different arrays, flag value is default echo "- With default sort_flag -\n"; $temp_array = $array; diff --git a/ext/standard/tests/array/bug21998.phpt b/ext/standard/tests/array/bug21998.phpt index aa52dc590a..e1bb0033ea 100644 --- a/ext/standard/tests/array/bug21998.phpt +++ b/ext/standard/tests/array/bug21998.phpt @@ -7,11 +7,11 @@ $a = array("a", "b", "c"); var_dump(key($a)); var_dump(array_pop($a)); -var_dump(key($a)); +var_dump(key($a)); var_dump(array_pop($a)); -var_dump(key($a)); +var_dump(key($a)); var_dump(array_pop($a)); -var_dump(key($a)); +var_dump(key($a)); ?> --EXPECT-- diff --git a/ext/standard/tests/array/bug22463.phpt b/ext/standard/tests/array/bug22463.phpt index dcede511bb..7993ac2576 100644 --- a/ext/standard/tests/array/bug22463.phpt +++ b/ext/standard/tests/array/bug22463.phpt @@ -8,7 +8,7 @@ function a($ary) { } function cb($v, $elem) { - return $v + a($elem); + return $v + a($elem); } $ary = array( diff --git a/ext/standard/tests/array/bug24198.phpt b/ext/standard/tests/array/bug24198.phpt index b1cd523026..a1a30afb6d 100644 --- a/ext/standard/tests/array/bug24198.phpt +++ b/ext/standard/tests/array/bug24198.phpt @@ -2,9 +2,9 @@ Bug #24198 (array_merge_recursive() invalid recursion detection) --FILE-- <?php -$c = array('a' => 'aa','b' => 'bb'); +$c = array('a' => 'aa','b' => 'bb'); -var_dump(array_merge_recursive($c, $c)); +var_dump(array_merge_recursive($c, $c)); ?> --EXPECT-- array(2) { diff --git a/ext/standard/tests/array/bug24980.phpt b/ext/standard/tests/array/bug24980.phpt index b9e04fd67f..6c97562f6c 100644 --- a/ext/standard/tests/array/bug24980.phpt +++ b/ext/standard/tests/array/bug24980.phpt @@ -9,7 +9,7 @@ function add_up($running_total, $current_value) $running_total += $current_value * $current_value; return $running_total; } - + $numbers = array (2,3,5,7); $total = array_reduce($numbers, 'add_up'); print "Total is $total\n"; @@ -21,7 +21,7 @@ function foo ($a, $b) return $a . $b; } var_dump(array_reduce($a, "foo")); - + /* test #3: basic test (used to leak memory) */ function rsum($v, $w) { diff --git a/ext/standard/tests/array/bug30074.phpt b/ext/standard/tests/array/bug30074.phpt index 7720fe0006..289e802c00 100644 --- a/ext/standard/tests/array/bug30074.phpt +++ b/ext/standard/tests/array/bug30074.phpt @@ -3,7 +3,7 @@ Bug #30074 (EG(uninitialized_zval_ptr) gets set to reference using EXTR_REFS, af --FILE-- <?php error_reporting(E_ALL & ~E_NOTICE); // We don't want the notice for $undefined -$result = extract(array('a'=>$undefined), EXTR_REFS); +$result = extract(array('a'=>$undefined), EXTR_REFS); var_dump(array($a)); echo "Done\n"; ?> diff --git a/ext/standard/tests/array/bug30833.phpt b/ext/standard/tests/array/bug30833.phpt index 728a659d8f..c79c33fa74 100644 --- a/ext/standard/tests/array/bug30833.phpt +++ b/ext/standard/tests/array/bug30833.phpt @@ -13,7 +13,7 @@ var_dump($foo); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(2) { [0]=> string(3) "abc" diff --git a/ext/standard/tests/array/bug33382.phpt b/ext/standard/tests/array/bug33382.phpt index e54b984fd0..0153da90bd 100644 --- a/ext/standard/tests/array/bug33382.phpt +++ b/ext/standard/tests/array/bug33382.phpt @@ -11,7 +11,7 @@ var_dump(array_reverse($array)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(5) { [0]=> int(5) diff --git a/ext/standard/tests/array/bug34066.phpt b/ext/standard/tests/array/bug34066.phpt index eb5b85e700..44710b0426 100644 --- a/ext/standard/tests/array/bug34066.phpt +++ b/ext/standard/tests/array/bug34066.phpt @@ -265,7 +265,7 @@ function gen_xml($val, $key, $prefix) } echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- gen_xml(prefix=/Docs/) gen_xml(prefix=/Docs/@) /Docs/@Version=1.0 diff --git a/ext/standard/tests/array/bug34066_1.phpt b/ext/standard/tests/array/bug34066_1.phpt index 12aa35c347..5200fa86a6 100644 --- a/ext/standard/tests/array/bug34066_1.phpt +++ b/ext/standard/tests/array/bug34066_1.phpt @@ -265,7 +265,7 @@ function gen_xml($val, $key, $prefix) } echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- gen_xml(prefix=/Docs/) /Docs/Version=1.0 gen_xml(prefix=/Docs/) end diff --git a/ext/standard/tests/array/bug35014.phpt b/ext/standard/tests/array/bug35014.phpt index 9250c03e10..f858bf107b 100644 --- a/ext/standard/tests/array/bug35014.phpt +++ b/ext/standard/tests/array/bug35014.phpt @@ -22,7 +22,7 @@ foreach ($tests as $v) { var_dump(array_product($v)); } ?> ---EXPECTF-- +--EXPECTF-- Warning: array_product() expects parameter 1 to be array, string given in %s on line %d NULL int(1) diff --git a/ext/standard/tests/array/bug35014_64bit.phpt b/ext/standard/tests/array/bug35014_64bit.phpt index efd791ac99..5caf48c6ee 100644 --- a/ext/standard/tests/array/bug35014_64bit.phpt +++ b/ext/standard/tests/array/bug35014_64bit.phpt @@ -22,7 +22,7 @@ foreach ($tests as $v) { var_dump(array_product($v)); } ?> ---EXPECTF-- +--EXPECTF-- Warning: array_product() expects parameter 1 to be array, string given in %s on line %d NULL int(1) diff --git a/ext/standard/tests/array/bug35022.phpt b/ext/standard/tests/array/bug35022.phpt index e3f5386482..07138f138d 100644 --- a/ext/standard/tests/array/bug35022.phpt +++ b/ext/standard/tests/array/bug35022.phpt @@ -13,7 +13,7 @@ foo($state); reset($state); var_dump( key($state), current($state) ); ?> ---EXPECT-- +--EXPECT-- three => 3 two => 2 one => 1 diff --git a/ext/standard/tests/array/bug35821.phpt b/ext/standard/tests/array/bug35821.phpt index d7abc7773b..be48ca8570 100644 --- a/ext/standard/tests/array/bug35821.phpt +++ b/ext/standard/tests/array/bug35821.phpt @@ -21,7 +21,7 @@ array_map(array('Element', 'CallBack'), $arr); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Uncaught Exception in %s:%d Stack trace: diff --git a/ext/standard/tests/array/bug36975.phpt b/ext/standard/tests/array/bug36975.phpt index 7912fffca4..67a34325d0 100644 --- a/ext/standard/tests/array/bug36975.phpt +++ b/ext/standard/tests/array/bug36975.phpt @@ -2,13 +2,13 @@ Bug #36975 (natcasesort() causes array_pop() to misbehave) --FILE-- <?php -$a = array('aa', 'aa', 'bb', 'bb', 'cc', 'cc'); +$a = array('aa', 'aa', 'bb', 'bb', 'cc', 'cc'); $test = natcasesort($a); -if ($test) { - echo "natcasesort success!\n"; -} -$val = array_pop($a); -$a[] = $val; +if ($test) { + echo "natcasesort success!\n"; +} +$val = array_pop($a); +$a[] = $val; var_dump($a); $b = array(1 => 'foo', 0 => 'baz'); diff --git a/ext/standard/tests/array/bug38464.phpt b/ext/standard/tests/array/bug38464.phpt index 42f7a6ab54..5480109ba2 100644 --- a/ext/standard/tests/array/bug38464.phpt +++ b/ext/standard/tests/array/bug38464.phpt @@ -5,7 +5,7 @@ Bug #38464 (array_count_values() mishandles numeric strings) $array = array('-000', ' 001', 1, ' 123', '+123'); var_dump(array_count_values($array)); ?> ---EXPECT-- +--EXPECT-- array(5) { ["-000"]=> int(1) diff --git a/ext/standard/tests/array/bug39576.phpt b/ext/standard/tests/array/bug39576.phpt index f94aa3a2be..bb58e79183 100644 --- a/ext/standard/tests/array/bug39576.phpt +++ b/ext/standard/tests/array/bug39576.phpt @@ -32,7 +32,7 @@ array_intersect_key ( echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Notice: Only variables should be passed by reference in %s on line %d object(Test)#%d (4) { ["_table"]=> diff --git a/ext/standard/tests/array/bug40709.phpt b/ext/standard/tests/array/bug40709.phpt index 7e132ba3d4..93836d0398 100644 --- a/ext/standard/tests/array/bug40709.phpt +++ b/ext/standard/tests/array/bug40709.phpt @@ -19,7 +19,7 @@ echo "result for arr2: ".array_reduce($arr2,'CommaSeparatedList')."\n"; echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- result for arr1: 1,2,3 result for arr2: 1 result for arr1: 1,2,3 diff --git a/ext/standard/tests/array/bug41121.phpt b/ext/standard/tests/array/bug41121.phpt index a03bdaf4ce..abe73567ec 100644 --- a/ext/standard/tests/array/bug41121.phpt +++ b/ext/standard/tests/array/bug41121.phpt @@ -12,7 +12,7 @@ var_dump(range(2147483400, 2147483600, 100)); var_dump( range(2147483646, 2147483648, 1 ) ); var_dump( range(2147483646, 2147483657, 1 ) ); var_dump( range(2147483630, 2147483646, 5 ) ); - + // negative steps var_dump( range(-2147483645, -2147483648, 1 ) ); var_dump( range(-2147483645, -2147483649, 1 ) ); @@ -23,7 +23,7 @@ var_dump(range(2147483647, 2147483645, 1 )); var_dump(range(2147483648, 2147483645, 1 )); ?> ---EXPECT-- +--EXPECT-- array(3) { [0]=> int(2147483400) diff --git a/ext/standard/tests/array/bug41686.phpt b/ext/standard/tests/array/bug41686.phpt index 9f1384eddd..66bbc394d6 100644 --- a/ext/standard/tests/array/bug41686.phpt +++ b/ext/standard/tests/array/bug41686.phpt @@ -16,7 +16,7 @@ var_dump( echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(2) { [0]=> int(2) diff --git a/ext/standard/tests/array/bug42850.phpt b/ext/standard/tests/array/bug42850.phpt index 3baec831bd..16063bbdfc 100644 --- a/ext/standard/tests/array/bug42850.phpt +++ b/ext/standard/tests/array/bug42850.phpt @@ -1,11 +1,11 @@ --TEST-- -Bug #42850 (array_walk_recursive() leaves references) +Bug #42850 (array_walk_recursive() leaves references) --FILE-- <?php // Bug #42850 $data = array ('key1' => 'val1', array('key2' => 'val2')); -function apply_dumb($item, $key) {}; +function apply_dumb($item, $key) {}; var_dump($data); array_walk_recursive($data, 'apply_dumb'); $data2 = $data; diff --git a/ext/standard/tests/array/bug43495.phpt b/ext/standard/tests/array/bug43495.phpt index 8b8f3a6edb..522ff1903b 100644 --- a/ext/standard/tests/array/bug43495.phpt +++ b/ext/standard/tests/array/bug43495.phpt @@ -8,7 +8,7 @@ $a["key1"]["key2"]["key3"]=&$a; $b=array("key1"=>array("key2"=>array())); $b["key1"]["key2"]["key3"]=&$b; -array_merge_recursive($a,$b); +array_merge_recursive($a,$b); /* Break recursion */ $a["key1"]["key2"]["key3"] = null; diff --git a/ext/standard/tests/array/bug48484.phpt b/ext/standard/tests/array/bug48484.phpt index 0b4afe277a..5688c0cad8 100644 --- a/ext/standard/tests/array/bug48484.phpt +++ b/ext/standard/tests/array/bug48484.phpt @@ -4,5 +4,5 @@ Bug 48484 (array_product() always returns 0 for an empty array) <?php var_dump(array_product(array())); ?> ---EXPECT-- +--EXPECT-- int(1) diff --git a/ext/standard/tests/array/bug50006_1.phpt b/ext/standard/tests/array/bug50006_1.phpt index 9db2c7796f..aac0e2a535 100644 --- a/ext/standard/tests/array/bug50006_1.phpt +++ b/ext/standard/tests/array/bug50006_1.phpt @@ -5,7 +5,7 @@ Bug #50006 (Segfault caused by uksort()) - usort variant $data = array( 'bar-bazbazbaz.', - 'bar-bazbazbaz-', + 'bar-bazbazbaz-', 'foo' ); usort($data, 'magic_sort_cmp'); diff --git a/ext/standard/tests/array/bug50006_2.phpt b/ext/standard/tests/array/bug50006_2.phpt index a501986981..70b602256b 100644 --- a/ext/standard/tests/array/bug50006_2.phpt +++ b/ext/standard/tests/array/bug50006_2.phpt @@ -5,7 +5,7 @@ Bug #50006 (Segfault caused by uksort()) - uasort variant $data = array( 'bar-bazbazbaz.', - 'bar-bazbazbaz-', + 'bar-bazbazbaz-', 'foo' ); uasort($data, 'magic_sort_cmp'); diff --git a/ext/standard/tests/array/bug61058.phpt b/ext/standard/tests/array/bug61058.phpt index 1f0f6fe630..f5e06a4a02 100644 --- a/ext/standard/tests/array/bug61058.phpt +++ b/ext/standard/tests/array/bug61058.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #61058 (array_fill leaks if start index is PHP_INT_MAX) --FILE-- -<?php +<?php array_fill(PHP_INT_MAX, 2, '*'); ?> --EXPECTF-- diff --git a/ext/standard/tests/array/bug65304.phpt b/ext/standard/tests/array/bug65304.phpt index e5c9dfc5e6..8ed4c5081b 100644 --- a/ext/standard/tests/array/bug65304.phpt +++ b/ext/standard/tests/array/bug65304.phpt @@ -5,6 +5,6 @@ Bug #65304 (Use of max int in array_sum) var_dump(array_sum(array(PHP_INT_MAX, 1))); var_dump(PHP_INT_MAX + 1); ?> ---EXPECTF-- +--EXPECTF-- float(%s) float(%s) diff --git a/ext/standard/tests/array/bug70713.phpt b/ext/standard/tests/array/bug70713.phpt index 4e2792ab4b..7cd0a0f113 100644 --- a/ext/standard/tests/array/bug70713.phpt +++ b/ext/standard/tests/array/bug70713.phpt @@ -8,12 +8,12 @@ class obj function __tostring() { global $arr; - + $arr = 1; for ($i = 0; $i < 5; $i++) { $v[$i] = 'hi'.$i; } - + return 'hi'; } } diff --git a/ext/standard/tests/array/bug71220.phpt b/ext/standard/tests/array/bug71220.phpt index 28b5c08a8a..49e5bb7719 100644 --- a/ext/standard/tests/array/bug71220.phpt +++ b/ext/standard/tests/array/bug71220.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #71220 (Null pointer deref (segfault) in compact via ob_start) --FILE-- -<?php +<?php ob_start("compact"); ob_end_clean(); ?> diff --git a/ext/standard/tests/array/compact_error.phpt b/ext/standard/tests/array/compact_error.phpt index a7ef54597e..77a78009bd 100644 --- a/ext/standard/tests/array/compact_error.phpt +++ b/ext/standard/tests/array/compact_error.phpt @@ -5,7 +5,7 @@ Test compact() function : error conditions /* Prototype : proto array compact(mixed var_names [, mixed ...]) * Description: Creates a hash containing variables and their values * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/standard/tests/array/count_basic.phpt b/ext/standard/tests/array/count_basic.phpt index 010d6cdf3c..273e27683c 100644 --- a/ext/standard/tests/array/count_basic.phpt +++ b/ext/standard/tests/array/count_basic.phpt @@ -3,7 +3,7 @@ Test count() function : basic functionality --FILE-- <?php /* Prototype : int count(mixed $var [, int $mode]) - * Description: Count the number of elements in a variable (usually an array) + * Description: Count the number of elements in a variable (usually an array) * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/count_error.phpt b/ext/standard/tests/array/count_error.phpt index 76f7213645..32d15edc6f 100644 --- a/ext/standard/tests/array/count_error.phpt +++ b/ext/standard/tests/array/count_error.phpt @@ -3,7 +3,7 @@ Test count() function : error conditions - pass incorrect number of args --FILE-- <?php /* Prototype : int count(mixed var [, int mode]) - * Description: Count the number of elements in a variable (usually an array) + * Description: Count the number of elements in a variable (usually an array) * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/count_variation1.phpt b/ext/standard/tests/array/count_variation1.phpt index a58473c219..5152f65445 100644 --- a/ext/standard/tests/array/count_variation1.phpt +++ b/ext/standard/tests/array/count_variation1.phpt @@ -3,7 +3,7 @@ Test count() function : usage variations - Pass different data types as $var arg --FILE-- <?php /* Prototype : int count(mixed $var [, int $mode]) - * Description: Count the number of elements in a variable (usually an array) + * Description: Count the number of elements in a variable (usually an array) * Source code: ext/standard/array.c */ @@ -58,7 +58,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -67,7 +67,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/standard/tests/array/count_variation2.phpt b/ext/standard/tests/array/count_variation2.phpt index 86a2b0108f..0a654be183 100644 --- a/ext/standard/tests/array/count_variation2.phpt +++ b/ext/standard/tests/array/count_variation2.phpt @@ -5,7 +5,7 @@ Test count() function : usage variations - Pass different data types as $mode ar --FILE-- <?php /* Prototype : int count(mixed $var [, int $mode]) - * Description: Count the number of elements in a variable (usually an array) + * Description: Count the number of elements in a variable (usually an array) * Source code: ext/standard/array.c */ @@ -63,7 +63,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -72,7 +72,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/standard/tests/array/count_variation3.phpt b/ext/standard/tests/array/count_variation3.phpt index 9c89bcd16b..30cae18964 100644 --- a/ext/standard/tests/array/count_variation3.phpt +++ b/ext/standard/tests/array/count_variation3.phpt @@ -3,7 +3,7 @@ Test count() function : usage variations - Infinitely recursive array --FILE-- <?php /* Prototype : int count(mixed $var [, int $mode]) - * Description: Count the number of elements in a variable (usually an array) + * Description: Count the number of elements in a variable (usually an array) * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/current_variation1.phpt b/ext/standard/tests/array/current_variation1.phpt index 2cc78fc624..c6c66f43c9 100644 --- a/ext/standard/tests/array/current_variation1.phpt +++ b/ext/standard/tests/array/current_variation1.phpt @@ -60,7 +60,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -69,7 +69,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/standard/tests/array/current_variation2.phpt b/ext/standard/tests/array/current_variation2.phpt index 49769cea3f..d839370962 100644 --- a/ext/standard/tests/array/current_variation2.phpt +++ b/ext/standard/tests/array/current_variation2.phpt @@ -67,13 +67,13 @@ $inputs = array( TRUE, FALSE, ), - + // empty data /*5*/ 'empty string' => array( "", '', ), - + /*6*/ 'empty array' => array( ), @@ -83,7 +83,7 @@ $inputs = array( 'string', $heredoc, ), - + // object data /*8*/ 'object' => array( new classA(), diff --git a/ext/standard/tests/array/each_basic.phpt b/ext/standard/tests/array/each_basic.phpt index b12b4c19f7..d061ec65b7 100644 --- a/ext/standard/tests/array/each_basic.phpt +++ b/ext/standard/tests/array/each_basic.phpt @@ -9,7 +9,7 @@ Test each() function : basic functionality */ /* - * Test basic functionality of each() + * Test basic functionality of each() */ echo "*** Testing each() : basic functionality ***\n"; diff --git a/ext/standard/tests/array/each_variation1.phpt b/ext/standard/tests/array/each_variation1.phpt index becdfc4545..ddb196f77e 100644 --- a/ext/standard/tests/array/each_variation1.phpt +++ b/ext/standard/tests/array/each_variation1.phpt @@ -59,7 +59,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -69,7 +69,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/array/each_variation2.phpt b/ext/standard/tests/array/each_variation2.phpt index 73b1ba2746..879bc124d9 100644 --- a/ext/standard/tests/array/each_variation2.phpt +++ b/ext/standard/tests/array/each_variation2.phpt @@ -67,13 +67,13 @@ $inputs = array( TRUE, FALSE, ), - + // empty data /*5*/ 'empty string' => array( "", '', ), - + /*6*/ 'empty array' => array( ), @@ -83,7 +83,7 @@ $inputs = array( 'string', $heredoc, ), - + // object data /*8*/ 'object' => array( new classA(), diff --git a/ext/standard/tests/array/each_variation3.phpt b/ext/standard/tests/array/each_variation3.phpt index 375615643f..63d4ded13a 100644 --- a/ext/standard/tests/array/each_variation3.phpt +++ b/ext/standard/tests/array/each_variation3.phpt @@ -40,7 +40,7 @@ $inputs = array( -10.5 => 'negative', .5 => 'half', ), - + /*3*/ 'extreme floats' => array( 12.3456789000e6 => 'large', 12.3456789000E-10 => 'small', @@ -50,7 +50,7 @@ $inputs = array( /*4*/ 'null uppercase' => array( NULL => 'null 1', ), - + /*5*/ 'null lowercase' => array( null => 'null 2', ), @@ -60,17 +60,17 @@ $inputs = array( true => 'lowert', false => 'lowerf', ), - + /*7*/ 'bool uppercase' => array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*8*/ 'empty double quotes' => array( "" => 'emptyd', ), - + /*9*/ 'empty single quotes' => array( '' => 'emptys', ), diff --git a/ext/standard/tests/array/end.phpt b/ext/standard/tests/array/end.phpt index 3dfe1e821e..adf9fcecdc 100644 --- a/ext/standard/tests/array/end.phpt +++ b/ext/standard/tests/array/end.phpt @@ -29,14 +29,14 @@ $arrays = array ( array(0x7FFFFFFF, -0x80000000, 017777777777, -020000000000 ), array(-.6700000E+3, -4.10003E+3, 1e-5, -1E+5, 000002.00 ) ); -/* loop through $arrays to print the last element of each sub-array */ +/* loop through $arrays to print the last element of each sub-array */ echo "*** Testing end() on different arrays ***\n"; $counter = 1; foreach ($arrays as $sub_array){ echo "-- Iteration $counter --\n"; var_dump( end($sub_array) ); /* ensure that internal pointer is moved to last element */ - var_dump( current($sub_array) ); + var_dump( current($sub_array) ); $counter++; } @@ -55,14 +55,14 @@ echo "\n-- Remove first element from array --\n"; unset($array_test[0]); var_dump( end($array_test) ); -// remove last element from array, rewind and check end() +// remove last element from array, rewind and check end() echo "\n-- Remove last element from array --\n"; unset($array_test['-.008']); var_dump( end($array_test) ); reset( $array_test ); var_dump( end($array_test) ); -// remove any element !first, !last, rewind and check end() +// remove any element !first, !last, rewind and check end() echo "\n-- Remove any element from array apart from first and last element --\n"; unset($array_test[7]); var_dump( end($array_test) ); diff --git a/ext/standard/tests/array/end_64bit.phpt b/ext/standard/tests/array/end_64bit.phpt index fbda85ea01..cbb5e0332a 100644 --- a/ext/standard/tests/array/end_64bit.phpt +++ b/ext/standard/tests/array/end_64bit.phpt @@ -29,14 +29,14 @@ $arrays = array ( array(0x7FFFFFFF, -0x80000000, 017777777777, -020000000000 ), array(-.6700000E+3, -4.10003E+3, 1e-5, -1E+5, 000002.00 ) ); -/* loop through $arrays to print the last element of each sub-array */ +/* loop through $arrays to print the last element of each sub-array */ echo "*** Testing end() on different arrays ***\n"; $counter = 1; foreach ($arrays as $sub_array){ echo "-- Iteration $counter --\n"; var_dump( end($sub_array) ); /* ensure that internal pointer is moved to last element */ - var_dump( current($sub_array) ); + var_dump( current($sub_array) ); $counter++; } @@ -55,14 +55,14 @@ echo "\n-- Remove first element from array --\n"; unset($array_test[0]); var_dump( end($array_test) ); -// remove last element from array, rewind and check end() +// remove last element from array, rewind and check end() echo "\n-- Remove last element from array --\n"; unset($array_test['-.008']); var_dump( end($array_test) ); reset( $array_test ); var_dump( end($array_test) ); -// remove any element !first, !last, rewind and check end() +// remove any element !first, !last, rewind and check end() echo "\n-- Remove any element from array apart from first and last element --\n"; unset($array_test[7]); var_dump( end($array_test) ); diff --git a/ext/standard/tests/array/end_variation1.phpt b/ext/standard/tests/array/end_variation1.phpt index a6f5ac1d1b..259c55b747 100644 --- a/ext/standard/tests/array/end_variation1.phpt +++ b/ext/standard/tests/array/end_variation1.phpt @@ -59,7 +59,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -69,7 +69,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/array/extract_error.phpt b/ext/standard/tests/array/extract_error.phpt index d7e5fd7ac5..46b71a1466 100644 --- a/ext/standard/tests/array/extract_error.phpt +++ b/ext/standard/tests/array/extract_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test extract() function (error conditions) +Test extract() function (error conditions) --FILE-- <?php diff --git a/ext/standard/tests/array/extract_variation1.phpt b/ext/standard/tests/array/extract_variation1.phpt index 0e66c0e091..0560e9e9c9 100644 --- a/ext/standard/tests/array/extract_variation1.phpt +++ b/ext/standard/tests/array/extract_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test extract() function (variation 1) +Test extract() function (variation 1) --FILE-- <?php diff --git a/ext/standard/tests/array/extract_variation2.phpt b/ext/standard/tests/array/extract_variation2.phpt index 5483fa0c9d..72ce83e675 100644 --- a/ext/standard/tests/array/extract_variation2.phpt +++ b/ext/standard/tests/array/extract_variation2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test extract() function (variation 2) +Test extract() function (variation 2) --FILE-- <?php diff --git a/ext/standard/tests/array/extract_variation3.phpt b/ext/standard/tests/array/extract_variation3.phpt index 1a6a088646..17f2370947 100644 --- a/ext/standard/tests/array/extract_variation3.phpt +++ b/ext/standard/tests/array/extract_variation3.phpt @@ -1,5 +1,5 @@ --TEST-- -Test extract() function (variation 3) +Test extract() function (variation 3) --FILE-- <?php diff --git a/ext/standard/tests/array/extract_variation4.phpt b/ext/standard/tests/array/extract_variation4.phpt index 31adb6e814..5066193810 100644 --- a/ext/standard/tests/array/extract_variation4.phpt +++ b/ext/standard/tests/array/extract_variation4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test extract() function (variation 4) +Test extract() function (variation 4) --FILE-- <?php diff --git a/ext/standard/tests/array/extract_variation5.phpt b/ext/standard/tests/array/extract_variation5.phpt index f4455e9e57..d9bee0f276 100644 --- a/ext/standard/tests/array/extract_variation5.phpt +++ b/ext/standard/tests/array/extract_variation5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test extract() function (variation 5) +Test extract() function (variation 5) --FILE-- <?php diff --git a/ext/standard/tests/array/extract_variation6.phpt b/ext/standard/tests/array/extract_variation6.phpt index 0c2243949a..fba1e97b83 100644 --- a/ext/standard/tests/array/extract_variation6.phpt +++ b/ext/standard/tests/array/extract_variation6.phpt @@ -1,5 +1,5 @@ --TEST-- -Test extract() function (variation 6) +Test extract() function (variation 6) --FILE-- <?php diff --git a/ext/standard/tests/array/extract_variation7.phpt b/ext/standard/tests/array/extract_variation7.phpt index 8104450df2..1502a52380 100644 --- a/ext/standard/tests/array/extract_variation7.phpt +++ b/ext/standard/tests/array/extract_variation7.phpt @@ -1,5 +1,5 @@ --TEST-- -Test extract() function (variation 7) +Test extract() function (variation 7) --FILE-- <?php diff --git a/ext/standard/tests/array/extract_variation8.phpt b/ext/standard/tests/array/extract_variation8.phpt index de9271a1cb..a5e3a00eb6 100644 --- a/ext/standard/tests/array/extract_variation8.phpt +++ b/ext/standard/tests/array/extract_variation8.phpt @@ -1,5 +1,5 @@ --TEST-- -Test extract() function (variation 8) +Test extract() function (variation 8) --FILE-- <?php diff --git a/ext/standard/tests/array/extract_variation9.phpt b/ext/standard/tests/array/extract_variation9.phpt index 4d42a69762..1d4518bdf4 100644 --- a/ext/standard/tests/array/extract_variation9.phpt +++ b/ext/standard/tests/array/extract_variation9.phpt @@ -1,5 +1,5 @@ --TEST-- -Test extract() function (variation 9) +Test extract() function (variation 9) --FILE-- <?php /* Using Class and objects */ diff --git a/ext/standard/tests/array/in_array_variation1.phpt b/ext/standard/tests/array/in_array_variation1.phpt index 45f18d0a10..317d153625 100644 --- a/ext/standard/tests/array/in_array_variation1.phpt +++ b/ext/standard/tests/array/in_array_variation1.phpt @@ -20,7 +20,7 @@ $arrays = array ( array(TRUE, FALSE), array("", array()), array("abcd\x00abcd\x00abcd"), - array("abcd\tabcd\nabcd\rabcd\0abcdefghij") + array("abcd\tabcd\nabcd\rabcd\0abcdefghij") ); $array_compare = array ( @@ -50,15 +50,15 @@ foreach($arrays as $array) { foreach($array_compare as $compare) { echo "-- Iteration $counter --\n"; //strict option OFF - var_dump(in_array($compare,$array)); + var_dump(in_array($compare,$array)); //strict option ON - var_dump(in_array($compare,$array,TRUE)); + var_dump(in_array($compare,$array,TRUE)); //strict option OFF - var_dump(in_array($compare,$array,FALSE)); + var_dump(in_array($compare,$array,FALSE)); $counter++; } } - + echo "Done\n"; ?> --EXPECT-- diff --git a/ext/standard/tests/array/in_array_variation2.phpt b/ext/standard/tests/array/in_array_variation2.phpt index 1f42bb3f07..d32df1c748 100644 --- a/ext/standard/tests/array/in_array_variation2.phpt +++ b/ext/standard/tests/array/in_array_variation2.phpt @@ -16,10 +16,10 @@ $misc_array = array ( 'a', 'key' =>'d', 3, - ".001" =>-67, + ".001" =>-67, "-.051" =>"k", 0.091 =>"-.08", - "e" =>"5", + "e" =>"5", "y" =>NULL, NULL =>"", 0, @@ -39,11 +39,11 @@ $counter = 1; foreach($array_type as $type) { echo "-- Iteration $counter --\n"; //loose type checking - var_dump( in_array($type,$misc_array ) ); + var_dump( in_array($type,$misc_array ) ); //strict type checking - var_dump( in_array($type,$misc_array,true) ); + var_dump( in_array($type,$misc_array,true) ); //loose type checking - var_dump( in_array($type,$misc_array,false) ); + var_dump( in_array($type,$misc_array,false) ); $counter++; } diff --git a/ext/standard/tests/array/in_array_variation3.phpt b/ext/standard/tests/array/in_array_variation3.phpt index c8b6445cd1..9ecd334b9b 100644 --- a/ext/standard/tests/array/in_array_variation3.phpt +++ b/ext/standard/tests/array/in_array_variation3.phpt @@ -14,7 +14,7 @@ Test in_array() function : usage variations - haystack as sub-array/object /* checking for sub-arrays with in_array() */ echo "*** Testing sub-arrays with in_array() ***\n"; $sub_array = array ( - "one", + "one", array(1, 2 => "two", "three" => 3), 4 => "four", "five" => 5, @@ -22,7 +22,7 @@ $sub_array = array ( ); var_dump( in_array("four", $sub_array) ); //checking for element in a sub-array -var_dump( in_array(3, $sub_array[1]) ); +var_dump( in_array(3, $sub_array[1]) ); var_dump( in_array(array('','i'), $sub_array) ); /* checking for objects in in_array() */ @@ -36,11 +36,11 @@ class in_array_check { $in_array_obj = new in_array_check(); //creating new object //error: as wrong datatype for second argument -var_dump( in_array("array_var", $in_array_obj) ); +var_dump( in_array("array_var", $in_array_obj) ); //error: as wrong datatype for second argument -var_dump( in_array("foo", $in_array_obj) ); +var_dump( in_array("foo", $in_array_obj) ); //element found as "one" exists in array $array_var -var_dump( in_array("one", $in_array_obj->array_var) ); +var_dump( in_array("one", $in_array_obj->array_var) ); echo "Done\n"; ?> diff --git a/ext/standard/tests/array/in_array_variation4.phpt b/ext/standard/tests/array/in_array_variation4.phpt index 8301571940..eeebee978d 100644 --- a/ext/standard/tests/array/in_array_variation4.phpt +++ b/ext/standard/tests/array/in_array_variation4.phpt @@ -23,37 +23,37 @@ $dir_handle = opendir( dirname(__FILE__) ); $resources = array($file_handle, $dir_handle); // search for resouce type in the resource array -var_dump( in_array($file_handle, $resources, true) ); +var_dump( in_array($file_handle, $resources, true) ); //checking for (int) type resource -var_dump( in_array((int)$dir_handle, $resources, true) ); +var_dump( in_array((int)$dir_handle, $resources, true) ); /* Miscellenous input check */ echo "\n*** Testing miscelleneos inputs with in_array() ***\n"; //matching "Good" in array(0,"hello"), result:true in loose type check -var_dump( in_array("Good", array(0,"hello")) ); +var_dump( in_array("Good", array(0,"hello")) ); //false in strict mode -var_dump( in_array("Good", array(0,"hello"), TRUE) ); +var_dump( in_array("Good", array(0,"hello"), TRUE) ); //matching integer 0 in array("this"), result:true in loose type check -var_dump( in_array(0, array("this")) ); +var_dump( in_array(0, array("this")) ); // false in strict mode -var_dump( in_array(0, array("this")),TRUE ); +var_dump( in_array(0, array("this")),TRUE ); //matching string "this" in array(0), result:true in loose type check -var_dump( in_array("this", array(0)) ); +var_dump( in_array("this", array(0)) ); // false in stric mode -var_dump( in_array("this", array(0), TRUE) ); +var_dump( in_array("this", array(0), TRUE) ); //checking for type FALSE in multidimensional array with loose checking, result:false in loose type check var_dump( in_array(FALSE, array("a"=> TRUE, "b"=> TRUE, - array("c"=> TRUE, "d"=>TRUE) - ) - ) - ); + array("c"=> TRUE, "d"=>TRUE) + ) + ) + ); //matching string having integer in beginning, result:true in loose type check -var_dump( in_array('123abc', array(123)) ); +var_dump( in_array('123abc', array(123)) ); var_dump( in_array('123abc', array(123), TRUE) ); // false in strict mode echo "Done\n"; diff --git a/ext/standard/tests/array/key_exists_basic.phpt b/ext/standard/tests/array/key_exists_basic.phpt index ebb5c25dd2..510ec09dcc 100644 --- a/ext/standard/tests/array/key_exists_basic.phpt +++ b/ext/standard/tests/array/key_exists_basic.phpt @@ -6,7 +6,7 @@ Francesco Fullone ff@ideato.it --FILE-- <?php echo "*** test key_exists() by calling it with its expected arguments ***\n"; -$a = array('bar' => 1); +$a = array('bar' => 1); var_dump(key_exists('bar', $a)); var_dump(key_exists('foo', $a)); --EXPECT-- diff --git a/ext/standard/tests/array/key_exists_error.phpt b/ext/standard/tests/array/key_exists_error.phpt index 1bbd41e20e..a1af3910ba 100644 --- a/ext/standard/tests/array/key_exists_error.phpt +++ b/ext/standard/tests/array/key_exists_error.phpt @@ -8,7 +8,7 @@ Francesco Fullone ff@ideato.it echo "*** Test by calling method or function with incorrect numbers of arguments ***\n"; -$a = array('bar' => 1); +$a = array('bar' => 1); var_dump(key_exists()); var_dump(key_exists('foo', $a, 'baz')); diff --git a/ext/standard/tests/array/key_exists_variation1.phpt b/ext/standard/tests/array/key_exists_variation1.phpt index 65031f8240..490d564246 100644 --- a/ext/standard/tests/array/key_exists_variation1.phpt +++ b/ext/standard/tests/array/key_exists_variation1.phpt @@ -6,7 +6,7 @@ Francesco Fullone ff@ideato.it --FILE-- <?php echo "*** test key_exists() by calling it with its expected arguments ***\n"; -$a = array('bar' => 1, 'foo' => array('bar' => 2, 'baz' => 3)); +$a = array('bar' => 1, 'foo' => array('bar' => 2, 'baz' => 3)); var_dump(key_exists('baz', $a)); var_dump(key_exists('baz', $a['foo'])); --EXPECT-- diff --git a/ext/standard/tests/array/key_exists_variation2.phpt b/ext/standard/tests/array/key_exists_variation2.phpt index 3409f36455..a6f82181d3 100644 --- a/ext/standard/tests/array/key_exists_variation2.phpt +++ b/ext/standard/tests/array/key_exists_variation2.phpt @@ -8,25 +8,25 @@ Francesco Fullone ff@ideato.it echo "*** test key_exists() by using mixed type of arrays ***\n"; // there is not a index = 0 element -$a = array(1 => 'bar', 'foo' => 'baz'); +$a = array(1 => 'bar', 'foo' => 'baz'); var_dump(key_exists(0, $a)); echo "integer\n"; // 1 has index = 0 -$b = array(1, 'foo' => 'baz'); +$b = array(1, 'foo' => 'baz'); var_dump(key_exists(0, $b)); // 42 has index = 0, netherless its position is the latest -$c = array('foo' => 'baz', 42); +$c = array('foo' => 'baz', 42); var_dump(key_exists(0, $c)); echo "string\n"; // 'bar' has index = 0, netherless it is a string -$d = array('bar', 'foo' => 'baz'); +$d = array('bar', 'foo' => 'baz'); var_dump(key_exists(0, $d)); // 'baz' has index = 0, netherless its position is the latest -$e = array('foo' => 'baz', 'baz'); +$e = array('foo' => 'baz', 'baz'); var_dump(key_exists(0, $e)); echo "obj\n"; @@ -38,21 +38,21 @@ class ObjectA $obj = new ObjectA(); // object has index = 0, netherless its position is the latest -$f = array('foo' => 'baz', $obj); +$f = array('foo' => 'baz', $obj); var_dump(key_exists(0, $f)); // object has index = 0, netherless its position is the first -$g = array($obj, 'foo' => 'baz'); +$g = array($obj, 'foo' => 'baz'); var_dump(key_exists(0, $g)); echo "stream resource\n"; // stream resource has index = 0, netherless its position is the first $st = fopen('php://memory', '+r'); -$h = array($st, 'foo' => 'baz'); +$h = array($st, 'foo' => 'baz'); var_dump(key_exists(0, $h)); // stream resource has index = 0, netherless its position is the latest -$i = array('foo' => 'baz', $st); +$i = array('foo' => 'baz', $st); var_dump(key_exists(0, $i)); --EXPECT-- diff --git a/ext/standard/tests/array/key_variation1.phpt b/ext/standard/tests/array/key_variation1.phpt index 9beb03e76b..148c4d8400 100644 --- a/ext/standard/tests/array/key_variation1.phpt +++ b/ext/standard/tests/array/key_variation1.phpt @@ -59,7 +59,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -69,7 +69,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/array/key_variation2.phpt b/ext/standard/tests/array/key_variation2.phpt index 912f9a69cb..c34a1154c7 100644 --- a/ext/standard/tests/array/key_variation2.phpt +++ b/ext/standard/tests/array/key_variation2.phpt @@ -39,7 +39,7 @@ $inputs = array( -10.5 => 'negative', .5 => 'half', ), - + /*3*/ 'extreme floats' => array( 12.3456789000e6 => 'large', 12.3456789000E-10 => 'small', @@ -49,7 +49,7 @@ $inputs = array( /*4*/ 'null uppercase' => array( NULL => 'null 1', ), - + /*5*/ 'null lowercase' => array( null => 'null 2', ), @@ -59,17 +59,17 @@ $inputs = array( true => 'lowert', false => 'lowerf', ), - + /*7*/ 'bool uppercase' => array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*8*/ 'empty double quotes' => array( "" => 'emptyd', ), - + /*9*/ 'empty single quotes' => array( '' => 'emptys', ), diff --git a/ext/standard/tests/array/krsort_basic.phpt b/ext/standard/tests/array/krsort_basic.phpt index 6a3a40e3ad..ad7b3b9787 100644 --- a/ext/standard/tests/array/krsort_basic.phpt +++ b/ext/standard/tests/array/krsort_basic.phpt @@ -19,7 +19,7 @@ Test krsort() function : basic functionality echo "*** Testing krsort() : basic functionality ***\n"; // an array containing unsorted string values with indices -$unsorted_strings = array( "lemon" => "l", "orange" => "o", "banana" => "b" ); +$unsorted_strings = array( "lemon" => "l", "orange" => "o", "banana" => "b" ); $unsorted_strings = array( "l" => "lemon", "o" => "orange", "O" => "Orange", "O1" => "Orange1", "o2" => "orange2", "O3" => "Orange3", "o20" => "orange20", diff --git a/ext/standard/tests/array/krsort_error.phpt b/ext/standard/tests/array/krsort_error.phpt index 1bca5f928d..b28d44c057 100644 --- a/ext/standard/tests/array/krsort_error.phpt +++ b/ext/standard/tests/array/krsort_error.phpt @@ -28,7 +28,7 @@ foreach($flags as $key => $flag){ echo "\n- Sort flag = $key -\n"; $temp_array = $array_arg; var_dump( krsort($temp_array,$flag, $extra_arg) ); - var_dump($temp_array); + var_dump($temp_array); } echo "Done"; diff --git a/ext/standard/tests/array/krsort_object.phpt b/ext/standard/tests/array/krsort_object.phpt index 6236595796..a1ddd8de29 100644 --- a/ext/standard/tests/array/krsort_object.phpt +++ b/ext/standard/tests/array/krsort_object.phpt @@ -41,14 +41,14 @@ class StringObject } // array of integer objects with different key values -$unsorted_int_obj = array ( +$unsorted_int_obj = array ( 10 => new IntegerObject(11), 20 => new IntegerObject(66), 3 => new IntegerObject(23), 4 => new IntegerObject(-5), 50 => new IntegerObject(0.001), 6 => new IntegerObject(0) ); // array of string objects with different key values -$unsorted_str_obj = array ( +$unsorted_str_obj = array ( "axx" => new StringObject("axx"), "t" => new StringObject("t"), "w" => new StringObject("w"), "py" => new StringObject("py"), "apple" => new StringObject("apple"), "Orange" => new StringObject("Orange"), diff --git a/ext/standard/tests/array/krsort_variation1.phpt b/ext/standard/tests/array/krsort_variation1.phpt index 86d6a3eacb..8b44de314e 100644 --- a/ext/standard/tests/array/krsort_variation1.phpt +++ b/ext/standard/tests/array/krsort_variation1.phpt @@ -74,7 +74,7 @@ $unexpected_values = array ( // loop though each element of the array and check the working of krsort() // when $array argument is supplied with different values from $unexpected_values echo "\n-- Testing krsort() by supplying different unexpected values for 'array' argument --\n"; -echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; +echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; $counter = 1; for($index = 0; $index < count($unexpected_values); $index ++) { diff --git a/ext/standard/tests/array/krsort_variation10.phpt b/ext/standard/tests/array/krsort_variation10.phpt index 467fb88e4d..102e6fd1f7 100644 --- a/ext/standard/tests/array/krsort_variation10.phpt +++ b/ext/standard/tests/array/krsort_variation10.phpt @@ -32,7 +32,7 @@ Test this!!! EOT; $array = array ( - $simple_heredoc1 => "Heredoc", + $simple_heredoc1 => "Heredoc", $simple_heredoc2 => "HEREDOC", $multiline_heredoc => "heredoc string\twith!@# and 123\nTest this!!!" ); diff --git a/ext/standard/tests/array/krsort_variation2.phpt b/ext/standard/tests/array/krsort_variation2.phpt index fc113ff30a..ee97794bd5 100644 --- a/ext/standard/tests/array/krsort_variation2.phpt +++ b/ext/standard/tests/array/krsort_variation2.phpt @@ -77,7 +77,7 @@ for($index = 0; $index < count($unexpected_values); $index ++) { echo "-- Iteration $counter --\n"; $value = $unexpected_values [$index]; $temp_array = $unsorted_values; - var_dump( krsort($temp_array, $value) ); + var_dump( krsort($temp_array, $value) ); var_dump($temp_array); $counter++; } diff --git a/ext/standard/tests/array/krsort_variation3.phpt b/ext/standard/tests/array/krsort_variation3.phpt index 0707c610cb..cc3eabf1e7 100644 --- a/ext/standard/tests/array/krsort_variation3.phpt +++ b/ext/standard/tests/array/krsort_variation3.phpt @@ -40,20 +40,20 @@ echo "\n-- Testing krsort() by supplying various integer/float arrays --\n"; foreach ($various_arrays as $array) { echo "\n-- Iteration $count --\n"; - echo "- With defualt sort flag -\n"; - $temp_array = $array; + echo "- With defualt sort flag -\n"; + $temp_array = $array; var_dump(krsort($temp_array) ); var_dump($temp_array); // loop through $flags array and call krsort() with all possible sort flag values foreach($flags as $key => $flag){ echo "- Sort flag = $key -\n"; - $temp_array = $array; + $temp_array = $array; var_dump(krsort($temp_array, $flag) ); var_dump($temp_array); - } + } $count++; -} +} echo "Done\n"; ?> diff --git a/ext/standard/tests/array/krsort_variation5.phpt b/ext/standard/tests/array/krsort_variation5.phpt index 2fa16c6e73..3af411135c 100644 --- a/ext/standard/tests/array/krsort_variation5.phpt +++ b/ext/standard/tests/array/krsort_variation5.phpt @@ -24,13 +24,13 @@ echo "*** Testing krsort() : usage variations ***\n"; $various_arrays = array ( // diff. escape sequence chars with key values - array ( null => null, NULL => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", - "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", + array ( null => null, NULL => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", + "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", "\ddd" => "\ddd", "\v" => "\v" ), // array containing different strings with key values - array ( 'Lemon' => "lemoN", 'o' => "Orange", 'B' => "banana", 'Apple' => "apple", 'te' => "Test", + array ( 'Lemon' => "lemoN", 'o' => "Orange", 'B' => "banana", 'Apple' => "apple", 'te' => "Test", 't' => "TTTT", 'T' => "ttt", 'W' => "ww", 'X' => "x", 'x' => "X", 'O' => "oraNGe", 'B' => "BANANA" ) diff --git a/ext/standard/tests/array/krsort_variation6.phpt b/ext/standard/tests/array/krsort_variation6.phpt index 72f4e41720..da5b047e24 100644 --- a/ext/standard/tests/array/krsort_variation6.phpt +++ b/ext/standard/tests/array/krsort_variation6.phpt @@ -18,7 +18,7 @@ Test krsort() function : usage variations - sort hexadecimal values echo "*** Testing krsort() : usage variations ***\n"; // an array containing unsorted hexadecimal values with keys -$unsorted_hex_array = array ( +$unsorted_hex_array = array ( 0x1AB => 0x1AB, 0xFFF => 0xFFF, 0xF => 0xF, 0xFF => 0xFF, 0x2AA => 0x2AA, 0xBB => 0xBB, 0x1ab => 0x1ab, 0xff => 0xff, -0xff => -0xFF, 0 => 0, -0x2aa => -0x2aa ); diff --git a/ext/standard/tests/array/krsort_variation7.phpt b/ext/standard/tests/array/krsort_variation7.phpt index b0512935dc..b12f017eb8 100644 --- a/ext/standard/tests/array/krsort_variation7.phpt +++ b/ext/standard/tests/array/krsort_variation7.phpt @@ -38,8 +38,8 @@ echo "\n-- Testing krsort() by supplying various arrays containing sub arrays -- // loop through to test krsort() with different arrays foreach ($various_arrays as $array) { - - echo "\n-- Iteration $count --\n"; + + echo "\n-- Iteration $count --\n"; echo "- With defualt sort flag -\n"; $temp_array = $array; var_dump( krsort($temp_array) ); diff --git a/ext/standard/tests/array/ksort_object.phpt b/ext/standard/tests/array/ksort_object.phpt index 2d76026aa4..4678b5dda8 100644 --- a/ext/standard/tests/array/ksort_object.phpt +++ b/ext/standard/tests/array/ksort_object.phpt @@ -42,14 +42,14 @@ class StringObject } // array of integer objects -$unsorted_int_obj = array ( +$unsorted_int_obj = array ( 11 => new IntegerObject(11), 66 => new IntegerObject(66), 23 => new IntegerObject(23), -5 => new IntegerObject(-5), 1 => new IntegerObject(0.001), 0 => new IntegerObject(0) ); // array of string objects -$unsorted_str_obj = array ( +$unsorted_str_obj = array ( "axx" => new StringObject("axx"), "t" => new StringObject("t"), "w" => new StringObject("w"), "py" => new StringObject("py"), "apple" => new StringObject("apple"), "Orange" => new StringObject("Orange"), diff --git a/ext/standard/tests/array/ksort_variation1.phpt b/ext/standard/tests/array/ksort_variation1.phpt index d11c9a5290..185fac760c 100644 --- a/ext/standard/tests/array/ksort_variation1.phpt +++ b/ext/standard/tests/array/ksort_variation1.phpt @@ -74,7 +74,7 @@ $unexpected_values = array ( // loop though each element of the array and check the working of ksort() // when $array argument is supplied with different values from $unexpected_values echo "\n-- Testing ksort() by supplying different unexpected values for 'array' argument --\n"; -echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; +echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; $counter = 1; for($index = 0; $index < count($unexpected_values); $index ++) { diff --git a/ext/standard/tests/array/ksort_variation10.phpt b/ext/standard/tests/array/ksort_variation10.phpt index 844685b36a..2e08991d79 100644 --- a/ext/standard/tests/array/ksort_variation10.phpt +++ b/ext/standard/tests/array/ksort_variation10.phpt @@ -17,8 +17,8 @@ Test ksort() function : usage variations - sort octal values echo "*** Testing ksort() : usage variations ***\n"; // an array containing unsorted octal values -$unsorted_oct_array = array ( - 01235 => 01, 0321 => 02, 0345 => 03, 066 => 04, 0772 => 05, +$unsorted_oct_array = array ( + 01235 => 01, 0321 => 02, 0345 => 03, 066 => 04, 0772 => 05, 077 => 06, -066 => -01, -0345 => -02, 0 => 0 ); diff --git a/ext/standard/tests/array/ksort_variation11.phpt b/ext/standard/tests/array/ksort_variation11.phpt index 758821303b..243e3b171f 100644 --- a/ext/standard/tests/array/ksort_variation11.phpt +++ b/ext/standard/tests/array/ksort_variation11.phpt @@ -32,7 +32,7 @@ Test this!!! EOT; $array = array ( - $simple_heredoc1 => "Heredoc", + $simple_heredoc1 => "Heredoc", $simple_heredoc2 => "HEREDOC", $multiline_heredoc => "heredoc string\twith!@# and 123\nTest this!!!" ); diff --git a/ext/standard/tests/array/ksort_variation2.phpt b/ext/standard/tests/array/ksort_variation2.phpt index fb1371a985..57975d8c28 100644 --- a/ext/standard/tests/array/ksort_variation2.phpt +++ b/ext/standard/tests/array/ksort_variation2.phpt @@ -77,7 +77,7 @@ for($index = 0; $index < count($unexpected_values); $index ++) { echo "-- Iteration $counter --\n"; $value = $unexpected_values [$index]; $temp_array = $unsorted_values; - var_dump( ksort($temp_array, $value) ); + var_dump( ksort($temp_array, $value) ); var_dump($temp_array); $counter++; } diff --git a/ext/standard/tests/array/ksort_variation3.phpt b/ext/standard/tests/array/ksort_variation3.phpt index 691672f780..e51ad0a85f 100644 --- a/ext/standard/tests/array/ksort_variation3.phpt +++ b/ext/standard/tests/array/ksort_variation3.phpt @@ -26,7 +26,7 @@ $various_arrays = array( array(1.0 => 10.5, 0.2 => -10.5, 3.1 => 10.5e2, 4 => 10.6E-2, .5 => .5, 6 => .0001, -7 => -.1), // mixed value array with different types of keys - array(1 => .0001, 2 => .0021, -3 => -.01, 4 => -1, 5 => 0, 6 => .09, 7 => 2, -8 => -.9, + array(1 => .0001, 2 => .0021, -3 => -.01, 4 => -1, 5 => 0, 6 => .09, 7 => 2, -8 => -.9, 9 => 10.6E-2, -10 => -10.6E-2, 11 => 33) ); @@ -40,20 +40,20 @@ echo "\n-- Testing ksort() by supplying various integer/float arrays --\n"; foreach ($various_arrays as $array) { echo "\n-- Iteration $count --\n"; - echo "- With defualt sort flag -\n"; - $temp_array = $array; + echo "- With defualt sort flag -\n"; + $temp_array = $array; var_dump(ksort($temp_array) ); var_dump($temp_array); // loop through $flags array and call ksort() with all possible sort flag values foreach($flags as $key => $flag){ echo "- Sort flag = $key -\n"; - $temp_array = $array; + $temp_array = $array; var_dump(ksort($temp_array, $flag) ); var_dump($temp_array); - } + } $count++; -} +} echo "Done\n"; ?> diff --git a/ext/standard/tests/array/ksort_variation5.phpt b/ext/standard/tests/array/ksort_variation5.phpt index bc0c4be3b8..7951c45eb5 100644 --- a/ext/standard/tests/array/ksort_variation5.phpt +++ b/ext/standard/tests/array/ksort_variation5.phpt @@ -24,13 +24,13 @@ echo "*** Testing ksort() : usage variations ***\n"; $various_arrays = array ( // diff. escape sequence chars with key values - array ( null => null, NULL => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", - "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", + array ( null => null, NULL => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", + "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", "\ddd" => "\ddd", "\v" => "\v" ), // array containing different strings with key values - array ( 'Lemon' => "lemoN", 'o' => "Orange", 'B' => "banana", 'Apple' => "apple", 'te' => "Test", + array ( 'Lemon' => "lemoN", 'o' => "Orange", 'B' => "banana", 'Apple' => "apple", 'te' => "Test", 't' => "TTTT", 'T' => "ttt", 'W' => "ww", 'X' => "x", 'x' => "X", 'O' => "oraNGe", 'B' => "BANANA" ) diff --git a/ext/standard/tests/array/ksort_variation6.phpt b/ext/standard/tests/array/ksort_variation6.phpt index 32fd973d8f..48218b2eda 100644 --- a/ext/standard/tests/array/ksort_variation6.phpt +++ b/ext/standard/tests/array/ksort_variation6.phpt @@ -18,7 +18,7 @@ echo "*** Testing ksort() : usage variations ***\n"; // an array containng unsorted hexadecimal values with keys // There are multiple keys which are duplicate and the later should be picked -$unsorted_hex_array = array ( +$unsorted_hex_array = array ( 0x1AB => 0x1AB, 0xFFF => 0xFFF, 0xF => 0xF, 0xFF => 0xFF, 0x2AA => 0x2AA, 0xBB => 0xBB, 0x1ab => 0x1ab, 0xff => 0xff, -0xff => -0xFF, 0 => 0, -0x2aa => -0x2aa ); diff --git a/ext/standard/tests/array/ksort_variation7.phpt b/ext/standard/tests/array/ksort_variation7.phpt index 18dc3a03ab..6c7f3b870e 100644 --- a/ext/standard/tests/array/ksort_variation7.phpt +++ b/ext/standard/tests/array/ksort_variation7.phpt @@ -38,8 +38,8 @@ echo "\n-- Testing ksort() by supplying various arrays containing sub arrays --\ // loop through to test ksort() with different arrays foreach ($various_arrays as $array) { - - echo "\n-- Iteration $count --\n"; + + echo "\n-- Iteration $count --\n"; echo "- With defualt sort flag -\n"; $temp_array = $array; var_dump( ksort($temp_array) ); diff --git a/ext/standard/tests/array/max.phpt b/ext/standard/tests/array/max.phpt index 555d2d04c8..ae4f304eae 100644 --- a/ext/standard/tests/array/max.phpt +++ b/ext/standard/tests/array/max.phpt @@ -19,7 +19,7 @@ var_dump(max(0, true, false, true)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: max() expects at least 1 parameter, 0 given in %s on line 3 NULL diff --git a/ext/standard/tests/array/max_basic.phpt b/ext/standard/tests/array/max_basic.phpt index f304212293..c880810cb3 100644 --- a/ext/standard/tests/array/max_basic.phpt +++ b/ext/standard/tests/array/max_basic.phpt @@ -2,10 +2,10 @@ Test return type and value for expected input max() --FILE-- <?php -/* +/* * proto mixed max(mixed arg1 [, mixed arg2 [, mixed ...]]) * Function is implemented in ext/standard/array.c -*/ +*/ echo "\n*** Testing sequences of numbers ***\n"; diff --git a/ext/standard/tests/array/max_basiclong_64bit.phpt b/ext/standard/tests/array/max_basiclong_64bit.phpt index 1eb7e31cdc..95116b16c2 100644 --- a/ext/standard/tests/array/max_basiclong_64bit.phpt +++ b/ext/standard/tests/array/max_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -MAX_64Bit - 1); @@ -25,8 +25,8 @@ $longVals = array( ); var_dump(max($arrayVals)); - var_dump(max($longVals)); - + var_dump(max($longVals)); + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/array/max_error.phpt b/ext/standard/tests/array/max_error.phpt index b20a3c08f6..a8736a3d88 100644 --- a/ext/standard/tests/array/max_error.phpt +++ b/ext/standard/tests/array/max_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for min() --FILE-- <?php -/* +/* * proto mixed min(mixed arg1 [, mixed arg2 [, mixed ...]]) * Function is implemented in ext/standard/array.c -*/ +*/ echo "\n*** Testing Error Conditions ***\n"; diff --git a/ext/standard/tests/array/max_variation1.phpt b/ext/standard/tests/array/max_variation1.phpt index a32ceb8fc2..44fa010c31 100644 --- a/ext/standard/tests/array/max_variation1.phpt +++ b/ext/standard/tests/array/max_variation1.phpt @@ -2,10 +2,10 @@ Test variations in usage of max() --FILE-- <?php -/* +/* * proto mixed max(mixed arg1 [, mixed arg2 [, mixed ...]]) * Function is implemented in ext/standard/array.c -*/ +*/ echo "\n*** Testing boundary conditions ***\n"; var_dump(max(2147483645, 2147483646) ); diff --git a/ext/standard/tests/array/max_variation2.phpt b/ext/standard/tests/array/max_variation2.phpt index 9abcda53c3..a020d5e422 100644 --- a/ext/standard/tests/array/max_variation2.phpt +++ b/ext/standard/tests/array/max_variation2.phpt @@ -2,10 +2,10 @@ Test variations in usage of max() --FILE-- <?php -/* +/* * proto mixed max(mixed arg1 [, mixed arg2 [, mixed ...]]) * Function is implemented in ext/standard/array.c -*/ +*/ echo "\n*** Testing arrays ***\n"; diff --git a/ext/standard/tests/array/min.phpt b/ext/standard/tests/array/min.phpt index 3a77ee8a0d..cb8c7cfdca 100644 --- a/ext/standard/tests/array/min.phpt +++ b/ext/standard/tests/array/min.phpt @@ -19,7 +19,7 @@ var_dump(min(0, true, false, true)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: min() expects at least 1 parameter, 0 given in %s on line 3 NULL diff --git a/ext/standard/tests/array/min_basic.phpt b/ext/standard/tests/array/min_basic.phpt index 34f853fedb..f76770f40d 100644 --- a/ext/standard/tests/array/min_basic.phpt +++ b/ext/standard/tests/array/min_basic.phpt @@ -2,10 +2,10 @@ Test return type and value for expected input min() --FILE-- <?php -/* +/* * proto mixed min(mixed arg1 [, mixed arg2 [, mixed ...]]) * Function is implemented in ext/standard/array.c -*/ +*/ echo "\n*** Testing sequences of numbers ***\n"; diff --git a/ext/standard/tests/array/min_basiclong_64bit.phpt b/ext/standard/tests/array/min_basiclong_64bit.phpt index 52f63f3916..526d77a27a 100644 --- a/ext/standard/tests/array/min_basiclong_64bit.phpt +++ b/ext/standard/tests/array/min_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -MAX_64Bit - 1); @@ -25,8 +25,8 @@ $longVals = array( ); var_dump(min($arrayVals)); - var_dump(min($longVals)); - + var_dump(min($longVals)); + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/array/min_error.phpt b/ext/standard/tests/array/min_error.phpt index dc472bc258..deb84f276d 100644 --- a/ext/standard/tests/array/min_error.phpt +++ b/ext/standard/tests/array/min_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for min() --FILE-- <?php -/* +/* * proto mixed min(mixed arg1 [, mixed arg2 [, mixed ...]]) * Function is implemented in ext/standard/array.c -*/ +*/ echo "\n*** Testing Error Conditions ***\n"; diff --git a/ext/standard/tests/array/min_variation1.phpt b/ext/standard/tests/array/min_variation1.phpt index 9e24bd66a1..a9c31f615f 100644 --- a/ext/standard/tests/array/min_variation1.phpt +++ b/ext/standard/tests/array/min_variation1.phpt @@ -2,10 +2,10 @@ Test variations in usage of min() --FILE-- <?php -/* +/* * proto mixed min(mixed arg1 [, mixed arg2 [, mixed ...]]) * Function is implemented in ext/standard/array.c -*/ +*/ echo "\n*** Testing boundary conditions ***\n"; var_dump(min(2147483645, 2147483646) ); diff --git a/ext/standard/tests/array/min_variation2.phpt b/ext/standard/tests/array/min_variation2.phpt index a8b215209f..eff810e869 100644 --- a/ext/standard/tests/array/min_variation2.phpt +++ b/ext/standard/tests/array/min_variation2.phpt @@ -2,10 +2,10 @@ Test variations in usage of min() --FILE-- <?php -/* +/* * proto mixed min(mixed arg1 [, mixed arg2 [, mixed ...]]) * Function is implemented in ext/standard/array.c -*/ +*/ echo "\n*** Testing arrays ***\n"; diff --git a/ext/standard/tests/array/natcasesort_object1.phpt b/ext/standard/tests/array/natcasesort_object1.phpt index aab98a45d8..ec733adaf9 100644 --- a/ext/standard/tests/array/natcasesort_object1.phpt +++ b/ext/standard/tests/array/natcasesort_object1.phpt @@ -32,7 +32,7 @@ class for_string_natcasesort // array of string objects -$unsorted_str_obj = array ( +$unsorted_str_obj = array ( new for_string_natcasesort("axx"), new for_string_natcasesort("t"), new for_string_natcasesort("w"), new for_string_natcasesort("py"), new for_string_natcasesort("apple"), new for_string_natcasesort("Orange"), diff --git a/ext/standard/tests/array/natcasesort_variation1.phpt b/ext/standard/tests/array/natcasesort_variation1.phpt index 1537550f4c..778d265b85 100644 --- a/ext/standard/tests/array/natcasesort_variation1.phpt +++ b/ext/standard/tests/array/natcasesort_variation1.phpt @@ -58,7 +58,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -68,7 +68,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/array/natcasesort_variation11.phpt b/ext/standard/tests/array/natcasesort_variation11.phpt index ac19cb3950..1f836df3c2 100644 --- a/ext/standard/tests/array/natcasesort_variation11.phpt +++ b/ext/standard/tests/array/natcasesort_variation11.phpt @@ -39,7 +39,7 @@ $inputs = array( -10.5 => 'negative', .5 => 'half', ), - + /*3*/ 'extreme floats' => array( 12.3456789000e6 => 'large', 12.3456789000E-10 => 'small', @@ -49,7 +49,7 @@ $inputs = array( /*4*/ 'null uppercase' => array( NULL => 'null 1', ), - + /*5*/ 'null lowercase' => array( null => 'null 2', ), @@ -59,17 +59,17 @@ $inputs = array( true => 'lowert', false => 'lowerf', ), - + /*7*/ 'bool uppercase' => array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*8*/ 'empty double quotes' => array( "" => 'emptyd', ), - + /*9*/ 'empty single quotes' => array( '' => 'emptys', ), @@ -90,14 +90,14 @@ $inputs = array( /*12*/ 'unset' => array( @$unset_var => 'unset', ), - + // duplicate values /*13*/ 'duplicate' => array( 'foo' => 'bar', 'baz' => 'bar', 'hello' => 'world' ), - + ); // loop through each element of $inputs to check the behavior of natcasesort() diff --git a/ext/standard/tests/array/natcasesort_variation2.phpt b/ext/standard/tests/array/natcasesort_variation2.phpt index 8a05c12f93..a38dbedfe4 100644 --- a/ext/standard/tests/array/natcasesort_variation2.phpt +++ b/ext/standard/tests/array/natcasesort_variation2.phpt @@ -67,13 +67,13 @@ $inputs = array( TRUE, FALSE, ), - + // empty data /*5*/ 'empty string' => array( "", '', ), - + /*6*/ 'empty array' => array( ), @@ -83,7 +83,7 @@ $inputs = array( 'string', $heredoc, ), - + // object data /*8*/ 'object' => array( new classA(), diff --git a/ext/standard/tests/array/natcasesort_variation3.phpt b/ext/standard/tests/array/natcasesort_variation3.phpt index be7495418d..6376524d5b 100644 --- a/ext/standard/tests/array/natcasesort_variation3.phpt +++ b/ext/standard/tests/array/natcasesort_variation3.phpt @@ -27,7 +27,7 @@ $inputs = array ( // mixed value array array(.0001, .0021, -.01, -1, 0, .09, 2, -.9, 10.6E-2, -10.6E-2, 33), - + // array values contains minimum and maximum ranges array(2147483647, 2147483648, -2147483647, -2147483648, -0, 0, -2147483649) ); diff --git a/ext/standard/tests/array/next_variation1.phpt b/ext/standard/tests/array/next_variation1.phpt index 027a521471..e5ce177375 100644 --- a/ext/standard/tests/array/next_variation1.phpt +++ b/ext/standard/tests/array/next_variation1.phpt @@ -58,7 +58,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -68,7 +68,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/array/prev_variation1.phpt b/ext/standard/tests/array/prev_variation1.phpt index 257206b410..1ac902b1f4 100644 --- a/ext/standard/tests/array/prev_variation1.phpt +++ b/ext/standard/tests/array/prev_variation1.phpt @@ -58,7 +58,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -68,7 +68,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/array/range.phpt b/ext/standard/tests/array/range.phpt index ebb496c74a..562335d099 100644 --- a/ext/standard/tests/array/range.phpt +++ b/ext/standard/tests/array/range.phpt @@ -13,13 +13,13 @@ var_dump( range(1, 10) ); echo "\n-- An array of elements from high to low --\n"; var_dump( range(10, 1) ); -echo "\n-- Numeric Strings as Low and High --\n"; +echo "\n-- Numeric Strings as Low and High --\n"; echo "-- An array of elements from low to high --\n"; var_dump( range("1", "10") ); echo "\n-- An array of elements from high to low --\n"; var_dump( range("10", "1") ); -echo "\n-- Chars as Low and High --\n"; +echo "\n-- Chars as Low and High --\n"; echo "-- An array of elements from low to high --\n"; var_dump( range("a", "z") ); echo "\n-- An array of elements from high to low --\n"; @@ -29,19 +29,19 @@ echo "\n-- Low and High are equal --\n"; var_dump( range(5, 5) ); var_dump( range("q", "q") ); -echo "\n-- floats as Low and High --\n"; +echo "\n-- floats as Low and High --\n"; var_dump( range(5.1, 10.1) ); var_dump( range(10.1, 5.1) ); var_dump( range("5.1", "10.1") ); var_dump( range("10.1", "5.1") ); -echo "\n-- Passing step with Low and High --\n"; +echo "\n-- Passing step with Low and High --\n"; var_dump( range(1, 2, 0.1) ); var_dump( range(2, 1, 0.1) ); var_dump( range(1, 2, "0.1") ); -var_dump( range("1", "2", 0.1) ); +var_dump( range("1", "2", 0.1) ); echo "\n-- Testing basic string with step --\n"; var_dump( range("abcd", "mnop", 2) ); diff --git a/ext/standard/tests/array/range_errors.phpt b/ext/standard/tests/array/range_errors.phpt index 45c30f5acf..b63e9874bf 100644 --- a/ext/standard/tests/array/range_errors.phpt +++ b/ext/standard/tests/array/range_errors.phpt @@ -7,7 +7,7 @@ precision=14 echo "\n*** Testing error conditions ***\n"; -echo "\n-- Testing ( (low < high) && (step = 0) ) --"; +echo "\n-- Testing ( (low < high) && (step = 0) ) --"; var_dump( range(1, 2, 0) ); var_dump( range("a", "b", 0) ); @@ -21,11 +21,11 @@ var_dump( range(1.0, 7.0, 6.5) ); echo "\n\n-- Testing ( (low > high) && (low-high < step) ) --"; var_dump( range(7.0, 1.0, 6.5) ); -echo "\n-- Testing Invalid number of arguments --"; +echo "\n-- Testing Invalid number of arguments --"; var_dump( range() ); // No.of args = 0 var_dump( range(1) ); // No.of args < expected var_dump( range(1,2,3,4) ); // No.of args > expected -var_dump( range(-1, -2, 2) ); +var_dump( range(-1, -2, 2) ); var_dump( range("a", "j", "z") ); var_dump( range(0, 1, "140962482048819216326.24") ); var_dump( range(0, 1, "140962482048819216326.24.") ); diff --git a/ext/standard/tests/array/reset_variation1.phpt b/ext/standard/tests/array/reset_variation1.phpt index 6181bd4177..ccdff248bf 100644 --- a/ext/standard/tests/array/reset_variation1.phpt +++ b/ext/standard/tests/array/reset_variation1.phpt @@ -58,7 +58,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -68,7 +68,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/array/rsort_basic.phpt b/ext/standard/tests/array/rsort_basic.phpt index 724aa2d3a8..0d13a48dda 100644 --- a/ext/standard/tests/array/rsort_basic.phpt +++ b/ext/standard/tests/array/rsort_basic.phpt @@ -19,7 +19,7 @@ $unsorted_strings = array( "O" => "Orange", "O1" => "Orange1", "o2" => "orange2", "O3" => "Orange3", "o20" => "orange20", "b" => "banana", ); - + // array with default keys containing unsorted numeric values $unsorted_numerics = array( 100, 33, 555, 22 ); diff --git a/ext/standard/tests/array/rsort_object1.phpt b/ext/standard/tests/array/rsort_object1.phpt index 98f7cfec16..2c0b571136 100644 --- a/ext/standard/tests/array/rsort_object1.phpt +++ b/ext/standard/tests/array/rsort_object1.phpt @@ -41,14 +41,14 @@ class for_string_rsort } // array of integer objects -$unsorted_int_obj = array( +$unsorted_int_obj = array( new for_integer_rsort(11), new for_integer_rsort(66), new for_integer_rsort(23), new for_integer_rsort(-5), new for_integer_rsort(0.001), new for_integer_rsort(0) ); // array of string objects -$unsorted_str_obj = array ( +$unsorted_str_obj = array ( new for_string_rsort("axx"), new for_string_rsort("t"), new for_string_rsort("w"), new for_string_rsort("py"), new for_string_rsort("apple"), new for_string_rsort("Orange"), diff --git a/ext/standard/tests/array/rsort_object2.phpt b/ext/standard/tests/array/rsort_object2.phpt index 57acdc61fe..f3eecb7fef 100644 --- a/ext/standard/tests/array/rsort_object2.phpt +++ b/ext/standard/tests/array/rsort_object2.phpt @@ -51,7 +51,7 @@ class for_string_rsort // array of integer objects -$unsorted_int_obj = array( +$unsorted_int_obj = array( new for_integer_rsort(11,33,30), new for_integer_rsort(66,44,4), new for_integer_rsort(-88,-5,5), @@ -59,7 +59,7 @@ $unsorted_int_obj = array( ); // array of string objects -$unsorted_str_obj = array ( +$unsorted_str_obj = array ( new for_string_rsort("axx","AXX","ass"), new for_string_rsort("t","eee","abb"), new for_string_rsort("w","W", "c"), diff --git a/ext/standard/tests/array/rsort_variation1.phpt b/ext/standard/tests/array/rsort_variation1.phpt index ab05a250c6..87e8977487 100644 --- a/ext/standard/tests/array/rsort_variation1.phpt +++ b/ext/standard/tests/array/rsort_variation1.phpt @@ -58,7 +58,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -67,7 +67,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/standard/tests/array/rsort_variation2.phpt b/ext/standard/tests/array/rsort_variation2.phpt index 8b4a5074e4..b6e423111c 100644 --- a/ext/standard/tests/array/rsort_variation2.phpt +++ b/ext/standard/tests/array/rsort_variation2.phpt @@ -64,7 +64,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -73,7 +73,7 @@ $inputs = array( /*18*/ "SORT_NUMERIC", 'SORT_NUMERIC', $heredoc, - + // object data /*21*/ new classA(), @@ -91,14 +91,14 @@ $inputs = array( $iterator = 1; foreach($inputs as $input) { echo "\n-- Iteration $iterator --\n"; - + //create temporary array in case rsort() works $temp = $array_arg; - + var_dump( rsort($temp, $input) ); var_dump($temp); $iterator++; - + $temp = null; }; diff --git a/ext/standard/tests/array/rsort_variation3.phpt b/ext/standard/tests/array/rsort_variation3.phpt index 6f92407587..ee740fd2a6 100644 --- a/ext/standard/tests/array/rsort_variation3.phpt +++ b/ext/standard/tests/array/rsort_variation3.phpt @@ -42,20 +42,20 @@ $count = 1; foreach ($various_arrays as $array) { echo "\n-- Iteration $count --\n"; - echo "- With Defualt sort flag -\n"; - $temp_array = $array; + echo "- With Defualt sort flag -\n"; + $temp_array = $array; var_dump(rsort($temp_array) ); var_dump($temp_array); // loop through $flag_value array and setting all possible flag values foreach($flag_value as $key => $flag){ echo "- Sort flag = $key -\n"; - $temp_array = $array; + $temp_array = $array; var_dump(rsort($temp_array, $flag) ); var_dump($temp_array); - } + } $count++; -} +} echo "Done"; ?> diff --git a/ext/standard/tests/array/rsort_variation5.phpt b/ext/standard/tests/array/rsort_variation5.phpt index 62e9f10aef..a8555ed0d9 100644 --- a/ext/standard/tests/array/rsort_variation5.phpt +++ b/ext/standard/tests/array/rsort_variation5.phpt @@ -41,7 +41,7 @@ foreach ($various_arrays as $array) { // loop through $flags array and setting all possible flag values foreach($flags as $key => $flag){ echo "- Sort flag = $key -\n"; - + $temp_array = $array; var_dump(rsort($temp_array, $flag) ); var_dump($temp_array); diff --git a/ext/standard/tests/array/rsort_variation8.phpt b/ext/standard/tests/array/rsort_variation8.phpt index 28bfe2c5a5..49b600699e 100644 --- a/ext/standard/tests/array/rsort_variation8.phpt +++ b/ext/standard/tests/array/rsort_variation8.phpt @@ -33,14 +33,14 @@ $count = 1; // loop through to test rsort() with different arrays foreach ($various_arrays as $array) { - - echo "\n-- Iteration $count --\n"; - + + echo "\n-- Iteration $count --\n"; + echo "\n-- 'flag' value is default --\n"; $temp_array = $array; var_dump(rsort($temp_array) ); var_dump($temp_array); - + echo "\n-- 'flag' value is SORT_REGULAR --\n"; $temp_array = $array; var_dump(rsort($temp_array, SORT_REGULAR) ); diff --git a/ext/standard/tests/array/shuffle_variation2.phpt b/ext/standard/tests/array/shuffle_variation2.phpt index a0cb6b632e..b43572d05a 100644 --- a/ext/standard/tests/array/shuffle_variation2.phpt +++ b/ext/standard/tests/array/shuffle_variation2.phpt @@ -37,9 +37,9 @@ echo "\n*** Testing shuffle() with arrays having different types of values ***\n $counter = 1; for($i=0; $i<=6; $i++) { echo "\n-- Iteration $counter --\n"; - var_dump( shuffle($array_arg[$i]) ); + var_dump( shuffle($array_arg[$i]) ); echo "\nThe output array is:\n"; - var_dump( $array_arg[$i] ); + var_dump( $array_arg[$i] ); $counter++; } diff --git a/ext/standard/tests/array/shuffle_variation3.phpt b/ext/standard/tests/array/shuffle_variation3.phpt index 1cb4e4d1eb..6e456459d6 100644 --- a/ext/standard/tests/array/shuffle_variation3.phpt +++ b/ext/standard/tests/array/shuffle_variation3.phpt @@ -53,9 +53,9 @@ echo "\n*** Testing shuffle() with arrays having different types of values ***\n $counter = 1; foreach($array_arg as $arr) { echo "\n-- Iteration $counter --\n"; - var_dump( shuffle($arr) ); + var_dump( shuffle($arr) ); echo "\nThe output array is:\n"; - var_dump( $arr ); + var_dump( $arr ); $counter++; } diff --git a/ext/standard/tests/array/shuffle_variation4.phpt b/ext/standard/tests/array/shuffle_variation4.phpt index 399197c19b..72c6487af5 100644 --- a/ext/standard/tests/array/shuffle_variation4.phpt +++ b/ext/standard/tests/array/shuffle_variation4.phpt @@ -56,9 +56,9 @@ echo "\n*** Testing shuffle() with arrays having different types of values ***\n $counter = 1; foreach($array_arg as $arr) { echo "\n-- Iteration $counter --\n"; - var_dump( shuffle($arr) ); + var_dump( shuffle($arr) ); echo "\nThe output array is:\n"; - var_dump( $arr ); + var_dump( $arr ); $counter++; } diff --git a/ext/standard/tests/array/shuffle_variation5.phpt b/ext/standard/tests/array/shuffle_variation5.phpt index ca2c1ac90e..0479a8f817 100644 --- a/ext/standard/tests/array/shuffle_variation5.phpt +++ b/ext/standard/tests/array/shuffle_variation5.phpt @@ -64,15 +64,15 @@ $heredoc_asso_array = array( // test shuffle() with array containing heredoc strings as values echo "\n-- with array of heredoc strings --\n"; -var_dump( shuffle($heredoc_array) ); +var_dump( shuffle($heredoc_array) ); echo "\nThe output array is:\n"; -var_dump( $heredoc_array ); +var_dump( $heredoc_array ); // test shuffle() with array containing heredoc strings as its keys echo "\n-- with array having heredoc strings as keys --\n"; -var_dump( shuffle($heredoc_asso_array) ); +var_dump( shuffle($heredoc_asso_array) ); echo "\nThe output array is:\n"; -var_dump( $heredoc_asso_array ); +var_dump( $heredoc_asso_array ); echo "Done"; ?> diff --git a/ext/standard/tests/array/sizeof_basic1.phpt b/ext/standard/tests/array/sizeof_basic1.phpt index ac86cbf8d7..e7fa988373 100644 --- a/ext/standard/tests/array/sizeof_basic1.phpt +++ b/ext/standard/tests/array/sizeof_basic1.phpt @@ -11,7 +11,7 @@ Test sizeof() function : basic functionality - for scalar types /* Testing the sizeof() for some of the scalar types(integer, float) values * in default, COUNT_NORMAL and COUNT_RECURSIVE modes. - */ + */ echo "*** Testing sizeof() : basic functionality ***\n"; diff --git a/ext/standard/tests/array/sizeof_basic2.phpt b/ext/standard/tests/array/sizeof_basic2.phpt index bbcbe11091..6b96863ab4 100644 --- a/ext/standard/tests/array/sizeof_basic2.phpt +++ b/ext/standard/tests/array/sizeof_basic2.phpt @@ -13,7 +13,7 @@ Test sizeof() function : basic functionality - for non-scalar type(array) * in default, COUNT_NORMAL and COUNT_RECURSIVE modes. * Sizeof() has been tested for simple integer, string, * indexed and mixed arrays. - */ + */ echo "*** Testing sizeof() : basic functionality ***\n"; diff --git a/ext/standard/tests/array/sizeof_object2.phpt b/ext/standard/tests/array/sizeof_object2.phpt index 404443ae59..1976c78c1d 100644 --- a/ext/standard/tests/array/sizeof_object2.phpt +++ b/ext/standard/tests/array/sizeof_object2.phpt @@ -15,7 +15,7 @@ echo "--- Testing sizeof() with objects which doesn't implement Countable interf // class without member class test -{ +{ // no members } @@ -53,7 +53,7 @@ abstract class abstract_class { public $member1; private $member2; - + abstract protected function display(); } @@ -83,7 +83,7 @@ for($i = 0; $i < count($objects); $i++) echo "Default Mode: "; var_dump( sizeof($var) ); echo "\n"; - + echo "COUNT_NORMAL Mode: "; var_dump( sizeof($var, COUNT_NORMAL) ); echo "\n"; @@ -91,7 +91,7 @@ for($i = 0; $i < count($objects); $i++) echo "COUNT_RECURSIVE Mode: "; var_dump( sizeof($var, COUNT_RECURSIVE) ); echo "\n"; - + $counter++; } diff --git a/ext/standard/tests/array/sizeof_variation1.phpt b/ext/standard/tests/array/sizeof_variation1.phpt index 5917a798e1..4f394c2fdc 100644 --- a/ext/standard/tests/array/sizeof_variation1.phpt +++ b/ext/standard/tests/array/sizeof_variation1.phpt @@ -27,7 +27,7 @@ $values = array ( 12.3456789000e10, 12.3456789000E-10, /* 7 */ .5, - + // NULL values /* 8 */ NULL, null, @@ -40,7 +40,7 @@ $values = array ( // string data /* 14 */ "", - '', + '', "string", /* 17 */ 'string', @@ -56,8 +56,8 @@ $counter = 1; for($i = 0; $i < count($values); $i++) { echo "-- Iteration $counter --\n"; - - $var = $values[$i]; + + $var = $values[$i]; echo "Default Mode: "; var_dump( sizeof($var) ); diff --git a/ext/standard/tests/array/sizeof_variation2.phpt b/ext/standard/tests/array/sizeof_variation2.phpt index 8bd74a0207..1fd024ec2e 100644 --- a/ext/standard/tests/array/sizeof_variation2.phpt +++ b/ext/standard/tests/array/sizeof_variation2.phpt @@ -32,7 +32,7 @@ $values = array ( array(false => 'red', true => 'pen' ), array('color' => "red", "item" => 'pen', 1 => "Hi", "" => "Hello" ), /* 14 */ array($fp, "resource1" => $fp, 'resource2' => $fp, array( $fp, 'type' => $fp) ) -); +); // loop through each element of the values array for 'var' argument // check the working of sizeof() @@ -42,10 +42,10 @@ for($i = 0; $i < count($values); $i++) echo "-- Iteration $counter --\n"; $var = $values[$i]; - echo "Default Mode: "; + echo "Default Mode: "; var_dump( sizeof($var) ); echo "\n"; - + echo "COUNT_NORMAL Mode: "; var_dump( sizeof($var, COUNT_NORMAL) ); echo "\n"; @@ -56,7 +56,7 @@ for($i = 0; $i < count($values); $i++) $counter++; } - + echo "Done"; ?> --EXPECT-- diff --git a/ext/standard/tests/array/sizeof_variation4.phpt b/ext/standard/tests/array/sizeof_variation4.phpt index 63fc05bd46..983be5bb56 100644 --- a/ext/standard/tests/array/sizeof_variation4.phpt +++ b/ext/standard/tests/array/sizeof_variation4.phpt @@ -15,7 +15,7 @@ echo "--- Testing sizeof() for all kinds of unset variables in default, Normal a // class declaration class test -{ +{ public $member1; } @@ -60,7 +60,7 @@ $counter = 1; foreach($values as $value) { echo "-- Iteration $counter --\n"; - + // unset the variable unset($value); @@ -68,7 +68,7 @@ foreach($values as $value) echo "Default Mode: "; var_dump( sizeof($value) ); echo "\n"; - + echo "COUNT_NORMAL Mode: "; var_dump( sizeof($value, COUNT_NORMAL) ); echo "\n"; diff --git a/ext/standard/tests/array/sizeof_variation5.phpt b/ext/standard/tests/array/sizeof_variation5.phpt index d608dbbe1b..89fce6631c 100644 --- a/ext/standard/tests/array/sizeof_variation5.phpt +++ b/ext/standard/tests/array/sizeof_variation5.phpt @@ -52,7 +52,7 @@ $mode_values = array ( new test(), /* 22 */ $fp ); - + // loop through the each element of $modes_array for 'mode' argument // and check the working of sizeof() $counter = 1; @@ -60,7 +60,7 @@ for($i = 0; $i < count($mode_values); $i++) { echo "-- Iteration $counter --\n"; $mode = $mode_values[$i]; - + var_dump( sizeof($array1, $mode) ); $counter++; diff --git a/ext/standard/tests/array/sort_basic.phpt b/ext/standard/tests/array/sort_basic.phpt index df37b2d1d5..fe5796c37f 100644 --- a/ext/standard/tests/array/sort_basic.phpt +++ b/ext/standard/tests/array/sort_basic.phpt @@ -25,7 +25,7 @@ $unsorted_strings = array( "O" => "Orange", "O1" => "Orange1", "o2" => "orange2", "O3" => "Orange3", "o20" => "orange20", "b" => "banana", ); - + // array with default keys containing unsorted numeric values $unsorted_numerics = array( 100, 33, 555, 22 ); diff --git a/ext/standard/tests/array/sort_error.phpt b/ext/standard/tests/array/sort_error.phpt index 4864ef33df..5337388b17 100644 --- a/ext/standard/tests/array/sort_error.phpt +++ b/ext/standard/tests/array/sort_error.phpt @@ -27,7 +27,7 @@ $extra_arg = 10; foreach($flag_value as $key => $flag){ echo "\nSort flag = $key\n"; var_dump( sort($array_arg,$flag, $extra_arg) ); - + // dump the input array to ensure that it wasn't changed var_dump($array_arg); } diff --git a/ext/standard/tests/array/sort_object1.phpt b/ext/standard/tests/array/sort_object1.phpt index caa9c8dbb6..7c0be40607 100644 --- a/ext/standard/tests/array/sort_object1.phpt +++ b/ext/standard/tests/array/sort_object1.phpt @@ -41,14 +41,14 @@ class for_string_sort } // array of integer objects -$unsorted_int_obj = array( +$unsorted_int_obj = array( new for_integer_sort(11), new for_integer_sort(66), new for_integer_sort(23), new for_integer_sort(-5), new for_integer_sort(0.001), new for_integer_sort(0) ); // array of string objects -$unsorted_str_obj = array ( +$unsorted_str_obj = array ( new for_string_sort("axx"), new for_string_sort("t"), new for_string_sort("w"), new for_string_sort("py"), new for_string_sort("apple"), new for_string_sort("Orange"), diff --git a/ext/standard/tests/array/sort_object2.phpt b/ext/standard/tests/array/sort_object2.phpt index 93b0fa2e8b..026c45b852 100644 --- a/ext/standard/tests/array/sort_object2.phpt +++ b/ext/standard/tests/array/sort_object2.phpt @@ -19,13 +19,13 @@ class for_integer_sort { public $public_class_value; private $private_class_value; - protected $protected_class_value; + protected $protected_class_value; // initializing object member value function __construct($value1, $value2,$value3){ $this->public_class_value = $value1; $this->private_class_value = $value2; - $this->protected_class_value = $value3; + $this->protected_class_value = $value3; } } @@ -50,7 +50,7 @@ class for_string_sort } // array of integer objects -$unsorted_int_obj = array( +$unsorted_int_obj = array( new for_integer_sort(11,33,30), new for_integer_sort(66,44,4), new for_integer_sort(-88,-5,5), @@ -58,7 +58,7 @@ $unsorted_int_obj = array( ); // array of string objects -$unsorted_str_obj = array ( +$unsorted_str_obj = array ( new for_string_sort("axx","AXX","ass"), new for_string_sort("t","eee","abb"), new for_string_sort("w","W", "c"), diff --git a/ext/standard/tests/array/sort_variation1.phpt b/ext/standard/tests/array/sort_variation1.phpt index f778b81907..5bcb95d860 100644 --- a/ext/standard/tests/array/sort_variation1.phpt +++ b/ext/standard/tests/array/sort_variation1.phpt @@ -75,7 +75,7 @@ $unexpected_values = array ( // loop though each element of the array and check the working of sort() // when $array argument is supplied with different values from $unexpected_values echo "\n-- Testing sort() by supplying different unexpected values for 'array' argument --\n"; -echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; +echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; $counter = 1; for($index = 0; $index < count($unexpected_values); $index ++) { diff --git a/ext/standard/tests/array/sort_variation2.phpt b/ext/standard/tests/array/sort_variation2.phpt index 3ee1784edc..0fb5612333 100644 --- a/ext/standard/tests/array/sort_variation2.phpt +++ b/ext/standard/tests/array/sort_variation2.phpt @@ -79,8 +79,8 @@ for($index = 0; $index < count($unexpected_values); $index ++) { // sort the array, retain a temp. copy of input array for next iteration $value = $unexpected_values [$index]; $temp_array = $unsorted_values; - var_dump( sort($temp_array, $value) ); - + var_dump( sort($temp_array, $value) ); + //dump the sorted array var_dump($temp_array); $counter++; diff --git a/ext/standard/tests/array/sort_variation3.phpt b/ext/standard/tests/array/sort_variation3.phpt index 1ad058d4e9..4515390b20 100644 --- a/ext/standard/tests/array/sort_variation3.phpt +++ b/ext/standard/tests/array/sort_variation3.phpt @@ -29,7 +29,7 @@ $various_arrays = array ( // mixed value array array(.0001, .0021, -.01, -1, 0, .09, 2, -.9, 10.6E-2, -10.6E-2, 33), - + // array values contains minimum and maximum ranges array(2147483647, 2147483648, -2147483647, -2147483648, -0, 0, -2147483649) ); @@ -44,20 +44,20 @@ echo "\n-- Testing sort() by supplying various integer/float arrays --\n"; foreach ($various_arrays as $array) { echo "\n-- Iteration $count --\n"; - echo "- With Defualt sort flag -\n"; - $temp_array = $array; + echo "- With Defualt sort flag -\n"; + $temp_array = $array; var_dump(sort($temp_array) ); var_dump($temp_array); // loop through $flag_value array and setting all possible flag values foreach($flag_value as $key => $flag){ echo "- Sort flag = $key -\n"; - $temp_array = $array; + $temp_array = $array; var_dump(sort($temp_array, $flag) ); var_dump($temp_array); - } + } $count++; -} +} echo "Done\n"; ?> diff --git a/ext/standard/tests/array/sort_variation8.phpt b/ext/standard/tests/array/sort_variation8.phpt index 17228f28ac..9e8cda117e 100644 --- a/ext/standard/tests/array/sort_variation8.phpt +++ b/ext/standard/tests/array/sort_variation8.phpt @@ -37,8 +37,8 @@ echo "\n-- Testing sort() by supplying various arrays containing sub arrays --\n // loop through to test sort() with different arrays foreach ($various_arrays as $array) { - - echo "\n-- Iteration $count --\n"; + + echo "\n-- Iteration $count --\n"; // testing sort() function by supplying different arrays, flag value is defualt echo "- With Defualt sort flag -\n"; $temp_array = $array; diff --git a/ext/standard/tests/array/uasort_object1.phpt b/ext/standard/tests/array/uasort_object1.phpt index 020b0d3c0b..5c981fe038 100644 --- a/ext/standard/tests/array/uasort_object1.phpt +++ b/ext/standard/tests/array/uasort_object1.phpt @@ -49,7 +49,7 @@ function multiple_cmp($value1, $value2) class SimpleClass1 { private $int_value; - + public function __construct($value) { $this->int_value = $value; } @@ -68,7 +68,7 @@ class SimpleClass2 } public function getValue() { return $this->int_value; - } + } } // array of SimpleClass objects with only one member diff --git a/ext/standard/tests/array/uasort_object2.phpt b/ext/standard/tests/array/uasort_object2.phpt index b6862b7588..37ba620a5d 100644 --- a/ext/standard/tests/array/uasort_object2.phpt +++ b/ext/standard/tests/array/uasort_object2.phpt @@ -43,11 +43,11 @@ function cmp_function($value1, $value2) class SimpleClass { private $int_value; - + public function __construct($value) { $this->int_value = $value; } - + } // Class without any member diff --git a/ext/standard/tests/array/uasort_variation1.phpt b/ext/standard/tests/array/uasort_variation1.phpt index c8475f9112..1e5d9ad6e1 100644 --- a/ext/standard/tests/array/uasort_variation1.phpt +++ b/ext/standard/tests/array/uasort_variation1.phpt @@ -60,7 +60,7 @@ $input_values = array( // null data /*10*/ NULL, null, - + // boolean data /*12*/ true, false, @@ -80,7 +80,7 @@ $input_values = array( // undefined data @$undefined_var, - + // unset data /*22*/ @$unset_var, ); diff --git a/ext/standard/tests/array/uasort_variation10.phpt b/ext/standard/tests/array/uasort_variation10.phpt index 15b62930c3..ab54a11094 100644 --- a/ext/standard/tests/array/uasort_variation10.phpt +++ b/ext/standard/tests/array/uasort_variation10.phpt @@ -35,7 +35,7 @@ function cmp_function($value1, $value2) echo "*** Testing uasort() : 'array_arg' with elements as reference ***\n"; // different variables which are used as elements of 'array_arg' -$value1 = -5; +$value1 = -5; $value2 = 100; $value3 = 0; $value4 = &$value1; diff --git a/ext/standard/tests/array/uasort_variation5.phpt b/ext/standard/tests/array/uasort_variation5.phpt index e6996a55fe..4b353dfccf 100644 --- a/ext/standard/tests/array/uasort_variation5.phpt +++ b/ext/standard/tests/array/uasort_variation5.phpt @@ -64,7 +64,7 @@ var_dump($single_quoted_values); // Double quoted strings $double_quoted_values = array( - 0 => " ", 1 => "test", 3 => "Hello", 4 => "HELLO", + 0 => " ", 1 => "test", 3 => "Hello", 4 => "HELLO", 5 => "", 6 => "\t", 7 => "0", 8 => "123Hello", 9 => "\"", 10 => "@#$%" ); echo "-- Sorting Double Quoted String values --\n"; diff --git a/ext/standard/tests/array/uksort_error.phpt b/ext/standard/tests/array/uksort_error.phpt index 241ed2f828..366a640c02 100644 --- a/ext/standard/tests/array/uksort_error.phpt +++ b/ext/standard/tests/array/uksort_error.phpt @@ -5,7 +5,7 @@ Test uksort() function : error conditions /* Prototype : bool uksort(array array_arg, string cmp_function) * Description: Sort an array by keys using a user-defined comparison function * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing uksort() : error conditions ***\n"; diff --git a/ext/standard/tests/array/uksort_variation1.phpt b/ext/standard/tests/array/uksort_variation1.phpt index b2214a5880..079cbd6d77 100644 --- a/ext/standard/tests/array/uksort_variation1.phpt +++ b/ext/standard/tests/array/uksort_variation1.phpt @@ -5,7 +5,7 @@ Test uksort() function : usage variation /* Prototype : bool uksort(array array_arg, string cmp_function) * Description: Sort an array by keys using a user-defined comparison function * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing uksort() : usage variation ***\n"; diff --git a/ext/standard/tests/array/uksort_variation2.phpt b/ext/standard/tests/array/uksort_variation2.phpt index 2f5b8b5d89..610fa73d06 100644 --- a/ext/standard/tests/array/uksort_variation2.phpt +++ b/ext/standard/tests/array/uksort_variation2.phpt @@ -5,7 +5,7 @@ Test uksort() function : usage variation /* Prototype : bool uksort(array array_arg, string cmp_function) * Description: Sort an array by keys using a user-defined comparison function * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing uksort() : usage variation ***\n"; diff --git a/ext/standard/tests/array/unexpected_array_mod_bug.phpt b/ext/standard/tests/array/unexpected_array_mod_bug.phpt index 2762ebd830..08774c09a4 100644 --- a/ext/standard/tests/array/unexpected_array_mod_bug.phpt +++ b/ext/standard/tests/array/unexpected_array_mod_bug.phpt @@ -3,7 +3,7 @@ Crash when function parameter modified via reference --FILE-- <?php function usercompare($a,$b) { - unset($GLOBALS['my_var'][2]); + unset($GLOBALS['my_var'][2]); return $a <=> $b; } $my_var = array(1 => "entry_1", diff --git a/ext/standard/tests/array/usort_variation1.phpt b/ext/standard/tests/array/usort_variation1.phpt index 761efbca39..b66a957bc2 100644 --- a/ext/standard/tests/array/usort_variation1.phpt +++ b/ext/standard/tests/array/usort_variation1.phpt @@ -72,7 +72,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -82,7 +82,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/array/usort_variation10.phpt b/ext/standard/tests/array/usort_variation10.phpt index 0aeed40292..cc88e334d6 100644 --- a/ext/standard/tests/array/usort_variation10.phpt +++ b/ext/standard/tests/array/usort_variation10.phpt @@ -26,8 +26,8 @@ function cmp($value1, $value2) } // Array with duplicate string and integer keys and values -$array_arg = array(0 => 2, "a" => 8, "d" => 9, - 3 => 3, 5 => 2, "o" => 6, +$array_arg = array(0 => 2, "a" => 8, "d" => 9, + 3 => 3, 5 => 2, "o" => 6, "z" => -99, 0 => 1, "z" => 3); echo "\n-- Array with duplicate keys --\n"; diff --git a/ext/standard/tests/array/usort_variation3.phpt b/ext/standard/tests/array/usort_variation3.phpt index 5d21776060..bd7666744d 100644 --- a/ext/standard/tests/array/usort_variation3.phpt +++ b/ext/standard/tests/array/usort_variation3.phpt @@ -27,22 +27,22 @@ function cmp_function($value1, $value2) } // different heredoc strings - + // single line heredoc string $simple_heredoc = <<<EOT2 simple EOT2; - + // multiline heredoc string $multiline_heredoc = <<<EOT3 multiline heredoc with 123 and speci@! ch@r..\ncheck\talso EOT3; - + $array_arg = array( // numeric keys -2 => 9, - 8.9 => 8, + 8.9 => 8, 012 => 7, 0x34 => 6, @@ -50,9 +50,9 @@ $array_arg = array( 'key' => 5, //single quoted key "two" => 4, //double quoted key " " => 0, // space as key - + // bool keys - TRUE => 100, + TRUE => 100, FALSE => 25, // null keys @@ -65,7 +65,7 @@ $array_arg = array( //heredoc keys $simple_heredoc => 75, $multiline_heredoc => 200, - + // default key 1, ); diff --git a/ext/standard/tests/array/usort_variation4.phpt b/ext/standard/tests/array/usort_variation4.phpt index a5d14daab2..b358be46d9 100644 --- a/ext/standard/tests/array/usort_variation4.phpt +++ b/ext/standard/tests/array/usort_variation4.phpt @@ -27,16 +27,16 @@ function cmp_function($value1, $value2) } // Int array -$int_values = array(0 => 3, 1 => 2, 3 => 100, - 4 => 150, 5 => 25, 6 => 350, +$int_values = array(0 => 3, 1 => 2, 3 => 100, + 4 => 150, 5 => 25, 6 => 350, 7 => 0, 8 => -3, 9 => -1200); - + echo "\n-- Sorting Integer array --\n"; var_dump( usort($int_values, 'cmp_function') ); var_dump($int_values); // Octal array -$octal_values = array(0 => 056, 1 => 023, 2 => 00, +$octal_values = array(0 => 056, 1 => 023, 2 => 00, 3 => 015, 4 => -045, 5 => 01, 6 => -07); echo "\n-- Sorting Octal array --\n"; @@ -44,17 +44,17 @@ var_dump( usort($octal_values, 'cmp_function') ); var_dump($octal_values); // Hexadecimal array -$hex_values = array(0 => 0xAE, 1 => 0x2B, 2 => 0X10, +$hex_values = array(0 => 0xAE, 1 => 0x2B, 2 => 0X10, 3 => -0xCF, 4 => 0X12, 5 => -0XF2); - + echo "\n-- Sorting Hex array --\n"; var_dump( usort($hex_values, 'cmp_function') ); var_dump($hex_values); // Float array -$float_values = array( 0 => 10.2, 1 => 2.4, 2 => -3.4, +$float_values = array( 0 => 10.2, 1 => 2.4, 2 => -3.4, 3 => 0, 4 => 0.5, 5 => 7.3e3, 6 => -9.34E-2); - + echo "\n-- Sorting Float array --\n"; var_dump( usort($float_values, 'cmp_function') ); var_dump($float_values); diff --git a/ext/standard/tests/array/usort_variation5.phpt b/ext/standard/tests/array/usort_variation5.phpt index 922321c237..cb9efcdccc 100644 --- a/ext/standard/tests/array/usort_variation5.phpt +++ b/ext/standard/tests/array/usort_variation5.phpt @@ -46,7 +46,7 @@ EOT; // Single quoted strings $single_quoted_values = array( 0 => ' ', 1 => 'test', 3 => 'Hello', 4 => 'HELLO', - 5 => '', 6 => '\t', 7 => '0', 8 => '123Hello', + 5 => '', 6 => '\t', 7 => '0', 8 => '123Hello', 9 => '\'', 10 => '@#$%' ); @@ -56,8 +56,8 @@ var_dump($single_quoted_values); // Double quoted strings $double_quoted_values = array( - 0 => " ", 1 => "test", 3 => "Hello", 4 => "HELLO", - 5 => "", 6 => "\t", 7 => "0", 8 => "123Hello", + 0 => " ", 1 => "test", 3 => "Hello", 4 => "HELLO", + 5 => "", 6 => "\t", 7 => "0", 8 => "123Hello", 9 => "\"", 10 => "@#$%" ); @@ -66,7 +66,7 @@ var_dump( usort($double_quoted_values, 'cmp_function') ); var_dump($double_quoted_values); // Heredoc strings -$heredoc_values = array(0 => $empty_heredoc, 1 => $simple_heredoc1, +$heredoc_values = array(0 => $empty_heredoc, 1 => $simple_heredoc1, 2 => $simple_heredoc2, 3 => $multiline_heredoc); echo "\n-- Sorting Heredoc String values --\n"; diff --git a/ext/standard/tests/array/usort_variation8.phpt b/ext/standard/tests/array/usort_variation8.phpt index 87107f8009..2820d50d2b 100644 --- a/ext/standard/tests/array/usort_variation8.phpt +++ b/ext/standard/tests/array/usort_variation8.phpt @@ -16,7 +16,7 @@ Test usort() function : usage variations - use built in functions as $cmp_functi echo "*** Testing usort() : usage variation ***\n"; // Initializing variables -$array_arg = array("b" => "Banana", "m" => "Mango", "a" => "apple", +$array_arg = array("b" => "Banana", "m" => "Mango", "a" => "apple", "p" => "Pineapple", "o" => "orange"); // Testing library functions as comparison function diff --git a/ext/standard/tests/array/usort_variation9.phpt b/ext/standard/tests/array/usort_variation9.phpt index 977c709149..9060480209 100644 --- a/ext/standard/tests/array/usort_variation9.phpt +++ b/ext/standard/tests/array/usort_variation9.phpt @@ -27,7 +27,7 @@ function cmp_function($value1, $value2) } // different variables which are used as elements of $array_arg -$value1 = -5; +$value1 = -5; $value2 = 100; $value3 = 0; $value4 = &$value1; diff --git a/ext/standard/tests/assert/assert.phpt b/ext/standard/tests/assert/assert.phpt index 44fb6091db..3f8a0003c7 100644 --- a/ext/standard/tests/assert/assert.phpt +++ b/ext/standard/tests/assert/assert.phpt @@ -10,7 +10,7 @@ assert.quiet_eval = 0 --FILE-- <?php function a($file,$line,$myev) -{ +{ echo "assertion failed $line,\"$myev\"\n"; } diff --git a/ext/standard/tests/assert/assert03.phpt b/ext/standard/tests/assert/assert03.phpt index 74cdb6eda7..50c69e8ffd 100644 --- a/ext/standard/tests/assert/assert03.phpt +++ b/ext/standard/tests/assert/assert03.phpt @@ -9,24 +9,24 @@ assert.quiet_eval = 1 --FILE-- <?php function a($file,$line,$myev) -{ +{ echo "assertion failed - a - $line,\"$myev\"\n"; } - + function b($file,$line,$myev) -{ +{ echo "assertion failed - b - $line,\"$myev\"\n"; } - + assert_options(ASSERT_ACTIVE,1); assert_options(ASSERT_QUIET_EVAL,1); assert_options(ASSERT_WARNING,0); - + $a = 0; - + assert_options(ASSERT_CALLBACK,"a"); assert('$a != 0'); - + /* Modify call back using ini_set() */ ini_set("assert.callback", "b"); assert('$a != 0'); diff --git a/ext/standard/tests/assert/assert04.phpt b/ext/standard/tests/assert/assert04.phpt index a057ee4380..c8f58d310e 100644 --- a/ext/standard/tests/assert/assert04.phpt +++ b/ext/standard/tests/assert/assert04.phpt @@ -11,29 +11,29 @@ assert.quiet_eval = 0 /* Assert not active */ assert_options(ASSERT_ACTIVE, 0); assert(1); - - + + /* Wrong parameter count in assert */ assert_options(ASSERT_ACTIVE, 1); assert(2, "failure", 3); - + /* Wrong parameter count in assert_options */ assert_options(ASSERT_ACTIVE, 0, 2); - + /* Wrong parameter name in assert_options */ $test="ASSERT_FRED"; assert_options($test, 1); - + /* Assert false */ assert(0); - - + + /* Assert false and bail*/ assert_options(ASSERT_BAIL, 1); assert(0); - + echo "not reached\n"; - + ?> --EXPECTF-- Warning: assert() expects at most 2 parameters, 3 given in %s on line %d diff --git a/ext/standard/tests/assert/assert_basic.phpt b/ext/standard/tests/assert/assert_basic.phpt index 7db2a13b19..7d92ee31bc 100644 --- a/ext/standard/tests/assert/assert_basic.phpt +++ b/ext/standard/tests/assert/assert_basic.phpt @@ -8,7 +8,7 @@ assert.bail = 0 assert.quiet_eval = 0 --FILE-- <?php -function f1() +function f1() { echo "f1 called\n"; } diff --git a/ext/standard/tests/assert/assert_basic1.phpt b/ext/standard/tests/assert/assert_basic1.phpt index e803bb0ccc..4ba67dc9dd 100644 --- a/ext/standard/tests/assert/assert_basic1.phpt +++ b/ext/standard/tests/assert/assert_basic1.phpt @@ -8,7 +8,7 @@ assert.bail = 0 assert.quiet_eval = 0 --FILE-- <?php -function f1() +function f1() { echo "f1 called\n"; } diff --git a/ext/standard/tests/assert/assert_basic2.phpt b/ext/standard/tests/assert/assert_basic2.phpt index 42c59b1b9a..d6c150d0d0 100644 --- a/ext/standard/tests/assert/assert_basic2.phpt +++ b/ext/standard/tests/assert/assert_basic2.phpt @@ -8,19 +8,19 @@ assert.bail = 0 assert.quiet_eval = 0 --FILE-- <?php -function f2() +function f2() { echo "f2 called\n"; } -function f1() +function f1() { echo "f1 called\n"; } - + var_dump($o = assert_options(ASSERT_CALLBACK)); assert(0); - + var_dump($o= assert_options(ASSERT_CALLBACK, "f2")); var_dump($n= assert_options(ASSERT_CALLBACK)); assert(0); diff --git a/ext/standard/tests/assert/assert_basic3.phpt b/ext/standard/tests/assert/assert_basic3.phpt index 044356c312..a7fd990cbe 100644 --- a/ext/standard/tests/assert/assert_basic3.phpt +++ b/ext/standard/tests/assert/assert_basic3.phpt @@ -8,7 +8,7 @@ assert.quiet_eval = 1 assert.bail = 0 --FILE-- <?php -function f1() +function f1() { echo "f1 called\n"; } diff --git a/ext/standard/tests/assert/assert_basic5.phpt b/ext/standard/tests/assert/assert_basic5.phpt index ac84a158f9..f4943cdf16 100644 --- a/ext/standard/tests/assert/assert_basic5.phpt +++ b/ext/standard/tests/assert/assert_basic5.phpt @@ -8,7 +8,7 @@ assert.bail = 0 assert.quiet_eval = 0 --FILE-- <?php -function f1() +function f1() { echo "f1 called\n"; } diff --git a/ext/standard/tests/assert/assert_basic6.phpt b/ext/standard/tests/assert/assert_basic6.phpt index e9b3f04b04..eb817db69b 100644 --- a/ext/standard/tests/assert/assert_basic6.phpt +++ b/ext/standard/tests/assert/assert_basic6.phpt @@ -8,7 +8,7 @@ assert.quiet_eval = 1 assert.bail = 0 --FILE-- <?php -function f1($message) +function f1($message) { echo "f1 called\n"; } diff --git a/ext/standard/tests/assert/assert_error.phpt b/ext/standard/tests/assert/assert_error.phpt index 5e2519ab37..6e04060765 100644 --- a/ext/standard/tests/assert/assert_error.phpt +++ b/ext/standard/tests/assert/assert_error.phpt @@ -8,7 +8,7 @@ assert.bail = 0 assert.quiet_eval = 0 --FILE-- <?php -function f1() +function f1() { echo "f1 called\n"; } diff --git a/ext/standard/tests/assert/assert_error1.phpt b/ext/standard/tests/assert/assert_error1.phpt index ae59afb40b..7c19c784d4 100644 --- a/ext/standard/tests/assert/assert_error1.phpt +++ b/ext/standard/tests/assert/assert_error1.phpt @@ -8,7 +8,7 @@ assert.quiet_eval = 1 assert.bail = 0 --FILE-- <?php -function f1() +function f1() { echo "f1 called\n"; } diff --git a/ext/standard/tests/assert/assert_error2.phpt b/ext/standard/tests/assert/assert_error2.phpt index aea86f5726..d1b6f1745f 100644 --- a/ext/standard/tests/assert/assert_error2.phpt +++ b/ext/standard/tests/assert/assert_error2.phpt @@ -10,7 +10,7 @@ error_reporting = -1 display_errors = 1 --FILE-- <?php -function f1($script, $line, $message, $user_message) +function f1($script, $line, $message, $user_message) { echo "f1 called\n"; } diff --git a/ext/standard/tests/assert/assert_variation.phpt b/ext/standard/tests/assert/assert_variation.phpt index a23d468f7b..8c63d43192 100644 --- a/ext/standard/tests/assert/assert_variation.phpt +++ b/ext/standard/tests/assert/assert_variation.phpt @@ -8,15 +8,15 @@ assert.bail = 0 assert.quiet_eval = 0 --FILE-- <?php -function f1() +function f1() { echo "f1 called\n"; } -function f2() +function f2() { echo "f2 called\n"; } -function f3() +function f3() { echo "f3 called\n"; } diff --git a/ext/standard/tests/bug75220.phpt b/ext/standard/tests/bug75220.phpt index f5820a12dd..0fdc6aa79a 100644 --- a/ext/standard/tests/bug75220.phpt +++ b/ext/standard/tests/bug75220.phpt @@ -15,7 +15,7 @@ class A extends B var_dump(is_callable('parent::foo')); var_dump(is_callable(array('parent', 'foo'))); } - + function __call($func, $args) { } diff --git a/ext/standard/tests/class_object/class_exists_basic_001.phpt b/ext/standard/tests/class_object/class_exists_basic_001.phpt index 6d24ef979f..b092f496c2 100644 --- a/ext/standard/tests/class_object/class_exists_basic_001.phpt +++ b/ext/standard/tests/class_object/class_exists_basic_001.phpt @@ -5,7 +5,7 @@ Test class_exists() function : basic functionality /* Prototype : proto bool class_exists(string classname [, bool autoload]) * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing class_exists() : basic functionality ***\n"; diff --git a/ext/standard/tests/class_object/class_exists_error_001.phpt b/ext/standard/tests/class_object/class_exists_error_001.phpt index 99c0b89b3c..4386a76202 100644 --- a/ext/standard/tests/class_object/class_exists_error_001.phpt +++ b/ext/standard/tests/class_object/class_exists_error_001.phpt @@ -5,7 +5,7 @@ Test class_exists() function : error conditions (wrong number of arguments) /* Prototype : proto bool class_exists(string classname [, bool autoload]) * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ /** diff --git a/ext/standard/tests/class_object/class_exists_variation_001.phpt b/ext/standard/tests/class_object/class_exists_variation_001.phpt index b847c0285c..1d9cadd125 100644 --- a/ext/standard/tests/class_object/class_exists_variation_001.phpt +++ b/ext/standard/tests/class_object/class_exists_variation_001.phpt @@ -5,7 +5,7 @@ Test class_exists() function : usage variations - unexpected types for argument /* Prototype : proto bool class_exists(string classname [, bool autoload]) * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ spl_autoload_register(function ($className) { diff --git a/ext/standard/tests/class_object/class_exists_variation_002.phpt b/ext/standard/tests/class_object/class_exists_variation_002.phpt index 4b89921759..1be10387d4 100644 --- a/ext/standard/tests/class_object/class_exists_variation_002.phpt +++ b/ext/standard/tests/class_object/class_exists_variation_002.phpt @@ -5,7 +5,7 @@ Test class_exists() function : usage variations - unexpected types for argument /* Prototype : proto bool class_exists(string classname [, bool autoload]) * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ spl_autoload_register(function ($className) { diff --git a/ext/standard/tests/class_object/class_exists_variation_003.phpt b/ext/standard/tests/class_object/class_exists_variation_003.phpt index 72182c8cbb..ea2b3a354a 100644 --- a/ext/standard/tests/class_object/class_exists_variation_003.phpt +++ b/ext/standard/tests/class_object/class_exists_variation_003.phpt @@ -5,7 +5,7 @@ Test class_exists() function : usage variations - case sensitivity /* Prototype : proto bool class_exists(string classname [, bool autoload]) * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ class caseSensitivityTest {} diff --git a/ext/standard/tests/class_object/get_class_error_001.phpt b/ext/standard/tests/class_object/get_class_error_001.phpt index 555099502d..d808c8441d 100644 --- a/ext/standard/tests/class_object/get_class_error_001.phpt +++ b/ext/standard/tests/class_object/get_class_error_001.phpt @@ -5,7 +5,7 @@ Test get_class() function : error conditions - wrong number of arguments. /* Prototype : proto string get_class([object object]) * Description: Retrieves the class name * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing get_class() : error conditions ***\n"; diff --git a/ext/standard/tests/class_object/get_class_methods_basic_001.phpt b/ext/standard/tests/class_object/get_class_methods_basic_001.phpt index 7d2151c9de..e214e0f4e5 100644 --- a/ext/standard/tests/class_object/get_class_methods_basic_001.phpt +++ b/ext/standard/tests/class_object/get_class_methods_basic_001.phpt @@ -5,7 +5,7 @@ Test get_class_methods() function : basic functionality /* Prototype : proto array get_class_methods(mixed class) * Description: Returns an array of method names for class or class instance. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ /* @@ -18,7 +18,7 @@ class C { function f() {} function g() {} function h() {} -} +} echo "Argument is class name:\n"; var_dump( get_class_methods("C") ); diff --git a/ext/standard/tests/class_object/get_class_methods_basic_002.phpt b/ext/standard/tests/class_object/get_class_methods_basic_002.phpt index 387cfd88fc..faed0d4c7f 100644 --- a/ext/standard/tests/class_object/get_class_methods_basic_002.phpt +++ b/ext/standard/tests/class_object/get_class_methods_basic_002.phpt @@ -5,7 +5,7 @@ Test get_class_methods() function : basic functionality /* Prototype : proto array get_class_methods(mixed class) * Description: Returns an array of method names for class or class instance. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ /* @@ -16,7 +16,7 @@ class C { private function privC() {} protected function protC() {} public function pubC() {} - + public static function testFromC() { echo "Accessing C from C:\n"; var_dump(get_class_methods("C")); @@ -31,7 +31,7 @@ class D extends C { private function privD() {} protected function protD() {} public function pubD() {} - + public static function testFromD() { echo "Accessing C from D:\n"; var_dump(get_class_methods("C")); @@ -46,7 +46,7 @@ class X { private function privX() {} protected function protX() {} public function pubX() {} - + public static function testFromX() { echo "Accessing C from X:\n"; var_dump(get_class_methods("C")); diff --git a/ext/standard/tests/class_object/get_class_methods_basic_003.phpt b/ext/standard/tests/class_object/get_class_methods_basic_003.phpt index c74acccdc2..b86a0afc03 100644 --- a/ext/standard/tests/class_object/get_class_methods_basic_003.phpt +++ b/ext/standard/tests/class_object/get_class_methods_basic_003.phpt @@ -5,7 +5,7 @@ Test get_class_methods() function : basic functionality /* Prototype : proto array get_class_methods(mixed class) * Description: Returns an array of method names for class or class instance. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ /* @@ -23,10 +23,10 @@ class C implements I { private function privC() {} protected function protC() {} public function pubC() {} - + public static function testFromC() { echo "Accessing I from C:\n"; - var_dump(get_class_methods("I")); + var_dump(get_class_methods("I")); echo "Accessing C from C:\n"; var_dump(get_class_methods("C")); } diff --git a/ext/standard/tests/class_object/get_class_methods_error_001.phpt b/ext/standard/tests/class_object/get_class_methods_error_001.phpt index e606ab6937..b053d6cc69 100644 --- a/ext/standard/tests/class_object/get_class_methods_error_001.phpt +++ b/ext/standard/tests/class_object/get_class_methods_error_001.phpt @@ -5,7 +5,7 @@ Test get_class_methods() function : error conditions /* Prototype : proto array get_class_methods(mixed class) * Description: Returns an array of method names for class or class instance. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/standard/tests/class_object/get_class_methods_variation_001.phpt b/ext/standard/tests/class_object/get_class_methods_variation_001.phpt index 8cdef12a7b..37f9bf3ba5 100644 --- a/ext/standard/tests/class_object/get_class_methods_variation_001.phpt +++ b/ext/standard/tests/class_object/get_class_methods_variation_001.phpt @@ -5,7 +5,7 @@ Test get_class_methods() function : usage variations - unexpected types /* Prototype : proto array get_class_methods(mixed class) * Description: Returns an array of method names for class or class instance. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_class_methods_variation_002.phpt b/ext/standard/tests/class_object/get_class_methods_variation_002.phpt index 7dee5140a3..204398141f 100644 --- a/ext/standard/tests/class_object/get_class_methods_variation_002.phpt +++ b/ext/standard/tests/class_object/get_class_methods_variation_002.phpt @@ -5,7 +5,7 @@ Test get_class_methods() function : usage variations - case sensitivity /* Prototype : proto array get_class_methods(mixed class) * Description: Returns an array of method names for class or class instance. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing get_class_methods() : usage variations ***\n"; diff --git a/ext/standard/tests/class_object/get_class_variation_002.phpt b/ext/standard/tests/class_object/get_class_variation_002.phpt index 640bbb7f88..9770eeb099 100644 --- a/ext/standard/tests/class_object/get_class_variation_002.phpt +++ b/ext/standard/tests/class_object/get_class_variation_002.phpt @@ -5,7 +5,7 @@ Test get_class() function : usage variations - ensure class name case is preser /* Prototype : proto string get_class([object object]) * Description: Retrieves the class name * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ class caseSensitivityTest {} diff --git a/ext/standard/tests/class_object/get_class_vars_variation1.phpt b/ext/standard/tests/class_object/get_class_vars_variation1.phpt index 649e9ae5af..4aaeb78d61 100644 --- a/ext/standard/tests/class_object/get_class_vars_variation1.phpt +++ b/ext/standard/tests/class_object/get_class_vars_variation1.phpt @@ -5,7 +5,7 @@ Test get_class_vars() function : usage variation /* Prototype : array get_class_vars(string class_name) * Description: Returns an array of default properties of the class. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing get_class_vars() : usage variation ***\n"; diff --git a/ext/standard/tests/class_object/get_class_vars_variation2.phpt b/ext/standard/tests/class_object/get_class_vars_variation2.phpt index 726bb53ea1..fdf5b48545 100644 --- a/ext/standard/tests/class_object/get_class_vars_variation2.phpt +++ b/ext/standard/tests/class_object/get_class_vars_variation2.phpt @@ -5,14 +5,14 @@ Test get_class_vars() function : testing visibility /* Prototype : array get_class_vars(string class_name) * Description: Returns an array of default properties of the class. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ class Ancestor { function test() { var_dump(get_class_vars("Tester")); } - + static function testStatic() { var_dump(get_class_vars("Tester")); } @@ -22,15 +22,15 @@ class Tester extends Ancestor { public $pub = "public var"; protected $prot = "protected var"; private $priv = "private var"; - + static public $pubs = "public static var"; static protected $prots = "protected static var"; static private $privs = "private static var"; - + function test() { var_dump(get_class_vars("Tester")); } - + static function testStatic() { var_dump(get_class_vars("Tester")); } @@ -40,7 +40,7 @@ class Child extends Tester { function test() { var_dump(get_class_vars("Tester")); } - + static function testStatic() { var_dump(get_class_vars("Tester")); } diff --git a/ext/standard/tests/class_object/get_declared_classes_basic_001.phpt b/ext/standard/tests/class_object/get_declared_classes_basic_001.phpt index 123e9772cc..4b89f2971b 100644 --- a/ext/standard/tests/class_object/get_declared_classes_basic_001.phpt +++ b/ext/standard/tests/class_object/get_declared_classes_basic_001.phpt @@ -5,7 +5,7 @@ Test get_declared_classes() function : basic functionality /* Prototype : proto array get_declared_classes() * Description: Returns an array of all declared classes. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ @@ -17,7 +17,7 @@ var_dump(get_declared_classes()); foreach (get_declared_classes() as $class) { if (!class_exists($class)) { - echo "Error: $class is not a valid class.\n"; + echo "Error: $class is not a valid class.\n"; } } diff --git a/ext/standard/tests/class_object/get_declared_classes_error_001.phpt b/ext/standard/tests/class_object/get_declared_classes_error_001.phpt index ff01feb360..4262d34490 100644 --- a/ext/standard/tests/class_object/get_declared_classes_error_001.phpt +++ b/ext/standard/tests/class_object/get_declared_classes_error_001.phpt @@ -5,7 +5,7 @@ Test get_declared_classes() function : error conditions /* Prototype : proto array get_declared_classes() * Description: Returns an array of all declared classes. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing get_declared_classes() : error conditions ***\n"; diff --git a/ext/standard/tests/class_object/get_declared_classes_variation1.phpt b/ext/standard/tests/class_object/get_declared_classes_variation1.phpt index 60a46c37d0..4e9517b660 100644 --- a/ext/standard/tests/class_object/get_declared_classes_variation1.phpt +++ b/ext/standard/tests/class_object/get_declared_classes_variation1.phpt @@ -5,7 +5,7 @@ Test get_declared_classes() function : testing autoloaded classes /* Prototype : proto array get_declared_classes() * Description: Returns an array of all declared classes. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_declared_interfaces_basic_001.phpt b/ext/standard/tests/class_object/get_declared_interfaces_basic_001.phpt index a0ec715187..1d3f503da1 100644 --- a/ext/standard/tests/class_object/get_declared_interfaces_basic_001.phpt +++ b/ext/standard/tests/class_object/get_declared_interfaces_basic_001.phpt @@ -5,7 +5,7 @@ Test get_declared_interfaces() function : basic functionality /* Prototype : proto array get_declared_interfaces() * Description: Returns an array of all declared interfaces. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ @@ -17,7 +17,7 @@ var_dump(get_declared_interfaces()); foreach (get_declared_interfaces() as $interface) { if (!interface_exists($interface)) { - echo "Error: $interface is not a valid interface.\n"; + echo "Error: $interface is not a valid interface.\n"; } } diff --git a/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt b/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt index 63b02b85c3..6de6a42be2 100644 --- a/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt +++ b/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt @@ -5,7 +5,7 @@ Test get_declared_interfaces() function : error conditions /* Prototype : proto array get_declared_interfaces() * Description: Returns an array of all declared interfaces. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing get_declared_interfaces() : error conditions ***\n"; diff --git a/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt b/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt index 219dde98ac..fa2204b02a 100644 --- a/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt +++ b/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt @@ -5,7 +5,7 @@ Test get_declared_interfaces() function : autoloading of interfaces /* Prototype : proto array get_declared_interfaces() * Description: Returns an array of all declared interfaces. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_declared_traits_basic_001.phpt b/ext/standard/tests/class_object/get_declared_traits_basic_001.phpt index 69d8de9c31..989bb094f0 100644 --- a/ext/standard/tests/class_object/get_declared_traits_basic_001.phpt +++ b/ext/standard/tests/class_object/get_declared_traits_basic_001.phpt @@ -5,7 +5,7 @@ Test get_declared_traits() function : basic functionality /* Prototype : proto array get_declared_traits() * Description: Returns an array of all declared traits. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ @@ -19,7 +19,7 @@ var_dump(get_declared_traits()); foreach (get_declared_traits() as $trait) { if (!trait_exists($trait)) { - echo "Error: $trait is not a valid trait.\n"; + echo "Error: $trait is not a valid trait.\n"; } } diff --git a/ext/standard/tests/class_object/get_declared_traits_error_001.phpt b/ext/standard/tests/class_object/get_declared_traits_error_001.phpt index 0d35fa6d13..3a5624aa25 100644 --- a/ext/standard/tests/class_object/get_declared_traits_error_001.phpt +++ b/ext/standard/tests/class_object/get_declared_traits_error_001.phpt @@ -5,7 +5,7 @@ Test get_declared_traits() function : error conditions /* Prototype : proto array get_declared_traits() * Description: Returns an array of all declared traits. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing get_declared_traits() : error conditions ***\n"; diff --git a/ext/standard/tests/class_object/get_declared_traits_variation1.phpt b/ext/standard/tests/class_object/get_declared_traits_variation1.phpt index 4cb848d398..e9291e6295 100644 --- a/ext/standard/tests/class_object/get_declared_traits_variation1.phpt +++ b/ext/standard/tests/class_object/get_declared_traits_variation1.phpt @@ -5,7 +5,7 @@ Test get_declared_traits() function : testing autoloaded traits /* Prototype : proto array get_declared_traits() * Description: Returns an array of all declared traits. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_object_vars_basic_001.phpt b/ext/standard/tests/class_object/get_object_vars_basic_001.phpt index dde26e1a21..aff6357031 100644 --- a/ext/standard/tests/class_object/get_object_vars_basic_001.phpt +++ b/ext/standard/tests/class_object/get_object_vars_basic_001.phpt @@ -5,44 +5,44 @@ get_object_vars(): visibility from static methods (target object passed as arg) /* Prototype : proto array get_object_vars(object obj) * Description: Returns an array of object properties * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ Class A { private $hiddenPriv = 'A::hiddenPriv'; public static function test($b) { - echo __METHOD__ . "\n"; + echo __METHOD__ . "\n"; var_dump(get_object_vars($b)); } } Class B extends A { - private $hiddenPriv = 'B::hiddenPriv'; + private $hiddenPriv = 'B::hiddenPriv'; private $priv = 'B::priv'; protected $prot = 'B::prot'; public $pub = 'B::pub'; public static function test($b) { - echo __METHOD__ . "\n"; + echo __METHOD__ . "\n"; var_dump(get_object_vars($b)); - } + } } Class C extends B { private $hiddenPriv = 'C::hiddenPriv'; - + public static function test($b) { - echo __METHOD__ . "\n"; + echo __METHOD__ . "\n"; var_dump(get_object_vars($b)); - } + } } Class X { public static function test($b) { - echo __METHOD__ . "\n"; + echo __METHOD__ . "\n"; var_dump(get_object_vars($b)); - } + } } diff --git a/ext/standard/tests/class_object/get_object_vars_basic_002.phpt b/ext/standard/tests/class_object/get_object_vars_basic_002.phpt index 8d7c45958e..176b149e75 100644 --- a/ext/standard/tests/class_object/get_object_vars_basic_002.phpt +++ b/ext/standard/tests/class_object/get_object_vars_basic_002.phpt @@ -5,28 +5,28 @@ get_object_vars(): visibility from non static methods (target object passed as a /* Prototype : proto array get_object_vars(object obj) * Description: Returns an array of object properties * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ Class A { private $hiddenPriv = 'A::hiddenPriv'; public function testA($b) { - echo __METHOD__ . "\n"; + echo __METHOD__ . "\n"; var_dump(get_object_vars($b)); - } + } } Class B extends A { - private $hiddenPriv = 'B::hiddenPriv'; + private $hiddenPriv = 'B::hiddenPriv'; private $priv = 'B::priv'; protected $prot = 'B::prot'; public $pub = 'B::pub'; public function testB($b) { - echo __METHOD__ . "\n"; + echo __METHOD__ . "\n"; var_dump(get_object_vars($b)); - } + } } diff --git a/ext/standard/tests/class_object/get_object_vars_error_001.phpt b/ext/standard/tests/class_object/get_object_vars_error_001.phpt index 2cb37f4a91..48c89ba8fa 100644 --- a/ext/standard/tests/class_object/get_object_vars_error_001.phpt +++ b/ext/standard/tests/class_object/get_object_vars_error_001.phpt @@ -5,7 +5,7 @@ Test get_object_vars() function : error conditions - wrong number of args /* Prototype : proto array get_object_vars(object obj) * Description: Returns an array of object properties * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing get_object_vars() : error conditions ***\n"; diff --git a/ext/standard/tests/class_object/get_object_vars_variation_001.phpt b/ext/standard/tests/class_object/get_object_vars_variation_001.phpt index d0bf806763..2fe1d60f6f 100644 --- a/ext/standard/tests/class_object/get_object_vars_variation_001.phpt +++ b/ext/standard/tests/class_object/get_object_vars_variation_001.phpt @@ -5,7 +5,7 @@ get_object_vars() - ensure statics are not shown /* Prototype : proto array get_object_vars(object obj) * Description: Returns an array of object properties * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ Class A { diff --git a/ext/standard/tests/class_object/get_object_vars_variation_002.phpt b/ext/standard/tests/class_object/get_object_vars_variation_002.phpt index ef227cd8a2..7c3ad7b0e1 100644 --- a/ext/standard/tests/class_object/get_object_vars_variation_002.phpt +++ b/ext/standard/tests/class_object/get_object_vars_variation_002.phpt @@ -5,7 +5,7 @@ get_object_vars() - ensure references are preserved /* Prototype : proto array get_object_vars(object obj) * Description: Returns an array of object properties * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ $obj = new stdClass; diff --git a/ext/standard/tests/class_object/get_object_vars_variation_003.phpt b/ext/standard/tests/class_object/get_object_vars_variation_003.phpt index 7351995b6d..e42d359038 100644 --- a/ext/standard/tests/class_object/get_object_vars_variation_003.phpt +++ b/ext/standard/tests/class_object/get_object_vars_variation_003.phpt @@ -5,7 +5,7 @@ Test get_object_vars() function : usage variations - unexpected types for argum /* Prototype : proto array get_object_vars(object obj) * Description: Returns an array of object properties * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing get_object_vars() : usage variations ***\n"; diff --git a/ext/standard/tests/class_object/get_parent_class_error_001.phpt b/ext/standard/tests/class_object/get_parent_class_error_001.phpt index 40c3dba279..68fe170390 100644 --- a/ext/standard/tests/class_object/get_parent_class_error_001.phpt +++ b/ext/standard/tests/class_object/get_parent_class_error_001.phpt @@ -5,7 +5,7 @@ Test get_parent_class() function : error conditions - wrong number of args. /* Prototype : proto string get_parent_class([mixed object]) * Description: Retrieves the parent class name for object or class or current scope. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing get_parent_class() : error conditions ***\n"; diff --git a/ext/standard/tests/class_object/get_parent_class_variation_001.phpt b/ext/standard/tests/class_object/get_parent_class_variation_001.phpt index 7ffff750b2..52020edc19 100644 --- a/ext/standard/tests/class_object/get_parent_class_variation_001.phpt +++ b/ext/standard/tests/class_object/get_parent_class_variation_001.phpt @@ -5,7 +5,7 @@ Test get_parent_class() function : variation - case sensitivity /* Prototype : proto string get_parent_class([mixed object]) * Description: Retrieves the parent class name for object or class or current scope. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ // Note: basic use cases in Zend/tests/010.phpt diff --git a/ext/standard/tests/class_object/get_parent_class_variation_002.phpt b/ext/standard/tests/class_object/get_parent_class_variation_002.phpt index 97f848168d..a64398b2eb 100644 --- a/ext/standard/tests/class_object/get_parent_class_variation_002.phpt +++ b/ext/standard/tests/class_object/get_parent_class_variation_002.phpt @@ -5,7 +5,7 @@ Test get_parent_class() function : usage variations - unexpected argument type. /* Prototype : proto string get_parent_class([mixed object]) * Description: Retrieves the parent class name for object or class or current scope. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ spl_autoload_register(function ($className) { diff --git a/ext/standard/tests/class_object/interface_exists_error.phpt b/ext/standard/tests/class_object/interface_exists_error.phpt index bf95a43050..f57405d5dc 100644 --- a/ext/standard/tests/class_object/interface_exists_error.phpt +++ b/ext/standard/tests/class_object/interface_exists_error.phpt @@ -5,7 +5,7 @@ Test interface_exists() function : error conditions /* Prototype : bool interface_exists(string classname [, bool autoload]) * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing interface_exists() : error conditions ***\n"; diff --git a/ext/standard/tests/class_object/interface_exists_variation1.phpt b/ext/standard/tests/class_object/interface_exists_variation1.phpt index 34d0e1e6b0..4bdde8ba97 100644 --- a/ext/standard/tests/class_object/interface_exists_variation1.phpt +++ b/ext/standard/tests/class_object/interface_exists_variation1.phpt @@ -5,7 +5,7 @@ Test interface_exists() function : usage variation /* Prototype : bool interface_exists(string classname [, bool autoload]) * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing interface_exists() : usage variation ***\n"; diff --git a/ext/standard/tests/class_object/interface_exists_variation2.phpt b/ext/standard/tests/class_object/interface_exists_variation2.phpt index de13c101ce..ecd90e9199 100644 --- a/ext/standard/tests/class_object/interface_exists_variation2.phpt +++ b/ext/standard/tests/class_object/interface_exists_variation2.phpt @@ -5,7 +5,7 @@ Test interface_exists() function : usage variation /* Prototype : bool interface_exists(string classname [, bool autoload]) * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing interface_exists() : usage variation ***\n"; diff --git a/ext/standard/tests/class_object/interface_exists_variation3.phpt b/ext/standard/tests/class_object/interface_exists_variation3.phpt index f6ec16d63d..86d10de887 100644 --- a/ext/standard/tests/class_object/interface_exists_variation3.phpt +++ b/ext/standard/tests/class_object/interface_exists_variation3.phpt @@ -5,7 +5,7 @@ Test interface_exists() function : autoloaded interface /* Prototype : bool interface_exists(string classname [, bool autoload]) * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing interface_exists() : autoloaded interface ***\n"; diff --git a/ext/standard/tests/class_object/interface_exists_variation4.phpt b/ext/standard/tests/class_object/interface_exists_variation4.phpt index 4b61269664..95059f8247 100644 --- a/ext/standard/tests/class_object/interface_exists_variation4.phpt +++ b/ext/standard/tests/class_object/interface_exists_variation4.phpt @@ -5,7 +5,7 @@ Test interface_exists() function : test autoload default value /* Prototype : bool interface_exists(string classname [, bool autoload]) * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing interface_exists() : test autoload default value ***\n"; diff --git a/ext/standard/tests/class_object/is_a.phpt b/ext/standard/tests/class_object/is_a.phpt index 644df705c7..92d289ba18 100644 --- a/ext/standard/tests/class_object/is_a.phpt +++ b/ext/standard/tests/class_object/is_a.phpt @@ -6,22 +6,22 @@ is_a and is_subclass_of behaviour (with and without autoload) interface if_a { function f_a(); } - + interface if_b extends if_a { function f_b(); } class base { function _is_a($sub) { - + echo "\n>>> With Defined class\n"; echo str_pad('is_a( OBJECT:'.get_class($this).', '.$sub.') = ', 60) . (is_a($this, $sub) ? 'yes' : 'no')."\n"; echo str_pad('is_a( STRING:'.get_class($this).', '.$sub.') = ', 60). (is_a(get_class($this), $sub) ? 'yes' : 'no')."\n"; - echo str_pad('is_a( STRING:'.get_class($this).', '.$sub.', true) = ', 60). (is_a(get_class($this), $sub, true) ? 'yes' : 'no')."\n"; + echo str_pad('is_a( STRING:'.get_class($this).', '.$sub.', true) = ', 60). (is_a(get_class($this), $sub, true) ? 'yes' : 'no')."\n"; echo str_pad('is_subclass_of( OBJECT:'.get_class($this).', '.$sub.') = ', 60). (is_subclass_of($this, $sub) ? 'yes' : 'no')."\n"; echo str_pad('is_subclass_of( STRING:'.get_class($this).', '.$sub.') = ', 60). (is_subclass_of(get_class($this), $sub) ? 'yes' : 'no')."\n"; echo str_pad('is_subclass_of( STRING:'.get_class($this).', '.$sub.',false) = ', 60). (is_subclass_of(get_class($this), $sub , false) ? 'yes' : 'no')."\n"; - + // with autoload options.. echo ">>> With Undefined\n"; echo str_pad('is_a( STRING:undefB, '.$sub.',true) = ', 60). (is_a('undefB', $sub, true) ? 'yes' : 'no')."\n"; @@ -31,8 +31,8 @@ class base { } function test() { echo $this->_is_a('base'); - echo $this->_is_a('derived_a'); - echo $this->_is_a('if_a'); + echo $this->_is_a('derived_a'); + echo $this->_is_a('if_a'); echo $this->_is_a('undefA'); echo "\n"; } @@ -75,7 +75,7 @@ $t->test(); $t = new derived_b(); $t->test(); - + diff --git a/ext/standard/tests/class_object/is_a_error_001.phpt b/ext/standard/tests/class_object/is_a_error_001.phpt index 0c106ee4f4..d41d37b44b 100644 --- a/ext/standard/tests/class_object/is_a_error_001.phpt +++ b/ext/standard/tests/class_object/is_a_error_001.phpt @@ -5,7 +5,7 @@ Test is_a() function : error conditions - wrong number of args /* Prototype : proto bool is_a(object object, string class_name, bool allow_string) * Description: Returns true if the object is of this class or has this class as one of its parents * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing is_a() : error conditions ***\n"; diff --git a/ext/standard/tests/class_object/is_a_variation_001.phpt b/ext/standard/tests/class_object/is_a_variation_001.phpt index 228141a8de..9bd1023c52 100644 --- a/ext/standard/tests/class_object/is_a_variation_001.phpt +++ b/ext/standard/tests/class_object/is_a_variation_001.phpt @@ -5,7 +5,7 @@ Test is_a() function : usage variations - wrong type for arg 1 /* Prototype : proto bool is_a(object object, string class_name) * Description: Returns true if the object is of this class or has this class as one of its parents * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ // Note: basic use cases in Zend/tests/is_a.phpt echo "*** Testing is_a() : usage variations ***\n"; @@ -57,7 +57,7 @@ $values = array( // string data "string", 'String', - + // undefined data $undefined_var, diff --git a/ext/standard/tests/class_object/is_a_variation_002.phpt b/ext/standard/tests/class_object/is_a_variation_002.phpt index 00a7e3e3ca..5ba2c80bcc 100644 --- a/ext/standard/tests/class_object/is_a_variation_002.phpt +++ b/ext/standard/tests/class_object/is_a_variation_002.phpt @@ -5,7 +5,7 @@ Test is_a() function : usage variations - wrong type for arg 2 /* Prototype : proto bool is_a(object object, string class_name) * Description: Returns true if the object is of this class or has this class as one of its parents * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ class C { diff --git a/ext/standard/tests/class_object/is_a_variation_003.phpt b/ext/standard/tests/class_object/is_a_variation_003.phpt index 5cf33ebdd2..1ee193a7c8 100644 --- a/ext/standard/tests/class_object/is_a_variation_003.phpt +++ b/ext/standard/tests/class_object/is_a_variation_003.phpt @@ -5,7 +5,7 @@ Test is_a() function : usage variations - case sensitivity /* Prototype : proto bool is_a(object object, string class_name) * Description: Returns true if the object is of this class or has this class as one of its parents * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing is_a() : usage variations ***\n"; diff --git a/ext/standard/tests/class_object/is_subclass_of_error_001.phpt b/ext/standard/tests/class_object/is_subclass_of_error_001.phpt index 62ccf6d342..3224e56e9e 100644 --- a/ext/standard/tests/class_object/is_subclass_of_error_001.phpt +++ b/ext/standard/tests/class_object/is_subclass_of_error_001.phpt @@ -5,7 +5,7 @@ Test is_subclass_of() function : wrong number of args /* Prototype : proto bool is_subclass_of(object object, string class_name) * Description: Returns true if the object has this class as one of its parents * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing is_subclass_of() : error conditions ***\n"; diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt index b1cb553abd..d2f8f0745b 100644 --- a/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt +++ b/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt @@ -5,7 +5,7 @@ Test is_subclass_of() function : usage variations - unexpected type for arg 1 /* Prototype : proto bool is_subclass_of(object object, string class_name) * Description: Returns true if the object has this class as one of its parents * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ // Note: basic use cases in Zend/tests/is_a.phpt spl_autoload_register(function ($className) { diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt index 85f697654d..150ea3da9c 100644 --- a/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt +++ b/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt @@ -5,7 +5,7 @@ Test is_subclass_of() function : usage variations - unexpected type for arg 2 /* Prototype : proto bool is_subclass_of(object object, string class_name) * Description: Returns true if the object has this class as one of its parents * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ spl_autoload_register(function ($className) { diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt index 3497ecc1f8..e77de23a1e 100644 --- a/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt +++ b/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt @@ -5,7 +5,7 @@ Test is_subclass_of() function : usage variations - case sensitivity /* Prototype : proto bool is_subclass_of(object object, string class_name) * Description: Returns true if the object has this class as one of its parents * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing is_subclass_of() : usage variations ***\n"; diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt index adecd5003d..4d2bef3cb3 100644 --- a/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt +++ b/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt @@ -5,7 +5,7 @@ Test is_subclass_of() function : usage variations - unexpected type for arg 1 w /* Prototype : proto bool is_subclass_of(object object, string class_name) * Description: Returns true if the object has this class as one of its parents * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ // Note: basic use cases in Zend/tests/is_a.phpt spl_autoload_register(function ($className) { diff --git a/ext/standard/tests/class_object/method_exists_basic_001.phpt b/ext/standard/tests/class_object/method_exists_basic_001.phpt index 44eaefbf56..282ca4a4f6 100644 --- a/ext/standard/tests/class_object/method_exists_basic_001.phpt +++ b/ext/standard/tests/class_object/method_exists_basic_001.phpt @@ -5,7 +5,7 @@ method_exists() on userspace classes; static & non-static methods with various v /* Prototype : proto bool is_subclass_of(object object, string class_name) * Description: Returns true if the object has this class as one of its parents * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ Class B { @@ -14,7 +14,7 @@ Class B { private function inherit_priv() {} static public function inherit_static_pub() {} static protected function inherit_static_prot() {} - static private function inherit_static_priv() {} + static private function inherit_static_priv() {} } Class C extends B { diff --git a/ext/standard/tests/class_object/method_exists_basic_002.phpt b/ext/standard/tests/class_object/method_exists_basic_002.phpt index 6a17786b32..fc64ee49a9 100644 --- a/ext/standard/tests/class_object/method_exists_basic_002.phpt +++ b/ext/standard/tests/class_object/method_exists_basic_002.phpt @@ -5,7 +5,7 @@ method_exists() on internal classes /* Prototype : proto bool is_subclass_of(object object, string class_name) * Description: Returns true if the object has this class as one of its parents * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo " ---(Internal classes, using string class name)---\n"; diff --git a/ext/standard/tests/class_object/method_exists_basic_003.phpt b/ext/standard/tests/class_object/method_exists_basic_003.phpt index c10763267c..7714341c87 100644 --- a/ext/standard/tests/class_object/method_exists_basic_003.phpt +++ b/ext/standard/tests/class_object/method_exists_basic_003.phpt @@ -5,11 +5,11 @@ method_exists() on non-existent class, with __autoload(). /* Prototype : proto bool is_subclass_of(object object, string class_name) * Description: Returns true if the object has this class as one of its parents * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ spl_autoload_register(function ($name) { - echo "In autoload($name)\n"; + echo "In autoload($name)\n"; }); var_dump(method_exists('UndefC', 'func')); diff --git a/ext/standard/tests/class_object/method_exists_error_001.phpt b/ext/standard/tests/class_object/method_exists_error_001.phpt index 929d84a76f..1f645d6717 100644 --- a/ext/standard/tests/class_object/method_exists_error_001.phpt +++ b/ext/standard/tests/class_object/method_exists_error_001.phpt @@ -5,7 +5,7 @@ Test method_exists() function : error conditions - wrong number of args /* Prototype : proto bool method_exists(object object, string method) * Description: Checks if the class method exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing method_exists() : error conditions ***\n"; diff --git a/ext/standard/tests/class_object/method_exists_variation_001.phpt b/ext/standard/tests/class_object/method_exists_variation_001.phpt index b41a1a11ae..aa7e1be429 100644 --- a/ext/standard/tests/class_object/method_exists_variation_001.phpt +++ b/ext/standard/tests/class_object/method_exists_variation_001.phpt @@ -5,7 +5,7 @@ Test method_exists() function : usage variations - unexpected type for arg 1 /* Prototype : proto bool method_exists(object object, string method) * Description: Checks if the class method exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ spl_autoload_register(function ($className) { diff --git a/ext/standard/tests/class_object/method_exists_variation_002.phpt b/ext/standard/tests/class_object/method_exists_variation_002.phpt index 5c924bdc5a..e78181375c 100644 --- a/ext/standard/tests/class_object/method_exists_variation_002.phpt +++ b/ext/standard/tests/class_object/method_exists_variation_002.phpt @@ -5,7 +5,7 @@ Test method_exists() function : usage variations - unexpected type for arg 2 /* Prototype : proto bool method_exists(object object, string method) * Description: Checks if the class method exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ spl_autoload_register(function ($className) { diff --git a/ext/standard/tests/class_object/method_exists_variation_003.phpt b/ext/standard/tests/class_object/method_exists_variation_003.phpt index f82dc01b9c..cb0e0026d6 100644 --- a/ext/standard/tests/class_object/method_exists_variation_003.phpt +++ b/ext/standard/tests/class_object/method_exists_variation_003.phpt @@ -5,7 +5,7 @@ Test method_exists() function : variation - Case sensitivity /* Prototype : proto bool method_exists(object object, string method) * Description: Checks if the class method exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing method_exists() : variation ***\n"; diff --git a/ext/standard/tests/class_object/property_exists_error.phpt b/ext/standard/tests/class_object/property_exists_error.phpt index e40e08b32a..4d51a64507 100644 --- a/ext/standard/tests/class_object/property_exists_error.phpt +++ b/ext/standard/tests/class_object/property_exists_error.phpt @@ -5,7 +5,7 @@ Test property_exists() function : error conditions /* Prototype : bool property_exists(mixed object_or_class, string property_name) * Description: Checks if the object or class has a property * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing property_exists() : error conditions ***\n"; diff --git a/ext/standard/tests/class_object/property_exists_variation1.phpt b/ext/standard/tests/class_object/property_exists_variation1.phpt index 1a9ff32659..7a88449222 100644 --- a/ext/standard/tests/class_object/property_exists_variation1.phpt +++ b/ext/standard/tests/class_object/property_exists_variation1.phpt @@ -5,7 +5,7 @@ Test property_exists() function : class auto loading /* Prototype : bool property_exists(mixed object_or_class, string property_name) * Description: Checks if the object or class has a property * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing property_exists() : class auto loading ***\n"; diff --git a/ext/standard/tests/class_object/trait_class_exists_variation_003.phpt b/ext/standard/tests/class_object/trait_class_exists_variation_003.phpt index 6548c32687..c865705b14 100644 --- a/ext/standard/tests/class_object/trait_class_exists_variation_003.phpt +++ b/ext/standard/tests/class_object/trait_class_exists_variation_003.phpt @@ -5,7 +5,7 @@ Test trait_exists() function : usage variations - case sensitivity /* Prototype : proto bool trait_exists(string traitname [, bool autoload]) * Description: Checks if the trait exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ trait caseSensitivityTest {} diff --git a/ext/standard/tests/class_object/trait_exists_basic_001.phpt b/ext/standard/tests/class_object/trait_exists_basic_001.phpt index d587ec7d78..d47ba7ad46 100644 --- a/ext/standard/tests/class_object/trait_exists_basic_001.phpt +++ b/ext/standard/tests/class_object/trait_exists_basic_001.phpt @@ -5,7 +5,7 @@ Test trait_exists() function : basic functionality /* Prototype : proto bool trait_exists(string traitname [, bool autoload]) * Description: Checks if the trait exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing trait_exists() : basic functionality ***\n"; diff --git a/ext/standard/tests/class_object/trait_exists_error_001.phpt b/ext/standard/tests/class_object/trait_exists_error_001.phpt index b80f06ed2a..a60788b53d 100644 --- a/ext/standard/tests/class_object/trait_exists_error_001.phpt +++ b/ext/standard/tests/class_object/trait_exists_error_001.phpt @@ -5,7 +5,7 @@ Test trait_exists() function : error conditions (wrong number of arguments) /* Prototype : proto bool trait_exists(string traitname [, bool autoload]) * Description: Checks if the trait exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ /** diff --git a/ext/standard/tests/class_object/trait_exists_variation_001.phpt b/ext/standard/tests/class_object/trait_exists_variation_001.phpt index 4fd2b8d5af..39a843a167 100644 --- a/ext/standard/tests/class_object/trait_exists_variation_001.phpt +++ b/ext/standard/tests/class_object/trait_exists_variation_001.phpt @@ -5,7 +5,7 @@ Test trait_exists() function : usage variations - unexpected types for argument /* Prototype : proto bool trait_exists(string traitname [, bool autoload]) * Description: Checks if the trait exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ spl_autoload_register(function ($traitName) { diff --git a/ext/standard/tests/class_object/trait_exists_variation_002.phpt b/ext/standard/tests/class_object/trait_exists_variation_002.phpt index fdd2da2dbb..bdf1e2cb82 100644 --- a/ext/standard/tests/class_object/trait_exists_variation_002.phpt +++ b/ext/standard/tests/class_object/trait_exists_variation_002.phpt @@ -5,7 +5,7 @@ Test trait_exists() function : usage variations - unexpected types for argument /* Prototype : proto bool trait_exists(string traitname [, bool autoload]) * Description: Checks if the trait exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ spl_autoload_register(function ($traitName) { diff --git a/ext/standard/tests/dir/chdir_variation1-win32-mb.phpt b/ext/standard/tests/dir/chdir_variation1-win32-mb.phpt index 90402f4c49..0383410cb7 100644 --- a/ext/standard/tests/dir/chdir_variation1-win32-mb.phpt +++ b/ext/standard/tests/dir/chdir_variation1-win32-mb.phpt @@ -31,11 +31,11 @@ unset ($unset_var); // get a class class classA { var $dir_path; - + function __construct($dir) { $this->dir_path = $dir; } - + public function __toString() { return "$this->dir_path"; } @@ -74,7 +74,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -84,7 +84,7 @@ $inputs = array( /*19*/ "$dir_path", 'string', $heredoc, - + // object data /*22*/ new classA($dir_path), diff --git a/ext/standard/tests/dir/chdir_variation1.phpt b/ext/standard/tests/dir/chdir_variation1.phpt index c4c0431ccc..bad543fa6e 100644 --- a/ext/standard/tests/dir/chdir_variation1.phpt +++ b/ext/standard/tests/dir/chdir_variation1.phpt @@ -25,11 +25,11 @@ unset ($unset_var); // get a class class classA { var $dir_path; - + function __construct($dir) { $this->dir_path = $dir; } - + public function __toString() { return "$this->dir_path"; } @@ -68,7 +68,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -78,7 +78,7 @@ $inputs = array( /*19*/ "$dir_path", 'string', $heredoc, - + // object data /*22*/ new classA($dir_path), diff --git a/ext/standard/tests/dir/closedir_variation1.phpt b/ext/standard/tests/dir/closedir_variation1.phpt index 1f917b2ab5..9e46f114fd 100644 --- a/ext/standard/tests/dir/closedir_variation1.phpt +++ b/ext/standard/tests/dir/closedir_variation1.phpt @@ -56,7 +56,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -66,7 +66,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/dir/dir_basic-win32-mb.phpt b/ext/standard/tests/dir/dir_basic-win32-mb.phpt index d562c0b7e3..d6c8ebca8f 100644 --- a/ext/standard/tests/dir/dir_basic-win32-mb.phpt +++ b/ext/standard/tests/dir/dir_basic-win32-mb.phpt @@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { ?> --FILE-- <?php -/* +/* * Prototype : object dir(string $directory[, resource $context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Source code: ext/standard/dir.c diff --git a/ext/standard/tests/dir/dir_basic.phpt b/ext/standard/tests/dir/dir_basic.phpt index da364b9b60..68ac552a6f 100644 --- a/ext/standard/tests/dir/dir_basic.phpt +++ b/ext/standard/tests/dir/dir_basic.phpt @@ -2,7 +2,7 @@ Test dir() function : basic functionality --FILE-- <?php -/* +/* * Prototype : object dir(string $directory[, resource $context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Source code: ext/standard/dir.c diff --git a/ext/standard/tests/dir/dir_error.phpt b/ext/standard/tests/dir/dir_error.phpt index f2ef25cc87..6f14188e8b 100644 --- a/ext/standard/tests/dir/dir_error.phpt +++ b/ext/standard/tests/dir/dir_error.phpt @@ -2,7 +2,7 @@ Test dir() function : error conditions --FILE-- <?php -/* +/* * Prototype : object dir(string $directory[, resource $context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Source code: ext/standard/dir.c diff --git a/ext/standard/tests/dir/dir_variation2-win32-mb.phpt b/ext/standard/tests/dir/dir_variation2-win32-mb.phpt index 33d692c320..f538b92f87 100644 --- a/ext/standard/tests/dir/dir_variation2-win32-mb.phpt +++ b/ext/standard/tests/dir/dir_variation2-win32-mb.phpt @@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { ?> --FILE-- <?php -/* +/* * Prototype : object dir(string $directory[, resource $context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Source code: ext/standard/dir.c diff --git a/ext/standard/tests/dir/dir_variation2.phpt b/ext/standard/tests/dir/dir_variation2.phpt index 765417c62c..df6320c00a 100644 --- a/ext/standard/tests/dir/dir_variation2.phpt +++ b/ext/standard/tests/dir/dir_variation2.phpt @@ -2,7 +2,7 @@ Test dir() function : usage variations - unexpected value for 'context' argument --FILE-- <?php -/* +/* * Prototype : object dir(string $directory[, resource $context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Source code: ext/standard/dir.c diff --git a/ext/standard/tests/dir/dir_variation3.phpt b/ext/standard/tests/dir/dir_variation3.phpt index f8d325874e..b6cc96ddbb 100644 --- a/ext/standard/tests/dir/dir_variation3.phpt +++ b/ext/standard/tests/dir/dir_variation3.phpt @@ -17,7 +17,7 @@ unlink($filename); ?> --FILE-- <?php -/* +/* * Prototype : object dir(string $directory[, resource $context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Source code: ext/standard/dir.c diff --git a/ext/standard/tests/dir/dir_variation4-win32-mb.phpt b/ext/standard/tests/dir/dir_variation4-win32-mb.phpt index 156b836562..71fe0b2979 100644 --- a/ext/standard/tests/dir/dir_variation4-win32-mb.phpt +++ b/ext/standard/tests/dir/dir_variation4-win32-mb.phpt @@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { ?> --FILE-- <?php -/* +/* * Prototype : object dir(string $directory[, resource $context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Source code: ext/standard/dir.c diff --git a/ext/standard/tests/dir/dir_variation4.phpt b/ext/standard/tests/dir/dir_variation4.phpt index 62b10b2a86..ae57413754 100644 --- a/ext/standard/tests/dir/dir_variation4.phpt +++ b/ext/standard/tests/dir/dir_variation4.phpt @@ -2,7 +2,7 @@ Test dir() function : usage variations - operate on previously opened directory --FILE-- <?php -/* +/* * Prototype : object dir(string $directory[, resource $context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Source code: ext/standard/dir.c diff --git a/ext/standard/tests/dir/dir_variation5.phpt b/ext/standard/tests/dir/dir_variation5.phpt index c7450eafc0..e26b925311 100644 --- a/ext/standard/tests/dir/dir_variation5.phpt +++ b/ext/standard/tests/dir/dir_variation5.phpt @@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { ?> --FILE-- <?php -/* +/* * Prototype : object dir(string $directory[, resource $context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Source code: ext/standard/dir.c diff --git a/ext/standard/tests/dir/dir_variation6.phpt b/ext/standard/tests/dir/dir_variation6.phpt index 71cbf1fa17..3fdfc789e2 100644 --- a/ext/standard/tests/dir/dir_variation6.phpt +++ b/ext/standard/tests/dir/dir_variation6.phpt @@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { ?> --FILE-- <?php -/* +/* * Prototype : object dir(string $directory[, resource $context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Source code: ext/standard/dir.c diff --git a/ext/standard/tests/dir/dir_variation7.phpt b/ext/standard/tests/dir/dir_variation7.phpt index ca168f90aa..ebf4a9ac24 100644 --- a/ext/standard/tests/dir/dir_variation7.phpt +++ b/ext/standard/tests/dir/dir_variation7.phpt @@ -17,13 +17,13 @@ unlink($filename); ?> --FILE-- <?php -/* +/* * Prototype : object dir(string $directory[, resource $context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Source code: ext/standard/dir.c */ -/* +/* * remove the execute permission from the parent dir and test dir() on child dir * 1) remove write & execute permission from the 1st parent and test dir() * 2) remove execute permission from 2nd parent and test dir() diff --git a/ext/standard/tests/dir/dir_variation8.phpt b/ext/standard/tests/dir/dir_variation8.phpt index 5ecf449923..9d24e4ac1a 100644 --- a/ext/standard/tests/dir/dir_variation8.phpt +++ b/ext/standard/tests/dir/dir_variation8.phpt @@ -8,13 +8,13 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { ?> --FILE-- <?php -/* +/* * Prototype : object dir(string $directory[, resource $context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Source code: ext/standard/dir.c */ -/* +/* * Create more than one temporary directory & subdirectory and check if dir() function can open * those directories when wildcard characters are used to refer to them. */ @@ -31,7 +31,7 @@ $sub_dir_path = $dir_path."/sub_dir1"; /* with different wildcard characters */ -echo "-- wildcard = '*' --\n"; +echo "-- wildcard = '*' --\n"; var_dump( dir($file_path."/dir_var*") ); var_dump( dir($file_path."/*") ); diff --git a/ext/standard/tests/dir/dir_variation9.phpt b/ext/standard/tests/dir/dir_variation9.phpt index 458d0b896f..3756ffd42d 100644 --- a/ext/standard/tests/dir/dir_variation9.phpt +++ b/ext/standard/tests/dir/dir_variation9.phpt @@ -8,13 +8,13 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { ?> --FILE-- <?php -/* +/* * Prototype : object dir(string $directory[, resource $context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Source code: ext/standard/dir.c */ -/* +/* * Checking the behavior of dir() function by passing directories which * have valid and invalid relative path. */ diff --git a/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt b/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt index 5d43962378..d3aeec213f 100644 --- a/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt +++ b/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt @@ -33,7 +33,7 @@ unset ($unset_var); // get a class class classA { - public function __toString() + public function __toString() { return "Class A object"; } @@ -72,7 +72,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -82,7 +82,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/dir/opendir_variation2.phpt b/ext/standard/tests/dir/opendir_variation2.phpt index ea9cac504d..ea75955035 100644 --- a/ext/standard/tests/dir/opendir_variation2.phpt +++ b/ext/standard/tests/dir/opendir_variation2.phpt @@ -27,7 +27,7 @@ unset ($unset_var); // get a class class classA { - public function __toString() + public function __toString() { return "Class A object"; } @@ -66,7 +66,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -76,7 +76,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/dir/opendir_variation6-win32.phpt b/ext/standard/tests/dir/opendir_variation6-win32.phpt index f54a2ad4ae..df9fcbb75b 100644 --- a/ext/standard/tests/dir/opendir_variation6-win32.phpt +++ b/ext/standard/tests/dir/opendir_variation6-win32.phpt @@ -28,7 +28,7 @@ mkdir($sub_dir_path); // with different wildcard characters -echo "\n-- Wildcard = '*' --\n"; +echo "\n-- Wildcard = '*' --\n"; var_dump( opendir($file_path . "/opendir_var*") ); var_dump( opendir($file_path . "/*") ); diff --git a/ext/standard/tests/dir/opendir_variation6.phpt b/ext/standard/tests/dir/opendir_variation6.phpt index f3fc0bd6df..4494772dcc 100644 --- a/ext/standard/tests/dir/opendir_variation6.phpt +++ b/ext/standard/tests/dir/opendir_variation6.phpt @@ -28,7 +28,7 @@ mkdir($sub_dir_path); // with different wildcard characters -echo "\n-- Wildcard = '*' --\n"; +echo "\n-- Wildcard = '*' --\n"; var_dump( opendir($file_path . "/opendir_var*") ); var_dump( opendir($file_path . "/*") ); diff --git a/ext/standard/tests/dir/opendir_variation7.phpt b/ext/standard/tests/dir/opendir_variation7.phpt index 2ad41b1d31..c16da417e2 100644 --- a/ext/standard/tests/dir/opendir_variation7.phpt +++ b/ext/standard/tests/dir/opendir_variation7.phpt @@ -68,7 +68,7 @@ foreach ($permission_values as $perm) { var_dump( chmod($dir_path, $perm) ); var_dump($dh = opendir($dir_path)); - + if (is_resource($dh)) { closedir($dh); } diff --git a/ext/standard/tests/dir/readdir_error-win32-mb.phpt b/ext/standard/tests/dir/readdir_error-win32-mb.phpt index 1388987259..9938c71f22 100644 --- a/ext/standard/tests/dir/readdir_error-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_error-win32-mb.phpt @@ -38,7 +38,7 @@ closedir($dir_handle); <?php $path = dirname(__FILE__) . "/私はガラスを食べられますreaddir_error"; rmdir($path); -?> +?> --EXPECTF-- *** Testing readdir() : error conditions *** diff --git a/ext/standard/tests/dir/readdir_error.phpt b/ext/standard/tests/dir/readdir_error.phpt index 23ba3dfa63..88cfb7a9fa 100644 --- a/ext/standard/tests/dir/readdir_error.phpt +++ b/ext/standard/tests/dir/readdir_error.phpt @@ -32,7 +32,7 @@ closedir($dir_handle); <?php $path = dirname(__FILE__) . "/readdir_error"; rmdir($path); -?> +?> --EXPECTF-- *** Testing readdir() : error conditions *** diff --git a/ext/standard/tests/dir/readdir_variation1.phpt b/ext/standard/tests/dir/readdir_variation1.phpt index 7b282dbb9e..25efaf10bd 100644 --- a/ext/standard/tests/dir/readdir_variation1.phpt +++ b/ext/standard/tests/dir/readdir_variation1.phpt @@ -55,7 +55,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -65,7 +65,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt index 2d1e6a6fba..5be20d93c2 100644 --- a/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt @@ -34,7 +34,7 @@ create_files($path_sub, 2); $dir_handle = opendir($path_top); while(FALSE !== ($file = readdir($dir_handle))) { - + // different OS order files differently so will // store file names into an array so can use sorted in expected output $contents[] = $file; diff --git a/ext/standard/tests/dir/readdir_variation3.phpt b/ext/standard/tests/dir/readdir_variation3.phpt index 8925b20ab4..eb6c31d6ce 100644 --- a/ext/standard/tests/dir/readdir_variation3.phpt +++ b/ext/standard/tests/dir/readdir_variation3.phpt @@ -28,7 +28,7 @@ create_files($path_sub, 2); $dir_handle = opendir($path_top); while(FALSE !== ($file = readdir($dir_handle))) { - + // different OS order files differently so will // store file names into an array so can use sorted in expected output $contents[] = $file; diff --git a/ext/standard/tests/dir/readdir_variation4-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation4-win32-mb.phpt index 6540d8e571..61116ab9c2 100644 --- a/ext/standard/tests/dir/readdir_variation4-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_variation4-win32-mb.phpt @@ -42,7 +42,7 @@ $inputs = array( 12.3456789000e10, 12.3456789000E-10, .5, - + // empty data /*10*/ "", array(), @@ -66,11 +66,11 @@ foreach($inputs as $key => $input) { echo "\n-- Call to readdir() --\n"; $dir_handle = opendir($dir_path); while(FALSE !== ($file = readdir($dir_handle))){ - + // different OS order files differently so will // store file names into an array so can use sorted in expected output $contents[] = $file; - + // remove files while going through directory @unlink($dir_path . $file); } diff --git a/ext/standard/tests/dir/readdir_variation4.phpt b/ext/standard/tests/dir/readdir_variation4.phpt index 9b04a986a6..d831394e8a 100644 --- a/ext/standard/tests/dir/readdir_variation4.phpt +++ b/ext/standard/tests/dir/readdir_variation4.phpt @@ -36,7 +36,7 @@ $inputs = array( 12.3456789000e10, 12.3456789000E-10, .5, - + // empty data /*10*/ "", array(), @@ -60,11 +60,11 @@ foreach($inputs as $key => $input) { echo "\n-- Call to readdir() --\n"; $dir_handle = opendir($dir_path); while(FALSE !== ($file = readdir($dir_handle))){ - + // different OS order files differently so will // store file names into an array so can use sorted in expected output $contents[] = $file; - + // remove files while going through directory @unlink($dir_path . $file); } diff --git a/ext/standard/tests/dir/readdir_variation5.phpt b/ext/standard/tests/dir/readdir_variation5.phpt index 8c12f13dfb..81b54139a8 100644 --- a/ext/standard/tests/dir/readdir_variation5.phpt +++ b/ext/standard/tests/dir/readdir_variation5.phpt @@ -55,7 +55,7 @@ $permission_values = array( $iterator = 1; foreach($permission_values as $perm) { echo "\n-- Iteration $iterator --\n"; - + if (is_dir($dir_path)) { chmod ($dir_path, 0777); // change dir permission to allow all operation rmdir ($dir_path); diff --git a/ext/standard/tests/dir/rewinddir_variation1.phpt b/ext/standard/tests/dir/rewinddir_variation1.phpt index f99e84231d..833da1c5c5 100644 --- a/ext/standard/tests/dir/rewinddir_variation1.phpt +++ b/ext/standard/tests/dir/rewinddir_variation1.phpt @@ -56,7 +56,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -66,7 +66,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/dir/scandir_variation1.phpt b/ext/standard/tests/dir/scandir_variation1.phpt index ccd5bb967a..dfdd0509cd 100644 --- a/ext/standard/tests/dir/scandir_variation1.phpt +++ b/ext/standard/tests/dir/scandir_variation1.phpt @@ -64,7 +64,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -74,7 +74,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/dir/scandir_variation2-mb.phpt b/ext/standard/tests/dir/scandir_variation2-mb.phpt index 7ee58ad450..439d53a4df 100644 --- a/ext/standard/tests/dir/scandir_variation2-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation2-mb.phpt @@ -64,7 +64,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -74,7 +74,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/dir/scandir_variation2.phpt b/ext/standard/tests/dir/scandir_variation2.phpt index a3ee88a3be..95200649ed 100644 --- a/ext/standard/tests/dir/scandir_variation2.phpt +++ b/ext/standard/tests/dir/scandir_variation2.phpt @@ -64,7 +64,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -74,7 +74,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt index 4a81d209e5..3a5391011d 100644 --- a/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt @@ -69,7 +69,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -79,7 +79,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/dir/scandir_variation3.phpt b/ext/standard/tests/dir/scandir_variation3.phpt index a75396aecd..9630373b76 100644 --- a/ext/standard/tests/dir/scandir_variation3.phpt +++ b/ext/standard/tests/dir/scandir_variation3.phpt @@ -63,7 +63,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -73,7 +73,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/dir/scandir_variation5.phpt b/ext/standard/tests/dir/scandir_variation5.phpt index d6d3c79e40..0835af0713 100644 --- a/ext/standard/tests/dir/scandir_variation5.phpt +++ b/ext/standard/tests/dir/scandir_variation5.phpt @@ -30,7 +30,7 @@ unlink($filename); echo "*** Testing scandir() : usage variations ***\n"; -/* +/* * create the temporary directory : * scandir_variation5 ( parent ) * |-> sub_dir ( sub parent ) diff --git a/ext/standard/tests/dir/scandir_variation6.phpt b/ext/standard/tests/dir/scandir_variation6.phpt index 754c615290..0a528466a4 100644 --- a/ext/standard/tests/dir/scandir_variation6.phpt +++ b/ext/standard/tests/dir/scandir_variation6.phpt @@ -29,7 +29,7 @@ mkdir($sub_dir_path); // with different wildcard characters -echo "\n-- Wildcard = '*' --\n"; +echo "\n-- Wildcard = '*' --\n"; var_dump( scandir($file_path . "/scandir_var*") ); var_dump( scandir($file_path . "/*") ); diff --git a/ext/standard/tests/dir/scandir_variation7.phpt b/ext/standard/tests/dir/scandir_variation7.phpt index 6ef4b67ce9..63fbdbf423 100644 --- a/ext/standard/tests/dir/scandir_variation7.phpt +++ b/ext/standard/tests/dir/scandir_variation7.phpt @@ -53,7 +53,7 @@ $permission_values = array( $iterator = 1; foreach ($permission_values as $perm) { echo "\n-- Iteration $iterator --\n"; - + // Remove the directory if already exists if (is_dir($dir_path)){ chmod ($dir_path, 0777); // change dir permission to allow all operation @@ -63,7 +63,7 @@ foreach ($permission_values as $perm) { // change the dir permisson to test dir on it var_dump( chmod($dir_path, $perm) ); - + var_dump(scandir($dir_path)); $iterator++; } diff --git a/ext/standard/tests/dir/scandir_variation8-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation8-win32-mb.phpt index f30645da45..ab6cb11036 100644 --- a/ext/standard/tests/dir/scandir_variation8-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation8-win32-mb.phpt @@ -42,7 +42,7 @@ $inputs = array( 12.3456789000e10, 12.3456789000E-10, .5, - + // empty data /*10*/ "", array(), diff --git a/ext/standard/tests/dir/scandir_variation8.phpt b/ext/standard/tests/dir/scandir_variation8.phpt index 4e96e04a4e..73aa60f11f 100644 --- a/ext/standard/tests/dir/scandir_variation8.phpt +++ b/ext/standard/tests/dir/scandir_variation8.phpt @@ -36,7 +36,7 @@ $inputs = array( 12.3456789000e10, 12.3456789000E-10, .5, - + // empty data /*10*/ "", array(), diff --git a/ext/standard/tests/directory/DirectoryClass_basic_001.phpt b/ext/standard/tests/directory/DirectoryClass_basic_001.phpt index 0accb2c85f..73aac5b43c 100644 --- a/ext/standard/tests/directory/DirectoryClass_basic_001.phpt +++ b/ext/standard/tests/directory/DirectoryClass_basic_001.phpt @@ -2,7 +2,7 @@ Directory class behaviour. --FILE-- <?php -/* +/* * Prototype: object dir(string directory[, resource context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Class is defined in ext/standard/dir.c diff --git a/ext/standard/tests/directory/bug74589_utf8.phpt b/ext/standard/tests/directory/bug74589_utf8.phpt index 686e005b8a..deba03c582 100644 --- a/ext/standard/tests/directory/bug74589_utf8.phpt +++ b/ext/standard/tests/directory/bug74589_utf8.phpt @@ -33,7 +33,7 @@ echo shell_exec("$php -n $test_file"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%sbug74589_新建文件夹" string(%d) "%sbug74589_新建文件夹%etest.php" bool(true) diff --git a/ext/standard/tests/file/004.phpt b/ext/standard/tests/file/004.phpt index f1fab47ac3..3fead8b215 100644 --- a/ext/standard/tests/file/004.phpt +++ b/ext/standard/tests/file/004.phpt @@ -20,7 +20,7 @@ file_put_contents() test echo 'FAIL'; } echo "\n"; - + $old_int = $int = time() / 1000; $ret = file_put_contents("TEST3", $int); echo "Float Test: "; @@ -30,7 +30,7 @@ file_put_contents() test echo 'FAIL'; } echo "\n"; - + $ret = file_put_contents("TEST4", __FILE__); echo "Bool Test: "; if ($ret !== FALSE && md5(__FILE__) == md5_file("TEST4")) { @@ -39,7 +39,7 @@ file_put_contents() test echo 'FAIL'; } echo "\n"; - + $ret = @file_put_contents("TEST5", $_SERVER); echo "Array Test: "; if ($ret !== FALSE && @md5(implode('', $_SERVER)) == md5_file("TEST5")) { diff --git a/ext/standard/tests/file/005_basic.phpt b/ext/standard/tests/file/005_basic.phpt index 5ed1118902..329fd15773 100644 --- a/ext/standard/tests/file/005_basic.phpt +++ b/ext/standard/tests/file/005_basic.phpt @@ -39,7 +39,7 @@ echo "\n*** Done ***\n"; unlink(dirname(__FILE__)."/005_basic.tmp"); unlink(dirname(__FILE__)."/005_basic"); ?> ---EXPECTF-- +--EXPECTF-- *** Testing the basic functionality with file *** %d:%s:%s:%d:%d:%d %d:%s:%s:%d:%d:%d diff --git a/ext/standard/tests/file/005_error.phpt b/ext/standard/tests/file/005_error.phpt index 20ba3a7fc0..d8bf6c5ee9 100644 --- a/ext/standard/tests/file/005_error.phpt +++ b/ext/standard/tests/file/005_error.phpt @@ -56,7 +56,7 @@ var_dump( touch(__FILE__, 10, 100, 123) ); echo "\nDone"; ?> ---EXPECTF-- +--EXPECTF-- *** Testing error conditions *** -- Testing with Non-existing files -- diff --git a/ext/standard/tests/file/005_variation-win32.phpt b/ext/standard/tests/file/005_variation-win32.phpt index ffcdc33cd6..30c627abf1 100644 --- a/ext/standard/tests/file/005_variation-win32.phpt +++ b/ext/standard/tests/file/005_variation-win32.phpt @@ -31,13 +31,13 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { Description: Prints access, modification and change times of a file */ function stat_fn( $filename ) { - echo "-- File access time is => "; + echo "-- File access time is => "; print( @date( 'Y:M:D:H:i:s', fileatime($filename) ) )."\n"; clearstatcache(); - echo "-- File modification time is => "; + echo "-- File modification time is => "; print( @date( 'Y:M:D:H:i:s', filemtime($filename) ) )."\n"; clearstatcache(); - echo "-- inode change time is => "; + echo "-- inode change time is => "; print( @date( 'Y:M:D:H:i:s', filectime($filename) ) )."\n"; clearstatcache(); @@ -120,7 +120,7 @@ stat_fn($file_name2); sleep(2); /* set to access(creation time of the file) time */ -var_dump( touch($file_name2, @date(fileatime($file_name2))) ); +var_dump( touch($file_name2, @date(fileatime($file_name2))) ); stat_fn($file_name2); sleep(2); @@ -134,8 +134,8 @@ var_dump( touch($file_name2, 10) ); stat_fn($file_name2); var_dump( touch($file_name2, 10, 20) ); stat_fn($file_name2); - -/* touch() after renaming the file */ + +/* touch() after renaming the file */ rename($file_name2, "$file_path/005_variation_touch_new.tmp"); stat_fn("$file_path/005_variation_touch_new.tmp"); diff --git a/ext/standard/tests/file/005_variation.phpt b/ext/standard/tests/file/005_variation.phpt index 7e5eedc2b1..510560772e 100644 --- a/ext/standard/tests/file/005_variation.phpt +++ b/ext/standard/tests/file/005_variation.phpt @@ -34,13 +34,13 @@ if (getenv("SKIP_SLOW_TESTS")) { Description: Prints access, modification and change times of a file */ function stat_fn( $filename ) { - echo "-- File access time is => "; + echo "-- File access time is => "; print( @date( 'Y:M:D:H:i:s', fileatime($filename) ) )."\n"; clearstatcache(); - echo "-- File modification time is => "; + echo "-- File modification time is => "; print( @date( 'Y:M:D:H:i:s', filemtime($filename) ) )."\n"; clearstatcache(); - echo "-- inode change time is => "; + echo "-- inode change time is => "; print( @date( 'Y:M:D:H:i:s', filectime($filename) ) )."\n"; clearstatcache(); @@ -135,7 +135,7 @@ stat_fn($file_name2); sleep(2); /* set to access(creation time of the file) time */ -var_dump( touch($file_name2, @date(fileatime($file_name2))) ); +var_dump( touch($file_name2, @date(fileatime($file_name2))) ); stat_fn($file_name2); sleep(2); @@ -149,8 +149,8 @@ var_dump( touch($file_name2, 10) ); stat_fn($file_name2); var_dump( touch($file_name2, 10, 20) ); stat_fn($file_name2); - -/* touch() after renaming the file */ + +/* touch() after renaming the file */ rename($file_name2, "$file_path/005_variation_touch_new.tmp"); stat_fn("$file_path/005_variation_touch_new.tmp"); diff --git a/ext/standard/tests/file/005_variation2-win32.phpt b/ext/standard/tests/file/005_variation2-win32.phpt index 8508ecf7fb..000765ccce 100644 --- a/ext/standard/tests/file/005_variation2-win32.phpt +++ b/ext/standard/tests/file/005_variation2-win32.phpt @@ -34,16 +34,16 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { */ function stat_fn( $filename ) { echo "\n-- File '$filename' --\n"; - echo "-- File access time is => "; + echo "-- File access time is => "; echo fileatime($filename)."\n"; clearstatcache(); - echo "-- File modification time is => "; + echo "-- File modification time is => "; echo filemtime($filename)."\n"; clearstatcache(); - echo "-- inode change time is => "; + echo "-- inode change time is => "; echo filectime($filename)."\n"; clearstatcache(); - + } diff --git a/ext/standard/tests/file/005_variation2.phpt b/ext/standard/tests/file/005_variation2.phpt index 6d4ca5e83d..1a7160a77a 100644 --- a/ext/standard/tests/file/005_variation2.phpt +++ b/ext/standard/tests/file/005_variation2.phpt @@ -34,16 +34,16 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { */ function stat_fn( $filename ) { echo "\n-- File '$filename' --\n"; - echo "-- File access time is => "; + echo "-- File access time is => "; echo fileatime($filename)."\n"; clearstatcache(); - echo "-- File modification time is => "; + echo "-- File modification time is => "; echo filemtime($filename)."\n"; clearstatcache(); - echo "-- inode change time is => "; + echo "-- inode change time is => "; echo filectime($filename)."\n"; clearstatcache(); - + } diff --git a/ext/standard/tests/file/006_basic.phpt b/ext/standard/tests/file/006_basic.phpt index 73a70e358f..e8b36c2c0d 100644 --- a/ext/standard/tests/file/006_basic.phpt +++ b/ext/standard/tests/file/006_basic.phpt @@ -29,7 +29,7 @@ unlink($filename); */ $path = dirname(__FILE__); -echo "*** Testing fileperms(), chmod() with files and dirs ***\n"; +echo "*** Testing fileperms(), chmod() with files and dirs ***\n"; fopen($path."/perm.tmp", "w"); var_dump( chmod($path."/perm.tmp", 0755 ) ); printf("%o", fileperms($path."/perm.tmp") ); diff --git a/ext/standard/tests/file/006_variation1.phpt b/ext/standard/tests/file/006_variation1.phpt index 7ede7b8bbc..ba29a17509 100644 --- a/ext/standard/tests/file/006_variation1.phpt +++ b/ext/standard/tests/file/006_variation1.phpt @@ -19,7 +19,7 @@ unlink($filename); ?> --FILE-- <?php -/* +/* Prototype: int fileperms ( string $filename ); Description: Returns the permissions on the file, or FALSE in case of an error @@ -40,7 +40,7 @@ $count = 1; echo "-- Testing all permission from octal 0000 to octal 0777 on file and dir --\n"; for($mode = 0000; $mode <= 0777; $mode++) { echo "-- Iteration $count --\n"; - var_dump( chmod($file_name, $mode) ); + var_dump( chmod($file_name, $mode) ); printf("%o", fileperms($file_name) ); echo "\n"; clearstatcache(); @@ -61,7 +61,7 @@ chmod(dirname(__FILE__)."/006_variation1", 0777); unlink(dirname(__FILE__)."/006_variation1.tmp"); rmdir(dirname(__FILE__)."/006_variation1"); ?> ---EXPECT-- +--EXPECT-- *** Testing fileperms() & chmod() : usage variations *** -- Testing all permission from octal 0000 to octal 0777 on file and dir -- -- Iteration 1 -- diff --git a/ext/standard/tests/file/006_variation2.phpt b/ext/standard/tests/file/006_variation2.phpt index f40932645b..c4649cd4a0 100644 --- a/ext/standard/tests/file/006_variation2.phpt +++ b/ext/standard/tests/file/006_variation2.phpt @@ -19,7 +19,7 @@ unlink($filename); ?> --FILE-- <?php -/* +/* Prototype: int fileperms ( string $filename ); Description: Returns the permissions on the file, or FALSE in case of an error @@ -72,7 +72,7 @@ foreach($perms_array as $permission) { printf("%o", fileperms($file_name) ); echo "\n"; clearstatcache(); - + var_dump( chmod($dir_name, $permission) ); printf("%o", fileperms($dir_name) ); echo "\n"; @@ -88,7 +88,7 @@ chmod(dirname(__FILE__)."/006_variation2", 0777); unlink(dirname(__FILE__)."/006_variation2.tmp"); rmdir(dirname(__FILE__)."/006_variation2"); ?> ---EXPECTF-- +--EXPECTF-- *** Testing fileperms() & chmod() : usage variations *** *** Testing fileperms(), chmod() with miscellaneous permissions *** diff --git a/ext/standard/tests/file/007_basic.phpt b/ext/standard/tests/file/007_basic.phpt index ceb9b29943..38461df97a 100644 --- a/ext/standard/tests/file/007_basic.phpt +++ b/ext/standard/tests/file/007_basic.phpt @@ -2,7 +2,7 @@ Test fopen(), fclose() & feof() functions: basic functionality --FILE-- <?php -/* +/* Prototype: resource fopen(string $filename, string $mode [, bool $use_include_path [, resource $context]] ); Description: Opens file or URL. diff --git a/ext/standard/tests/file/007_variation1.phpt b/ext/standard/tests/file/007_variation1.phpt index 6cba146655..cdbcb0bf3a 100644 --- a/ext/standard/tests/file/007_variation1.phpt +++ b/ext/standard/tests/file/007_variation1.phpt @@ -35,7 +35,7 @@ var_dump( fread($file_handle, 100) ); //Check for read operation var_dump( fwrite($file_handle, $string) ); //Check for write operation; fails; expected: 0 bytes var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation1.tmp"); diff --git a/ext/standard/tests/file/007_variation10.phpt b/ext/standard/tests/file/007_variation10.phpt index 2981ef7d4c..f75208e2f2 100644 --- a/ext/standard/tests/file/007_variation10.phpt +++ b/ext/standard/tests/file/007_variation10.phpt @@ -37,7 +37,7 @@ var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation10.tmp"); diff --git a/ext/standard/tests/file/007_variation11-win32-mb.phpt b/ext/standard/tests/file/007_variation11-win32-mb.phpt index 68a0e8ccd0..b8ff42424b 100644 --- a/ext/standard/tests/file/007_variation11-win32-mb.phpt +++ b/ext/standard/tests/file/007_variation11-win32-mb.phpt @@ -54,7 +54,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "wt") ); //Opening the non-existing file in "wt" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/007_variation11-win32.phpt b/ext/standard/tests/file/007_variation11-win32.phpt index a567b72b03..21ec9f9347 100644 --- a/ext/standard/tests/file/007_variation11-win32.phpt +++ b/ext/standard/tests/file/007_variation11-win32.phpt @@ -54,7 +54,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "wt") ); //Opening the non-existing file in "wt" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation11.tmp"); diff --git a/ext/standard/tests/file/007_variation11.phpt b/ext/standard/tests/file/007_variation11.phpt index c884f47f42..fe299325be 100644 --- a/ext/standard/tests/file/007_variation11.phpt +++ b/ext/standard/tests/file/007_variation11.phpt @@ -54,7 +54,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "wt") ); //Opening the non-existing file in "wt" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation11.tmp"); diff --git a/ext/standard/tests/file/007_variation12-win32.phpt b/ext/standard/tests/file/007_variation12-win32.phpt index d3d26e2996..c4ae4b9bff 100644 --- a/ext/standard/tests/file/007_variation12-win32.phpt +++ b/ext/standard/tests/file/007_variation12-win32.phpt @@ -54,7 +54,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "w+t") ); //Opening the non-existing file in "w+t" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation12.tmp"); diff --git a/ext/standard/tests/file/007_variation12.phpt b/ext/standard/tests/file/007_variation12.phpt index c56605ac62..8c0c690f92 100644 --- a/ext/standard/tests/file/007_variation12.phpt +++ b/ext/standard/tests/file/007_variation12.phpt @@ -54,7 +54,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "w+t") ); //Opening the non-existing file in "w+t" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation12.tmp"); diff --git a/ext/standard/tests/file/007_variation13-win32.phpt b/ext/standard/tests/file/007_variation13-win32.phpt index fabcde90cc..828a86a6ae 100644 --- a/ext/standard/tests/file/007_variation13-win32.phpt +++ b/ext/standard/tests/file/007_variation13-win32.phpt @@ -46,7 +46,7 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si unlink($file); //Deleting the file fclose( fopen($file, "at") ); //Opening the non-existing file in "at" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation13.tmp"); diff --git a/ext/standard/tests/file/007_variation13.phpt b/ext/standard/tests/file/007_variation13.phpt index 9d3e6265b5..c5ab431fe9 100644 --- a/ext/standard/tests/file/007_variation13.phpt +++ b/ext/standard/tests/file/007_variation13.phpt @@ -46,7 +46,7 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si unlink($file); //Deleting the file fclose( fopen($file, "at") ); //Opening the non-existing file in "at" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation13.tmp"); diff --git a/ext/standard/tests/file/007_variation14.phpt b/ext/standard/tests/file/007_variation14.phpt index ebcad6d830..1e23976d05 100644 --- a/ext/standard/tests/file/007_variation14.phpt +++ b/ext/standard/tests/file/007_variation14.phpt @@ -40,7 +40,7 @@ var_dump( get_resource_type($file_handle) ); //Check whether resource is lost a unlink($file); //Deleting the file fclose( fopen($file, "a+t") ); //Opening the non-existing file in "a+t" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation14.tmp"); diff --git a/ext/standard/tests/file/007_variation15.phpt b/ext/standard/tests/file/007_variation15.phpt index fb5d6ae441..f9751cb0c8 100644 --- a/ext/standard/tests/file/007_variation15.phpt +++ b/ext/standard/tests/file/007_variation15.phpt @@ -37,7 +37,7 @@ var_dump( ftell($file_handle) ); //File pointer position after read operation, var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation $file_handle = fopen($file, "xt"); //Opening the existing data file in 'xt' mode to check for the warning message -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation15.tmp"); diff --git a/ext/standard/tests/file/007_variation16.phpt b/ext/standard/tests/file/007_variation16.phpt index 633299dedf..dcafc4a4d2 100644 --- a/ext/standard/tests/file/007_variation16.phpt +++ b/ext/standard/tests/file/007_variation16.phpt @@ -37,7 +37,7 @@ var_dump( ftell($file_handle) ); //File pointer position after read operation, var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation $file_handle = fopen($file, "x+t"); //Opening the existing data file in "x+t" mode to check for the warning message -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation16.tmp"); diff --git a/ext/standard/tests/file/007_variation17.phpt b/ext/standard/tests/file/007_variation17.phpt index d3408e9dbb..d9149676e9 100644 --- a/ext/standard/tests/file/007_variation17.phpt +++ b/ext/standard/tests/file/007_variation17.phpt @@ -35,7 +35,7 @@ var_dump( fread($file_handle, 100) ); //Check for read operation var_dump( fwrite($file_handle, $string) ); //Check for write operation; fails; expected: 0 bytes var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation17.tmp"); diff --git a/ext/standard/tests/file/007_variation18.phpt b/ext/standard/tests/file/007_variation18.phpt index 88350b8426..879190c399 100644 --- a/ext/standard/tests/file/007_variation18.phpt +++ b/ext/standard/tests/file/007_variation18.phpt @@ -37,7 +37,7 @@ var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation18.tmp"); diff --git a/ext/standard/tests/file/007_variation19.phpt b/ext/standard/tests/file/007_variation19.phpt index 0731d454bb..188b178f22 100644 --- a/ext/standard/tests/file/007_variation19.phpt +++ b/ext/standard/tests/file/007_variation19.phpt @@ -49,7 +49,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "wb") ); //Opening the non-existing file in "wb" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation19.tmp"); diff --git a/ext/standard/tests/file/007_variation2.phpt b/ext/standard/tests/file/007_variation2.phpt index deb51266ee..8c9c38cf7c 100644 --- a/ext/standard/tests/file/007_variation2.phpt +++ b/ext/standard/tests/file/007_variation2.phpt @@ -37,7 +37,7 @@ var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation2.tmp"); diff --git a/ext/standard/tests/file/007_variation20.phpt b/ext/standard/tests/file/007_variation20.phpt index 3eddec4258..fbe4dd8bb2 100644 --- a/ext/standard/tests/file/007_variation20.phpt +++ b/ext/standard/tests/file/007_variation20.phpt @@ -49,7 +49,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "w+b") ); //Opening the non-existing file in "w+b" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation20.tmp"); diff --git a/ext/standard/tests/file/007_variation21.phpt b/ext/standard/tests/file/007_variation21.phpt index c70aaad784..91acbf298a 100644 --- a/ext/standard/tests/file/007_variation21.phpt +++ b/ext/standard/tests/file/007_variation21.phpt @@ -41,7 +41,7 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si unlink($file); //Deleting the file fclose( fopen($file, "ab") ); //Opening the non-existing file in "ab" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation21.tmp"); diff --git a/ext/standard/tests/file/007_variation22.phpt b/ext/standard/tests/file/007_variation22.phpt index 63deee4f84..b81d13f257 100644 --- a/ext/standard/tests/file/007_variation22.phpt +++ b/ext/standard/tests/file/007_variation22.phpt @@ -40,7 +40,7 @@ var_dump( get_resource_type($file_handle) ); //Check whether resource is lost a unlink($file); //Deleting the file fclose( fopen($file, "a+b") ); //Opening the non-existing file in "a+b" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation22.tmp"); diff --git a/ext/standard/tests/file/007_variation23.phpt b/ext/standard/tests/file/007_variation23.phpt index cfff815084..892666b895 100644 --- a/ext/standard/tests/file/007_variation23.phpt +++ b/ext/standard/tests/file/007_variation23.phpt @@ -37,7 +37,7 @@ var_dump( ftell($file_handle) ); //File pointer position after read operation, var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation $file_handle = fopen($file, "xb"); //Opening the existing data file in 'xb' mode to check for the warning message -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation23.tmp"); diff --git a/ext/standard/tests/file/007_variation24.phpt b/ext/standard/tests/file/007_variation24.phpt index d898ba7b52..200a9575a8 100644 --- a/ext/standard/tests/file/007_variation24.phpt +++ b/ext/standard/tests/file/007_variation24.phpt @@ -37,7 +37,7 @@ var_dump( ftell($file_handle) ); //File pointer position after read operation, var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation $file_handle = fopen($file, "x+b"); //Opening the existing data file in "x+b" mode to check for the warning message -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation24.tmp"); diff --git a/ext/standard/tests/file/007_variation3.phpt b/ext/standard/tests/file/007_variation3.phpt index f4ae03658f..aa27db85c0 100644 --- a/ext/standard/tests/file/007_variation3.phpt +++ b/ext/standard/tests/file/007_variation3.phpt @@ -49,7 +49,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "w") ); //Opening the non-existing file in "w" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation3.tmp"); diff --git a/ext/standard/tests/file/007_variation4.phpt b/ext/standard/tests/file/007_variation4.phpt index 0dabc5b9ad..106890c034 100644 --- a/ext/standard/tests/file/007_variation4.phpt +++ b/ext/standard/tests/file/007_variation4.phpt @@ -49,7 +49,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "w+") ); //Opening the non-existing file in "w+" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation4.tmp"); diff --git a/ext/standard/tests/file/007_variation5.phpt b/ext/standard/tests/file/007_variation5.phpt index 51e366d291..4c84f020b7 100644 --- a/ext/standard/tests/file/007_variation5.phpt +++ b/ext/standard/tests/file/007_variation5.phpt @@ -41,7 +41,7 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si unlink($file); //Deleting the file fclose( fopen($file, "a") ); //Opening the non-existing file in "a" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation5.tmp"); diff --git a/ext/standard/tests/file/007_variation6.phpt b/ext/standard/tests/file/007_variation6.phpt index 92c0171751..cc01af149e 100644 --- a/ext/standard/tests/file/007_variation6.phpt +++ b/ext/standard/tests/file/007_variation6.phpt @@ -40,7 +40,7 @@ var_dump( get_resource_type($file_handle) ); //Check whether resource is lost a unlink($file); //Deleting the file fclose( fopen($file, "a+") ); //Opening the non-existing file in "a+" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation6.tmp"); diff --git a/ext/standard/tests/file/007_variation7.phpt b/ext/standard/tests/file/007_variation7.phpt index b1b15c81c5..e2d97704ad 100644 --- a/ext/standard/tests/file/007_variation7.phpt +++ b/ext/standard/tests/file/007_variation7.phpt @@ -37,7 +37,7 @@ var_dump( ftell($file_handle) ); //File pointer position after read operation, var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation $file_handle = fopen($file, "x"); //Opening the existing data file in 'x' mode to check for the warning message -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation7.tmp"); diff --git a/ext/standard/tests/file/007_variation8.phpt b/ext/standard/tests/file/007_variation8.phpt index fae6932048..df97596757 100644 --- a/ext/standard/tests/file/007_variation8.phpt +++ b/ext/standard/tests/file/007_variation8.phpt @@ -37,7 +37,7 @@ var_dump( ftell($file_handle) ); //File pointer position after read operation, var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation $file_handle = fopen($file, "x+"); //Opening the existing data file in "x+" mode to check for the warning message -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation8.tmp"); diff --git a/ext/standard/tests/file/007_variation9.phpt b/ext/standard/tests/file/007_variation9.phpt index ab5f1ca01d..017f4a0c5f 100644 --- a/ext/standard/tests/file/007_variation9.phpt +++ b/ext/standard/tests/file/007_variation9.phpt @@ -35,7 +35,7 @@ var_dump( fread($file_handle, 100) ); //Check for read operation var_dump( fwrite($file_handle, $string) ); //Check for write operation; fails; expected: 0 bytes var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation9.tmp"); diff --git a/ext/standard/tests/file/basename-win32.phpt b/ext/standard/tests/file/basename-win32.phpt index 5fd0f9659f..429030ecde 100644 --- a/ext/standard/tests/file/basename-win32.phpt +++ b/ext/standard/tests/file/basename-win32.phpt @@ -10,10 +10,10 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { ?> --FILE-- <?php -/* +/* * proto string basename(string path [, string suffix]) * Function is implemented in ext/standard/string.c - */ + */ $file_paths = array ( /* simple paths */ array("bar"), @@ -41,7 +41,7 @@ $file_paths = array ( array("\\foo\\bar.zip\\", ".zip"), array("foo\\bar.zip\\", ".zip"), array("\\bar.zip\\", ".zip"), - + /* paths with basename only suffix, with suffix removal*/ array("\\.zip", ".zip"), array(".zip", ".zip"), @@ -90,7 +90,7 @@ $file_path_variations = array ( /* path with spaces */ array(" "), array(' '), - + /* empty paths */ array(""), array(''), @@ -104,8 +104,8 @@ function check_basename( $path_arrays ) { if( 1 == count($path) ) { // no suffix provided var_dump( basename($path[0]) ); } else { // path as well as suffix provided, - var_dump( basename($path[0], $path[1]) ); - } + var_dump( basename($path[0], $path[1]) ); + } } } diff --git a/ext/standard/tests/file/basename_basic-win32.phpt b/ext/standard/tests/file/basename_basic-win32.phpt index f575c5aa69..ceccf9eef7 100644 --- a/ext/standard/tests/file/basename_basic-win32.phpt +++ b/ext/standard/tests/file/basename_basic-win32.phpt @@ -52,7 +52,7 @@ $file_paths = array ( /* path with spaces */ " ", ' ', - + /* empty paths */ "", '', diff --git a/ext/standard/tests/file/basename_basic.phpt b/ext/standard/tests/file/basename_basic.phpt index 68aefb2a3a..6354b2acd7 100644 --- a/ext/standard/tests/file/basename_basic.phpt +++ b/ext/standard/tests/file/basename_basic.phpt @@ -52,7 +52,7 @@ $file_paths = array ( /* path with spaces */ " ", ' ', - + /* empty paths */ "", '', diff --git a/ext/standard/tests/file/basename_error.phpt b/ext/standard/tests/file/basename_error.phpt index 53c53cf8b9..18984f0451 100644 --- a/ext/standard/tests/file/basename_error.phpt +++ b/ext/standard/tests/file/basename_error.phpt @@ -5,7 +5,7 @@ Test basename() function : error conditions /* Prototype : string basename(string path [, string suffix]) * Description: Returns the filename component of the path * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing basename() : error conditions ***\n"; diff --git a/ext/standard/tests/file/basename_variation1-win32.phpt b/ext/standard/tests/file/basename_variation1-win32.phpt index 0f4293e0b0..eb2a4ff497 100644 --- a/ext/standard/tests/file/basename_variation1-win32.phpt +++ b/ext/standard/tests/file/basename_variation1-win32.phpt @@ -10,7 +10,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { <?php $prefixes = array ( - + // drive letters "A:/", "Z:/", @@ -31,7 +31,7 @@ $paths = array ( "foo", "foo/", - "foo\\", + "foo\\", "foo.bar", "foo.bar/", "foo.bar\\", diff --git a/ext/standard/tests/file/basename_variation1.phpt b/ext/standard/tests/file/basename_variation1.phpt index 93582389d4..ea7cdfe8b7 100644 --- a/ext/standard/tests/file/basename_variation1.phpt +++ b/ext/standard/tests/file/basename_variation1.phpt @@ -10,7 +10,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { <?php $prefixes = array ( - + // drive letters "A:/", "Z:/", @@ -31,7 +31,7 @@ $paths = array ( "foo", "foo/", - "foo\\", + "foo\\", "foo.bar", "foo.bar/", "foo.bar\\", diff --git a/ext/standard/tests/file/basename_variation2-win32.phpt b/ext/standard/tests/file/basename_variation2-win32.phpt index 5e9961b98f..771a160cd2 100644 --- a/ext/standard/tests/file/basename_variation2-win32.phpt +++ b/ext/standard/tests/file/basename_variation2-win32.phpt @@ -13,7 +13,7 @@ $paths = array ( "foo", "foo/", - "foo\\", + "foo\\", "foo.bar", "foo.bar/", "foo.bar\\", @@ -41,7 +41,7 @@ $suffixes = array ( foreach ($paths as $path) { foreach ($suffixes as $suffix) { echo "basename for path $path, supplying suffix $suffix is:\n"; - var_dump(basename($path, $suffix)); + var_dump(basename($path, $suffix)); } } diff --git a/ext/standard/tests/file/basename_variation2.phpt b/ext/standard/tests/file/basename_variation2.phpt index 96cfd65057..fd41d89be0 100644 --- a/ext/standard/tests/file/basename_variation2.phpt +++ b/ext/standard/tests/file/basename_variation2.phpt @@ -13,7 +13,7 @@ $paths = array ( "foo", "foo/", - "foo\\", + "foo\\", "foo.bar", "foo.bar/", "foo.bar\\", @@ -41,7 +41,7 @@ $suffixes = array ( foreach ($paths as $path) { foreach ($suffixes as $suffix) { echo "basename for path $path, supplying suffix $suffix is:\n"; - var_dump(basename($path, $suffix)); + var_dump(basename($path, $suffix)); } } diff --git a/ext/standard/tests/file/basename_variation3.phpt b/ext/standard/tests/file/basename_variation3.phpt index f01f550a7d..cce732554e 100644 --- a/ext/standard/tests/file/basename_variation3.phpt +++ b/ext/standard/tests/file/basename_variation3.phpt @@ -5,7 +5,7 @@ Test basename() function : first parameter type variations /* Prototype : string basename(string path [, string suffix]) * Description: Returns the filename component of the path * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing basename() : usage variation ***\n"; diff --git a/ext/standard/tests/file/basename_variation4.phpt b/ext/standard/tests/file/basename_variation4.phpt index 88ce61a93d..487c2274f1 100644 --- a/ext/standard/tests/file/basename_variation4.phpt +++ b/ext/standard/tests/file/basename_variation4.phpt @@ -5,7 +5,7 @@ Test basename() function : second parameter type variation /* Prototype : string basename(string path [, string suffix]) * Description: Returns the filename component of the path * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing basename() : usage variation ***\n"; diff --git a/ext/standard/tests/file/bug22414.phpt b/ext/standard/tests/file/bug22414.phpt index fcd85489f3..abc6e47585 100644 --- a/ext/standard/tests/file/bug22414.phpt +++ b/ext/standard/tests/file/bug22414.phpt @@ -8,14 +8,14 @@ output_handler= $php = getenv('TEST_PHP_EXECUTABLE'); $tmpfile = tempnam(__DIR__, 'phpt'); $args = ' -n -dsafe_mode=off '; - + /* Regular Data Test */ passthru($php . $args . ' -r " echo \"HELLO\"; "'); echo "\n"; /* Binary Data Test */ - + if (substr(PHP_OS, 0, 3) != 'WIN') { $cmd = $php . $args . ' -r \"readfile(@getenv(\'TEST_PHP_EXECUTABLE\')); \"'; $cmd = $php . $args . ' -r \' passthru("'.$cmd.'"); \' > '.$tmpfile ; @@ -30,7 +30,7 @@ output_handler= } else { echo "Does not work\n"; } - + @unlink($tmpfile); ?> --EXPECT-- diff --git a/ext/standard/tests/file/bug24482.phpt b/ext/standard/tests/file/bug24482.phpt index 9d0568af33..9fe4d2d9ee 100644 --- a/ext/standard/tests/file/bug24482.phpt +++ b/ext/standard/tests/file/bug24482.phpt @@ -26,13 +26,13 @@ closedir($dh); if (count($dirs) != count($globdirs)) { echo "Directory count mismatch\n"; - + echo "glob found:\n"; - sort($globdirs); + sort($globdirs); var_dump($globdirs); - + echo "opendir/readdir/isdir found:\n"; - sort($dirs); + sort($dirs); var_dump($dirs); } else { echo "OK\n"; diff --git a/ext/standard/tests/file/bug27508.phpt b/ext/standard/tests/file/bug27508.phpt index 26959ec511..e342a17348 100644 --- a/ext/standard/tests/file/bug27508.phpt +++ b/ext/standard/tests/file/bug27508.phpt @@ -4,8 +4,8 @@ Bug #27508 (userspace wrappers have bogus eof indicator) <?php # vim:ft=php class FileStream { public $fp; - - function stream_open($path, $mode, $options, &$opened_path) + + function stream_open($path, $mode, $options, &$opened_path) { $url = urldecode(substr($path, 9)); $this->fp = fopen($url, $mode); @@ -13,22 +13,22 @@ class FileStream { return true; } - function stream_read($count) + function stream_read($count) { return fread($this->fp, $count); } - function stream_write($data) + function stream_write($data) { return fwrite($this->fp, $data); } - function stream_tell() + function stream_tell() { return ftell($this->fp); } - function stream_eof() + function stream_eof() { if (!$this->fp) { return true; @@ -36,7 +36,7 @@ class FileStream { return feof($this->fp); } - function stream_seek($offset, $whence) + function stream_seek($offset, $whence) { return fseek($this->fp, $offset, $whence) == 0 ? true : false; } diff --git a/ext/standard/tests/file/bug30362.phpt b/ext/standard/tests/file/bug30362.phpt index 1c2b4be979..59fe02ad06 100644 --- a/ext/standard/tests/file/bug30362.phpt +++ b/ext/standard/tests/file/bug30362.phpt @@ -11,7 +11,7 @@ for ($i = 0; ($i < 10) && !feof($resource); ++$i ) { echo $line . "\n"; } fclose($resource); - + ?> --EXPECT-- 111 diff --git a/ext/standard/tests/file/bug35740.phpt b/ext/standard/tests/file/bug35740.phpt index 3526b24973..184dff264f 100644 --- a/ext/standard/tests/file/bug35740.phpt +++ b/ext/standard/tests/file/bug35740.phpt @@ -7,7 +7,7 @@ include (dirname(__FILE__)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: include(%s): failed to open stream: %s in %s on line %d Warning: include(): Failed opening '%s' for inclusion (include_path='%s') in %s on line %d diff --git a/ext/standard/tests/file/bug35781.phpt b/ext/standard/tests/file/bug35781.phpt index cc3ae14e4c..226277b20f 100644 --- a/ext/standard/tests/file/bug35781.phpt +++ b/ext/standard/tests/file/bug35781.phpt @@ -4,7 +4,7 @@ Bug #35781 (stream_filter_append() causes segfault) <?php $filename = dirname(__FILE__)."/bug35781.txt"; - + $fp = fopen($filename, "w"); stream_filter_append($fp, "string.rot13", -49); fwrite($fp, "This is a test\n"); @@ -18,7 +18,7 @@ var_dump(file_get_contents($filename)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(15) "Guvf vf n grfg " Done diff --git a/ext/standard/tests/file/bug37158.phpt b/ext/standard/tests/file/bug37158.phpt index 783bf2227c..673b4c6f3c 100644 --- a/ext/standard/tests/file/bug37158.phpt +++ b/ext/standard/tests/file/bug37158.phpt @@ -4,8 +4,8 @@ Bug #37158 (if userspace stream is present, fread() reads in 8192 max, otherwise <?php class VariableStream { - - function stream_open($path, $mode, $options, &$opened_path) + + function stream_open($path, $mode, $options, &$opened_path) { return true; } @@ -32,7 +32,7 @@ unlink($file); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(26) "size of contents 1 = 20000" string(26) "size of contents 2 = 40960" Done diff --git a/ext/standard/tests/file/bug38086.phpt b/ext/standard/tests/file/bug38086.phpt index d92289ef6e..0544e06692 100644 --- a/ext/standard/tests/file/bug38086.phpt +++ b/ext/standard/tests/file/bug38086.phpt @@ -37,7 +37,7 @@ unlink($new_file); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(%d) string(134) "Nabgure qnl Jura gur cnvaf bs yvsr jba'g one zl jnl diff --git a/ext/standard/tests/file/bug38450.phpt b/ext/standard/tests/file/bug38450.phpt index 1de5d7f89b..eae86cf9a0 100644 --- a/ext/standard/tests/file/bug38450.phpt +++ b/ext/standard/tests/file/bug38450.phpt @@ -101,7 +101,7 @@ var_dump($myvar); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(12) "constructor!" line1 line2 diff --git a/ext/standard/tests/file/bug38450_1.phpt b/ext/standard/tests/file/bug38450_1.phpt index e4f1af68f8..9cc383171b 100644 --- a/ext/standard/tests/file/bug38450_1.phpt +++ b/ext/standard/tests/file/bug38450_1.phpt @@ -101,7 +101,7 @@ var_dump($myvar); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(12) "constructor!" line1 line2 diff --git a/ext/standard/tests/file/bug38450_2.phpt b/ext/standard/tests/file/bug38450_2.phpt index 64c9f8d94a..318a2a3eb9 100644 --- a/ext/standard/tests/file/bug38450_2.phpt +++ b/ext/standard/tests/file/bug38450_2.phpt @@ -101,7 +101,7 @@ var_dump($myvar); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: fopen(var://myvar): failed to open stream: "VariableStream::stream_open" call failed in %s on line %d diff --git a/ext/standard/tests/file/bug38450_3.phpt b/ext/standard/tests/file/bug38450_3.phpt index a72a00310d..0bcaeb2a89 100644 --- a/ext/standard/tests/file/bug38450_3.phpt +++ b/ext/standard/tests/file/bug38450_3.phpt @@ -101,7 +101,7 @@ var_dump($myvar); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: fopen(var://myvar): failed to open stream: "VariableStream::stream_open" call failed in %sbug38450_3.php on line %d Fatal error: Uncaught ArgumentCountError: Too few arguments to function VariableStream::__construct(), 0 passed and exactly 1 expected in %sbug38450_3.php:7 diff --git a/ext/standard/tests/file/bug39551.phpt b/ext/standard/tests/file/bug39551.phpt index e03a2bf931..2877c4951f 100644 --- a/ext/standard/tests/file/bug39551.phpt +++ b/ext/standard/tests/file/bug39551.phpt @@ -20,5 +20,5 @@ stream_get_contents($s); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- Done diff --git a/ext/standard/tests/file/bug39673.phpt b/ext/standard/tests/file/bug39673.phpt index 820664184f..71484578d0 100644 --- a/ext/standard/tests/file/bug39673.phpt +++ b/ext/standard/tests/file/bug39673.phpt @@ -28,7 +28,7 @@ foreach ($offsets as $offset) { @unlink($filename); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- int(1) int(13824) int(0) diff --git a/ext/standard/tests/file/bug40374.phpt b/ext/standard/tests/file/bug40374.phpt index 327289eba2..c1f1bc5796 100644 --- a/ext/standard/tests/file/bug40374.phpt +++ b/ext/standard/tests/file/bug40374.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #40374 (php_shutdown_temporary_directory() tries to free local value) +Bug #40374 (php_shutdown_temporary_directory() tries to free local value) --FILE-- <?php @@ -12,6 +12,6 @@ unlink($file); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(%d) "%s" Done diff --git a/ext/standard/tests/file/bug41693.phpt b/ext/standard/tests/file/bug41693.phpt index 6c7ff5bf4b..ea074fa4fd 100644 --- a/ext/standard/tests/file/bug41693.phpt +++ b/ext/standard/tests/file/bug41693.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #41693 (scandir() allows empty directory names) +Bug #41693 (scandir() allows empty directory names) --FILE-- <?php @@ -7,7 +7,7 @@ var_dump(scandir('')); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: scandir(): Directory name cannot be empty in %s on line %d bool(false) Done diff --git a/ext/standard/tests/file/bug41815.phpt b/ext/standard/tests/file/bug41815.phpt index 5dbafac225..040754b131 100644 --- a/ext/standard/tests/file/bug41815.phpt +++ b/ext/standard/tests/file/bug41815.phpt @@ -22,6 +22,6 @@ fclose($reader); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- OK Done diff --git a/ext/standard/tests/file/bug66509.phpt b/ext/standard/tests/file/bug66509.phpt index 0e414f2321..ff49a554a4 100644 --- a/ext/standard/tests/file/bug66509.phpt +++ b/ext/standard/tests/file/bug66509.phpt @@ -4,9 +4,9 @@ Bug #66509 (copy() showing $context parameter as required) <?php $r = new \ReflectionFunction('copy'); - + foreach($r->getParameters() as $p) { - var_dump($p->isOptional()); + var_dump($p->isOptional()); } ?> --EXPECT-- diff --git a/ext/standard/tests/file/bug72035.phpt b/ext/standard/tests/file/bug72035.phpt index a2abbb7f35..feb4eb9acd 100644 --- a/ext/standard/tests/file/bug72035.phpt +++ b/ext/standard/tests/file/bug72035.phpt @@ -24,7 +24,7 @@ $cmd = "$cgi -n -C $fl"; $desc = array(0 => array("pipe", "r")); $proc = proc_open($cmd, $desc, $pipes, getcwd(), array()); if (is_resource($proc)) { - echo stream_get_contents($pipes[0]); + echo stream_get_contents($pipes[0]); proc_close($proc); } diff --git a/ext/standard/tests/file/chmod_error.phpt b/ext/standard/tests/file/chmod_error.phpt index f4cae3b5cf..03535b070a 100644 --- a/ext/standard/tests/file/chmod_error.phpt +++ b/ext/standard/tests/file/chmod_error.phpt @@ -5,7 +5,7 @@ Test chmod() function : error conditions /* Prototype : bool chmod(string filename, int mode) * Description: Change file mode * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing chmod() : error conditions ***\n"; diff --git a/ext/standard/tests/file/chmod_variation2-win32-mb.phpt b/ext/standard/tests/file/chmod_variation2-win32-mb.phpt index f990b5b56b..525052b9d9 100644 --- a/ext/standard/tests/file/chmod_variation2-win32-mb.phpt +++ b/ext/standard/tests/file/chmod_variation2-win32-mb.phpt @@ -32,7 +32,7 @@ var_dump(chmod($filepath, 0777)); var_dump(chmod("./$test_dirname/bad_dir/../../$filename", 0755)); clearstatcache(); printf("%o\n", fileperms($filepath) & PERMISSIONS_MASK); - + echo "\nchmod() on a relative path from a different working directory\n"; chdir($test_dirname); var_dump(chmod("../$filename", 0777)); diff --git a/ext/standard/tests/file/chmod_variation2-win32.phpt b/ext/standard/tests/file/chmod_variation2-win32.phpt index 9689852f51..1e6f3286f9 100644 --- a/ext/standard/tests/file/chmod_variation2-win32.phpt +++ b/ext/standard/tests/file/chmod_variation2-win32.phpt @@ -32,7 +32,7 @@ var_dump(chmod($filepath, 0777)); var_dump(chmod("./$test_dirname/bad_dir/../../$filename", 0755)); clearstatcache(); printf("%o\n", fileperms($filepath) & PERMISSIONS_MASK); - + echo "\nchmod() on a relative path from a different working directory\n"; chdir($test_dirname); var_dump(chmod("../$filename", 0777)); diff --git a/ext/standard/tests/file/chmod_variation2.phpt b/ext/standard/tests/file/chmod_variation2.phpt index b193acfaf7..c7a3db0fe7 100644 --- a/ext/standard/tests/file/chmod_variation2.phpt +++ b/ext/standard/tests/file/chmod_variation2.phpt @@ -32,7 +32,7 @@ var_dump(chmod($filepath, 0777)); var_dump(chmod("./$test_dirname/bad_dir/../../$filename", 0755)); clearstatcache(); printf("%o\n", fileperms($filepath) & PERMISSIONS_MASK); - + echo "\nchmod() on a linked file\n"; $linkname = "somelink"; var_dump(symlink($filepath, $linkname)); diff --git a/ext/standard/tests/file/chmod_variation3.phpt b/ext/standard/tests/file/chmod_variation3.phpt index 7c637b8560..9f3ae0bae7 100644 --- a/ext/standard/tests/file/chmod_variation3.phpt +++ b/ext/standard/tests/file/chmod_variation3.phpt @@ -5,7 +5,7 @@ Test chmod() function : first parameter variation /* Prototype : bool chmod(string filename, int mode) * Description: Change file mode * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing chmod() : usage variation ***\n"; diff --git a/ext/standard/tests/file/chmod_variation4.phpt b/ext/standard/tests/file/chmod_variation4.phpt index d5a691fa37..2cd4b8c9d7 100644 --- a/ext/standard/tests/file/chmod_variation4.phpt +++ b/ext/standard/tests/file/chmod_variation4.phpt @@ -7,7 +7,7 @@ Test chmod() function : second parameter variation /* Prototype : bool chmod(string filename, int mode) * Description: Change file mode * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing chmod() : usage variation ***\n"; diff --git a/ext/standard/tests/file/copy_basic.phpt b/ext/standard/tests/file/copy_basic.phpt index 32788f9f74..d23a27839a 100644 --- a/ext/standard/tests/file/copy_basic.phpt +++ b/ext/standard/tests/file/copy_basic.phpt @@ -7,7 +7,7 @@ Test copy() function: basic functionality * Returns TRUE on success or FALSE on failure. */ -echo "*** Testing copy() function: to copy file from source to destination --\n"; +echo "*** Testing copy() function: to copy file from source to destination --\n"; var_dump( file_exists(__FILE__) ); diff --git a/ext/standard/tests/file/copy_error.phpt b/ext/standard/tests/file/copy_error.phpt index 96072ebfba..ad723370e4 100644 --- a/ext/standard/tests/file/copy_error.phpt +++ b/ext/standard/tests/file/copy_error.phpt @@ -7,7 +7,7 @@ Test copy() function: error conditions * Returns TRUE on success or FALSE on failure. */ -echo "*** Testing copy() function: error conditions --\n"; +echo "*** Testing copy() function: error conditions --\n"; /* Invalid args */ var_dump( copy("/no/file", "file") ); diff --git a/ext/standard/tests/file/copy_variation10.phpt b/ext/standard/tests/file/copy_variation10.phpt index b4aa19d1c2..7d44d94ec4 100644 --- a/ext/standard/tests/file/copy_variation10.phpt +++ b/ext/standard/tests/file/copy_variation10.phpt @@ -17,8 +17,8 @@ $file_handle = fopen($file, "w"); fwrite($file_handle, str_repeat("Hello2world...\n", 100)); fclose($file_handle); -var_dump( copy($file, $file) ); -var_dump( file_exists($file) ); +var_dump( copy($file, $file) ); +var_dump( file_exists($file) ); var_dump( filesize($file) ); echo "*** Done ***\n"; diff --git a/ext/standard/tests/file/copy_variation11.phpt b/ext/standard/tests/file/copy_variation11.phpt index b01dab0890..aabaa4cd4e 100644 --- a/ext/standard/tests/file/copy_variation11.phpt +++ b/ext/standard/tests/file/copy_variation11.phpt @@ -28,7 +28,7 @@ var_dump( filesize($dir) ); //size of destination before copy clearstatcache(); echo "\n-- Now applying copy() operation --\n"; -var_dump( copy($file, $dir) ); //expected: bool(false) +var_dump( copy($file, $dir) ); //expected: bool(false) var_dump( file_exists($file) ); //expected: bool(true) var_dump( file_exists($dir) ); //expected: bool(true) diff --git a/ext/standard/tests/file/copy_variation15.phpt b/ext/standard/tests/file/copy_variation15.phpt index fdc84e989a..546cbbb2f2 100644 --- a/ext/standard/tests/file/copy_variation15.phpt +++ b/ext/standard/tests/file/copy_variation15.phpt @@ -40,7 +40,7 @@ chmod($dir, 0555); //dir without write permissions $dest = $dir."/copy_copy_variation15.tmp"; -var_dump( copy($file, $dir."/copy_copy_variation15.tmp") ); +var_dump( copy($file, $dir."/copy_copy_variation15.tmp") ); var_dump( file_exists($dir."/copy_copy_variation15_dir.tmp") ); var_dump( filesize($file) ); //size of source diff --git a/ext/standard/tests/file/copy_variation17.phpt b/ext/standard/tests/file/copy_variation17.phpt index 2dfe94c6e9..9e7ee25d3b 100644 --- a/ext/standard/tests/file/copy_variation17.phpt +++ b/ext/standard/tests/file/copy_variation17.phpt @@ -32,7 +32,7 @@ $dest_file_name = $dir."/copy_copy_variation17.tmp"; $count = 1; foreach($src_file_names as $src_file_name) { - var_dump( copy($src_file_name, $dest_file_name) ); + var_dump( copy($src_file_name, $dest_file_name) ); var_dump( file_exists($dest_file_name) ); if( file_exists($dest_file_name) ) { diff --git a/ext/standard/tests/file/copy_variation18.phpt b/ext/standard/tests/file/copy_variation18.phpt index 564b34bf0c..66208082c6 100644 --- a/ext/standard/tests/file/copy_variation18.phpt +++ b/ext/standard/tests/file/copy_variation18.phpt @@ -27,13 +27,13 @@ $stat_before_copy = stat($src_file_name); clearstatcache(); echo "Copy operation => "; -var_dump( copy($src_file_name, $dest_file_name) ); +var_dump( copy($src_file_name, $dest_file_name) ); $stat_after_copy = stat($src_file_name); clearstatcache(); // compare all stat fields except access time -$stat_keys_to_compare = array("dev", "ino", "mode", "nlink", "uid", "gid", +$stat_keys_to_compare = array("dev", "ino", "mode", "nlink", "uid", "gid", "rdev", "size", "mtime", "ctime", "blksize", "blocks"); diff --git a/ext/standard/tests/file/copy_variation2-win32-mb.phpt b/ext/standard/tests/file/copy_variation2-win32-mb.phpt index 95688c97c5..cb7c96fa0b 100644 --- a/ext/standard/tests/file/copy_variation2-win32-mb.phpt +++ b/ext/standard/tests/file/copy_variation2-win32-mb.phpt @@ -18,7 +18,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") echo "*** Test copy() function: destination file names containing special characters ***\n"; $file_path = dirname(__FILE__); -$src_file_name = $file_path."/copy_variation2私はガラスを食べられます.tmp"; +$src_file_name = $file_path."/copy_variation2私はガラスを食べられます.tmp"; $file_handle = fopen($src_file_name, "w"); fwrite( $file_handle, str_repeat("Hello2World...\n", 100) ); fclose($file_handle); @@ -27,7 +27,7 @@ fclose($file_handle); $dest_files = array( /* File names containing special(non-alpha numeric) characters */ - "_copy_variation2.tmp", + "_copy_variation2.tmp", "@copy_variation2.tmp", "#copy_variation2.tmp", "+copy_variation2.tmp", diff --git a/ext/standard/tests/file/copy_variation2-win32.phpt b/ext/standard/tests/file/copy_variation2-win32.phpt index 82235ba814..029c6c5f8e 100644 --- a/ext/standard/tests/file/copy_variation2-win32.phpt +++ b/ext/standard/tests/file/copy_variation2-win32.phpt @@ -18,7 +18,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") echo "*** Test copy() function: destination file names containing special characters ***\n"; $file_path = dirname(__FILE__); -$src_file_name = $file_path."/copy_variation2.tmp"; +$src_file_name = $file_path."/copy_variation2.tmp"; $file_handle = fopen($src_file_name, "w"); fwrite( $file_handle, str_repeat("Hello2World...\n", 100) ); fclose($file_handle); @@ -27,7 +27,7 @@ fclose($file_handle); $dest_files = array( /* File names containing special(non-alpha numeric) characters */ - "_copy_variation2.tmp", + "_copy_variation2.tmp", "@copy_variation2.tmp", "#copy_variation2.tmp", "+copy_variation2.tmp", diff --git a/ext/standard/tests/file/copy_variation2.phpt b/ext/standard/tests/file/copy_variation2.phpt index a9b36803d9..681a00750c 100644 --- a/ext/standard/tests/file/copy_variation2.phpt +++ b/ext/standard/tests/file/copy_variation2.phpt @@ -18,7 +18,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") echo "*** Test copy() function: destination file names containing special characters ***\n"; $file_path = dirname(__FILE__); -$src_file_name = $file_path."/copy_variation2.tmp"; +$src_file_name = $file_path."/copy_variation2.tmp"; $file_handle = fopen($src_file_name, "w"); fwrite( $file_handle, str_repeat("Hello2World...\n", 100) ); fclose($file_handle); @@ -27,7 +27,7 @@ fclose($file_handle); $dest_files = array( /* File names containing special(non-alpha numeric) characters */ - "_copy_variation2.tmp", + "_copy_variation2.tmp", "@copy_variation2.tmp", "#copy_variation2.tmp", "+copy_variation2.tmp", diff --git a/ext/standard/tests/file/copy_variation3-win32.phpt b/ext/standard/tests/file/copy_variation3-win32.phpt index 5055c297f6..28f86532c9 100644 --- a/ext/standard/tests/file/copy_variation3-win32.phpt +++ b/ext/standard/tests/file/copy_variation3-win32.phpt @@ -43,9 +43,9 @@ foreach($dest_files as $dest_file) { echo "\n-- Iteration $count --\n"; $dest_file_name = $dest_file; - + echo "Copy operation => "; - var_dump( copy($src_file_name, $dest_file_name) ); + var_dump( copy($src_file_name, $dest_file_name) ); echo "Existence of destination file => "; var_dump( file_exists($dest_file_name) ); diff --git a/ext/standard/tests/file/copy_variation3.phpt b/ext/standard/tests/file/copy_variation3.phpt index 181da9a5f9..2d81751272 100644 --- a/ext/standard/tests/file/copy_variation3.phpt +++ b/ext/standard/tests/file/copy_variation3.phpt @@ -43,9 +43,9 @@ foreach($dest_files as $dest_file) { echo "\n-- Iteration $count --\n"; $dest_file_name = $dest_file; - + echo "Copy operation => "; - var_dump( copy($src_file_name, $dest_file_name) ); + var_dump( copy($src_file_name, $dest_file_name) ); echo "Existence of destination file => "; var_dump( file_exists($dest_file_name) ); diff --git a/ext/standard/tests/file/copy_variation5-win32.phpt b/ext/standard/tests/file/copy_variation5-win32.phpt index 48e85eaf02..b860332b06 100644 --- a/ext/standard/tests/file/copy_variation5-win32.phpt +++ b/ext/standard/tests/file/copy_variation5-win32.phpt @@ -27,7 +27,7 @@ fclose($file_handle); $dest_files = array( /* Checking case sensitiveness */ - "COPY.tmp", + "COPY.tmp", "COPY.TMP", "CopY.TMP" ); diff --git a/ext/standard/tests/file/dirname_basic-win32.phpt b/ext/standard/tests/file/dirname_basic-win32.phpt index f3b3902b0d..3463fcfe68 100644 --- a/ext/standard/tests/file/dirname_basic-win32.phpt +++ b/ext/standard/tests/file/dirname_basic-win32.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") /* Prototype : string dirname(string path) * Description: Returns the directory name component of the path * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing dirname() : basic functionality ***\n"; diff --git a/ext/standard/tests/file/dirname_basic.phpt b/ext/standard/tests/file/dirname_basic.phpt index ba131d1662..9b24389976 100644 --- a/ext/standard/tests/file/dirname_basic.phpt +++ b/ext/standard/tests/file/dirname_basic.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") /* Prototype : string dirname(string path) * Description: Returns the directory name component of the path * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing dirname() : basic functionality ***\n"; diff --git a/ext/standard/tests/file/dirname_error.phpt b/ext/standard/tests/file/dirname_error.phpt index 515a3988d5..9c41241c45 100644 --- a/ext/standard/tests/file/dirname_error.phpt +++ b/ext/standard/tests/file/dirname_error.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : string dirname(string path) * Description: Returns the directory name component of the path * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing dirname() : error conditions ***\n"; diff --git a/ext/standard/tests/file/dirname_no_path_normalization-win32.phpt b/ext/standard/tests/file/dirname_no_path_normalization-win32.phpt index 283834e8ce..2bb227b5c2 100644 --- a/ext/standard/tests/file/dirname_no_path_normalization-win32.phpt +++ b/ext/standard/tests/file/dirname_no_path_normalization-win32.phpt @@ -19,7 +19,7 @@ if (strlen($s) >= 10000) { print "ERROR: " . PHP_EOL; var_dump(dirname($s)); var_dump(strlen($s)); -} +} ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/file/dirname_variation1.phpt b/ext/standard/tests/file/dirname_variation1.phpt index 15041ffd53..7c603be92e 100644 --- a/ext/standard/tests/file/dirname_variation1.phpt +++ b/ext/standard/tests/file/dirname_variation1.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : string dirname(string path) * Description: Returns the directory name component of the path * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing dirname() : usage variation ***\n"; diff --git a/ext/standard/tests/file/disk.phpt b/ext/standard/tests/file/disk.phpt index 6eef4b4a77..a048af6ccb 100644 --- a/ext/standard/tests/file/disk.phpt +++ b/ext/standard/tests/file/disk.phpt @@ -25,7 +25,7 @@ var_dump(disk_total_space("/some/path/here")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: disk_free_space() expects exactly 1 parameter, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/file/disk_free_space_basic.phpt b/ext/standard/tests/file/disk_free_space_basic.phpt index 57446b6ee0..4cfacc6ab0 100644 --- a/ext/standard/tests/file/disk_free_space_basic.phpt +++ b/ext/standard/tests/file/disk_free_space_basic.phpt @@ -18,15 +18,15 @@ memory_limit=32M $file_path = dirname(__FILE__); echo "*** Testing with existing directory ***\n"; -var_dump( disk_free_space($file_path) ); -var_dump( diskfreespace($file_path) ); +var_dump( disk_free_space($file_path) ); +var_dump( diskfreespace($file_path) ); echo "*** Testing with newly created directory ***\n"; $dir = "/disk_free_space"; mkdir($file_path.$dir); echo" \n Free Space before writing to a file\n"; -$space1 = disk_free_space($file_path.$dir); -var_dump( $space1 ); +$space1 = disk_free_space($file_path.$dir); +var_dump( $space1 ); $fh = fopen($file_path.$dir."/disk_free_space.tmp", "a"); $data = str_repeat("x", 0xffff); @@ -34,8 +34,8 @@ fwrite($fh, $data); fclose($fh); echo "\n Free Space after writing to a file\n"; -$space2 = disk_free_space($file_path.$dir); -var_dump( $space2 ); +$space2 = disk_free_space($file_path.$dir); +var_dump( $space2 ); if($space1 > $space2 ) echo "\n Free Space Value Is Correct\n"; @@ -45,7 +45,7 @@ else { } echo "*** Testing with Binary Input ***\n"; -var_dump( disk_free_space(b"$file_path") ); +var_dump( disk_free_space(b"$file_path") ); echo"\n--- Done ---"; ?> diff --git a/ext/standard/tests/file/disk_free_space_variation.phpt b/ext/standard/tests/file/disk_free_space_variation.phpt index adb1acaf82..05c2153f70 100644 --- a/ext/standard/tests/file/disk_free_space_variation.phpt +++ b/ext/standard/tests/file/disk_free_space_variation.phpt @@ -12,11 +12,11 @@ Test disk_free_space and its alias diskfreespace() functions : Usage Variations $file_path = dirname(__FILE__); echo "*** Testing with a directory ***\n"; -var_dump( disk_free_space($file_path."/..") ); -var_dump( diskfreespace($file_path."/..") ); +var_dump( disk_free_space($file_path."/..") ); +var_dump( diskfreespace($file_path."/..") ); echo "\nTesting for the return type ***\n"; -$return_value = disk_free_space($file_path); +$return_value = disk_free_space($file_path); var_dump( is_float($return_value) ); echo "\n*** Testing with different directory combinations ***"; diff --git a/ext/standard/tests/file/disk_total_space_variation.phpt b/ext/standard/tests/file/disk_total_space_variation.phpt index ba2ceb2d1b..5c2a2c612e 100644 --- a/ext/standard/tests/file/disk_total_space_variation.phpt +++ b/ext/standard/tests/file/disk_total_space_variation.phpt @@ -12,10 +12,10 @@ Testing disk_total_space() functions : Usage Variations. $file_path = dirname(__FILE__); echo "*** Testing with a directory ***\n"; -var_dump( disk_total_space($file_path."/..") ); +var_dump( disk_total_space($file_path."/..") ); echo "\nTesting for the return type ***\n"; -$return_value = disk_total_space($file_path); +$return_value = disk_total_space($file_path); var_dump( is_float($return_value) ); echo "\n*** Testing with different directory combinations ***"; @@ -54,7 +54,7 @@ foreach($dirs_arr as $dir1) { } echo "*** Testing with Binary Input ***\n"; -var_dump( disk_total_space(b"$file_path") ); +var_dump( disk_total_space(b"$file_path") ); echo"\n--- Done ---"; ?> diff --git a/ext/standard/tests/file/fflush_error.phpt b/ext/standard/tests/file/fflush_error.phpt index 79a5bc1ca5..8882f227ea 100644 --- a/ext/standard/tests/file/fflush_error.phpt +++ b/ext/standard/tests/file/fflush_error.phpt @@ -21,7 +21,7 @@ $filename = "$file_path/fflush_error.tmp"; $file_handle = fopen($filename, "w"); if($file_handle == false) exit("Error:failed to open file $filename"); - + var_dump( fflush($file_handle, $file_handle) ); fclose($file_handle); diff --git a/ext/standard/tests/file/fflush_variation1-win32-mb.phpt b/ext/standard/tests/file/fflush_variation1-win32-mb.phpt index 12c34cb2f5..9679f4dd00 100644 --- a/ext/standard/tests/file/fflush_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/fflush_variation1-win32-mb.phpt @@ -23,7 +23,7 @@ $file_modes = array("w", "wb", "wt", "w+", "w+b", "w+t", "a", "ab", "at", "a+","a+b", "a+t", "x", "xb", "xt", "x+", "x+b", "x+t"); -$file_name = "$file_path/fflush_variation私はガラスを食べられます1.tmp"; +$file_name = "$file_path/fflush_variation私はガラスを食べられます1.tmp"; $count = 1; @@ -31,26 +31,26 @@ foreach( $file_types as $type ) { echo "-- Iteration $count with file containing $type Data--\n"; foreach( $file_modes as $mode ) { echo "-- File opened in $mode mode --\n"; - + // creating the file except for x mode if( substr($mode, 0, 1) != "x" ) { $file_handle = fopen($file_name, "w"); if($file_handle == false) exit("Error:failed to open file $file_name"); - + // filling the file some data if mode is append mode - if( substr($mode, 0, 1) == "a") + if( substr($mode, 0, 1) == "a") fill_file($file_handle, $type, 10); fclose($file_handle); - } - + } + // opening the file in different modes $file_handle = fopen($file_name, $mode); - if($file_handle == false) + if($file_handle == false) exit("Error:failed to open file $file_name"); - + // writing data to the file - var_dump( fill_file($file_handle, $type, 50) ); + var_dump( fill_file($file_handle, $type, 50) ); var_dump( fflush($file_handle) ); fclose($file_handle); diff --git a/ext/standard/tests/file/fflush_variation1-win32.phpt b/ext/standard/tests/file/fflush_variation1-win32.phpt index 109e531b95..5716a56560 100644 --- a/ext/standard/tests/file/fflush_variation1-win32.phpt +++ b/ext/standard/tests/file/fflush_variation1-win32.phpt @@ -23,7 +23,7 @@ $file_modes = array("w", "wb", "wt", "w+", "w+b", "w+t", "a", "ab", "at", "a+","a+b", "a+t", "x", "xb", "xt", "x+", "x+b", "x+t"); -$file_name = "$file_path/fflush_variation1.tmp"; +$file_name = "$file_path/fflush_variation1.tmp"; $count = 1; @@ -31,26 +31,26 @@ foreach( $file_types as $type ) { echo "-- Iteration $count with file containing $type Data--\n"; foreach( $file_modes as $mode ) { echo "-- File opened in $mode mode --\n"; - + // creating the file except for x mode if( substr($mode, 0, 1) != "x" ) { $file_handle = fopen($file_name, "w"); if($file_handle == false) exit("Error:failed to open file $file_name"); - + // filling the file some data if mode is append mode - if( substr($mode, 0, 1) == "a") + if( substr($mode, 0, 1) == "a") fill_file($file_handle, $type, 10); fclose($file_handle); - } - + } + // opening the file in different modes $file_handle = fopen($file_name, $mode); - if($file_handle == false) + if($file_handle == false) exit("Error:failed to open file $file_name"); - + // writing data to the file - var_dump( fill_file($file_handle, $type, 50) ); + var_dump( fill_file($file_handle, $type, 50) ); var_dump( fflush($file_handle) ); fclose($file_handle); diff --git a/ext/standard/tests/file/fflush_variation1.phpt b/ext/standard/tests/file/fflush_variation1.phpt index 4b77195a0e..d23afd8984 100644 --- a/ext/standard/tests/file/fflush_variation1.phpt +++ b/ext/standard/tests/file/fflush_variation1.phpt @@ -23,7 +23,7 @@ $file_modes = array("w", "wb", "wt", "w+", "w+b", "w+t", "a", "ab", "at", "a+","a+b", "a+t", "x", "xb", "xt", "x+", "x+b", "x+t"); -$file_name = "$file_path/fflush_variation1.tmp"; +$file_name = "$file_path/fflush_variation1.tmp"; $count = 1; @@ -31,7 +31,7 @@ foreach( $file_types as $type ) { echo "-- Iteration $count with file containing $type Data--\n"; foreach( $file_modes as $mode ) { echo "-- File opened in $mode mode --\n"; - + // creating the file except for x mode if( substr($mode, 0, 1) != "x" ) { $file_handle = fopen($file_name, "w"); @@ -39,19 +39,19 @@ foreach( $file_types as $type ) { exit("Error:failed to open file $file_name"); // filling the file with some data if mode is append mode - if( substr($mode, 0, 1) == "a") + if( substr($mode, 0, 1) == "a") fill_file($file_handle, $type, 10); fclose($file_handle); - } - + } + // opening the file in different modes $file_handle = fopen($file_name, $mode); - if($file_handle == false) + if($file_handle == false) exit("Error:failed to open file $file_name"); - + // writing data to the file - var_dump( fill_file($file_handle, $type, 50) ); + var_dump( fill_file($file_handle, $type, 50) ); var_dump( fflush($file_handle) ); fclose($file_handle); diff --git a/ext/standard/tests/file/fflush_variation2.phpt b/ext/standard/tests/file/fflush_variation2.phpt index 9dfa17c43c..09670e875b 100644 --- a/ext/standard/tests/file/fflush_variation2.phpt +++ b/ext/standard/tests/file/fflush_variation2.phpt @@ -35,14 +35,14 @@ foreach( $file_types as $type ) { $file_handle = fopen($file_name, "w"); if($file_handle == false) exit("Error:failed to open file $file_name"); - + //fill the file with some data if mode is append mode - if( substr($mode, 0, 1) == "a" ) - fill_file($file_handle, $type, 10); - + if( substr($mode, 0, 1) == "a" ) + fill_file($file_handle, $type, 10); + //close the file fclose($file_handle); - + // creating the sym link var_dump( symlink($file_name, $symlink_name) ); $file_handle = fopen($symlink_name, $mode); @@ -50,10 +50,10 @@ foreach( $file_types as $type ) { exit("Error:failed to open link $symlink_name"); // filling data into the file - var_dump( fill_file($file_handle, $type, 50) ); + var_dump( fill_file($file_handle, $type, 50) ); var_dump( fflush($file_handle) ); fclose($file_handle); - + // reading the data from the file var_dump( readfile($symlink_name) ); diff --git a/ext/standard/tests/file/fflush_variation3.phpt b/ext/standard/tests/file/fflush_variation3.phpt index 0f27413930..80bbaf54f3 100644 --- a/ext/standard/tests/file/fflush_variation3.phpt +++ b/ext/standard/tests/file/fflush_variation3.phpt @@ -29,28 +29,28 @@ $count = 1; foreach( $file_types as $type ) { echo "-- Iteration $count with file containing $type data --\n"; foreach( $file_modes as $mode ) { - + // creating the file $file_handle = fopen($file_name, "w"); if($file_handle == false) exit("Error:failed to open file $file_name"); // fill the fill with some data if mode is append mode - if( substr($mode, 0, 1) == "a" ) - fill_file($file_handle, $type, 10); + if( substr($mode, 0, 1) == "a" ) + fill_file($file_handle, $type, 10); // fclose($file_handle); - + // creating hard link to the file var_dump( link($file_name, $link_name) ); - + // opening the file in different modes $file_handle = fopen($link_name, $mode); if($file_handle == false) exit("Error:failed to open link $link_name"); - + // writing data to the file - var_dump( fill_file($file_handle, $type, 50) ); + var_dump( fill_file($file_handle, $type, 50) ); var_dump( fflush($file_handle) ); fclose($file_handle); diff --git a/ext/standard/tests/file/fflush_variation4.phpt b/ext/standard/tests/file/fflush_variation4.phpt index ce6536ae2f..574a798e29 100644 --- a/ext/standard/tests/file/fflush_variation4.phpt +++ b/ext/standard/tests/file/fflush_variation4.phpt @@ -14,7 +14,7 @@ require $file_path.'/file.inc'; echo "*** Testing fflush(): with file handles of files opened in various read modes ***\n"; $file_modes = array("r", "rb", "rt"); -$file_name = "$file_path/fflush_variation4.tmp"; +$file_name = "$file_path/fflush_variation4.tmp"; $count = 1; @@ -26,14 +26,14 @@ foreach( $file_modes as $mode ) { if($file_handle == false) exit("Error:failed to open file $file_name"); fclose($file_handle); - + // opening the file in different read modes $file_handle = fopen($file_name, $mode); - if($file_handle == false) + if($file_handle == false) exit("Error:failed to open file $file_name"); var_dump( fflush($file_handle) ); fclose($file_handle); - + unlink($file_name); $count++; } diff --git a/ext/standard/tests/file/fgetc_basic.phpt b/ext/standard/tests/file/fgetc_basic.phpt index 7851e432f3..4c6daa4e7f 100644 --- a/ext/standard/tests/file/fgetc_basic.phpt +++ b/ext/standard/tests/file/fgetc_basic.phpt @@ -22,7 +22,7 @@ for($outerloop_counter = 0; $outerloop_counter < count($file_content_types); $ou echo " ---\n"; // create file file create_files(dirname(__FILE__), 1, $file_content_types[$outerloop_counter], 0755, 1, "w", "fgetc_basic", 1); - + //open the file in different modes and check the working of fgetc for($innerloop_counter = 0; $innerloop_counter < count($file_modes); $innerloop_counter++) { echo "-- Innerloop iteration "; @@ -30,7 +30,7 @@ for($outerloop_counter = 0; $outerloop_counter < count($file_content_types); $ou echo " of Outerloop Iteration "; echo $outerloop_counter + 1; echo " --\n"; - + // open the file using the $file_modes $filename = dirname(__FILE__)."/fgetc_basic1.tmp"; // file name that is created by create_files echo "-- Testing fgetc() : file opened using $file_modes[$innerloop_counter] mode --\n"; @@ -48,12 +48,12 @@ for($outerloop_counter = 0; $outerloop_counter < count($file_content_types); $ou var_dump( feof($file_handle) ); // is it eof() var_dump($file_handle); // dump the $file_handle to see if any thing got modifed } // end of for - + // close the file fclose ( $file_handle); } // end of innerloop for - + // delete the file delete_files(dirname(__FILE__), 1, "fgetc_basic", 1, ".tmp"); diff --git a/ext/standard/tests/file/fgetc_variation2.phpt b/ext/standard/tests/file/fgetc_variation2.phpt index 169f00ac2c..982433f956 100644 --- a/ext/standard/tests/file/fgetc_variation2.phpt +++ b/ext/standard/tests/file/fgetc_variation2.phpt @@ -11,7 +11,7 @@ Test fgetc() function : usage variations - closed handle - closed file handle - unset file handle */ - + // include the header for common test function include ("file.inc"); diff --git a/ext/standard/tests/file/fgetc_variation3.phpt b/ext/standard/tests/file/fgetc_variation3.phpt index fcea7f0d86..db4ea6fc21 100644 --- a/ext/standard/tests/file/fgetc_variation3.phpt +++ b/ext/standard/tests/file/fgetc_variation3.phpt @@ -31,8 +31,8 @@ foreach ($file_modes as $file_mode ) { fwrite($file_handle, $data); // rewind the file pointer to beginning of the file - var_dump( rewind($file_handle) ); - var_dump( ftell($file_handle) ); + var_dump( rewind($file_handle) ); + var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); // read from file @@ -44,7 +44,7 @@ foreach ($file_modes as $file_mode ) { fclose($file_handle); // delete the file - unlink($filename); + unlink($filename); } echo "Done\n"; diff --git a/ext/standard/tests/file/fgetc_variation4.phpt b/ext/standard/tests/file/fgetc_variation4.phpt index 7c4ea4fa0f..8f3fcabee1 100644 --- a/ext/standard/tests/file/fgetc_variation4.phpt +++ b/ext/standard/tests/file/fgetc_variation4.phpt @@ -13,8 +13,8 @@ Test fgetc() function : usage variations - different read modes echo "*** Testing fgetc() : usage variations ***\n"; echo "-- Testing fgetc() with files opened with different read modes --\n"; -$file_modes = array( "a+", "a+b", "a+t", - "x+", "x+b", "x+t", +$file_modes = array( "a+", "a+b", "a+t", + "x+", "x+b", "x+t", "w+", "w+b", "w+t" ); $filename = dirname(__FILE__)."/fgetc_variation4.tmp"; @@ -30,8 +30,8 @@ foreach ($file_modes as $file_mode ) { fwrite($file_handle, $data); // rewind the file pointer to beginning of the file - var_dump( rewind($file_handle) ); - var_dump( ftell($file_handle) ); + var_dump( rewind($file_handle) ); + var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); // read from file, at least 7 chars @@ -45,7 +45,7 @@ foreach ($file_modes as $file_mode ) { fclose($file_handle); // delete the file - unlink($filename); + unlink($filename); } echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation1.phpt b/ext/standard/tests/file/fgetcsv_variation1.phpt index 969c9c0348..e9f029e767 100644 --- a/ext/standard/tests/file/fgetcsv_variation1.phpt +++ b/ext/standard/tests/file/fgetcsv_variation1.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with all parameters specified --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -32,7 +32,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation1.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -50,7 +50,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + fwrite($file_handle, $csv_field . "\n"); // write another line of text and a blank line // this will be used to test, if the fgetcsv() read more than a line and its @@ -67,17 +67,17 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - + // use the right delimiter and enclosure with max length var_dump( fgetcsv($file_handle, 1024, $delimiter, $enclosure) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file diff --git a/ext/standard/tests/file/fgetcsv_variation10.phpt b/ext/standard/tests/file/fgetcsv_variation10.phpt index 60a401bb86..93c81640d5 100644 --- a/ext/standard/tests/file/fgetcsv_variation10.phpt +++ b/ext/standard/tests/file/fgetcsv_variation10.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - file pointer pointing to EOF --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -32,7 +32,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation10.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -62,17 +62,17 @@ foreach ($csv_lists as $csv_list) { if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); - } - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + } + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // set the file pointer to EOF - var_dump( fseek($file_handle, 0, SEEK_END) ); + var_dump( fseek($file_handle, 0, SEEK_END) ); // call fgetcsv() to parse csv fields // now file pointer should point to end of the file, try reading again var_dump( feof($file_handle) ); - var_dump( fgetcsv($file_handle, 1024, $delimiter, $enclosure) ); + var_dump( fgetcsv($file_handle, 1024, $delimiter, $enclosure) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); @@ -80,7 +80,7 @@ foreach ($csv_lists as $csv_list) { // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file diff --git a/ext/standard/tests/file/fgetcsv_variation11.phpt b/ext/standard/tests/file/fgetcsv_variation11.phpt index d5741248fb..719cbe5708 100644 --- a/ext/standard/tests/file/fgetcsv_variation11.phpt +++ b/ext/standard/tests/file/fgetcsv_variation11.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with different enclosure but same delimiter --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -33,7 +33,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation11.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -67,8 +67,8 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields diff --git a/ext/standard/tests/file/fgetcsv_variation12.phpt b/ext/standard/tests/file/fgetcsv_variation12.phpt index 3168684468..9802e92120 100644 --- a/ext/standard/tests/file/fgetcsv_variation12.phpt +++ b/ext/standard/tests/file/fgetcsv_variation12.phpt @@ -1,8 +1,8 @@ --TEST-- -Test fgetcsv() : usage variations - two chars as enclosure & delimiter (various read and append modes) +Test fgetcsv() : usage variations - two chars as enclosure & delimiter (various read and append modes) --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -49,7 +49,7 @@ foreach ($csv_lists as $csv_list) { $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; fwrite($file_handle, $csv_field . "\n"); - + // write another line of text and a blank line // this will be used to test, if the fgetcsv() read more than a line and its // working when only a blank line is read @@ -65,8 +65,8 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields @@ -78,7 +78,7 @@ foreach ($csv_lists as $csv_list) { // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file diff --git a/ext/standard/tests/file/fgetcsv_variation13.phpt b/ext/standard/tests/file/fgetcsv_variation13.phpt index f191a26379..d640244b89 100644 --- a/ext/standard/tests/file/fgetcsv_variation13.phpt +++ b/ext/standard/tests/file/fgetcsv_variation13.phpt @@ -3,7 +3,7 @@ Test fgetcsv() : usage variations - with line without any csv fields --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -19,7 +19,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation13.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { @@ -45,10 +45,10 @@ $loop_counter = 1; // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; - + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + // read the line which is without csv fields, provide delimiter and see the working of fgetcsv $fp_pos = ftell($file_handle); var_dump( fgetcsv($file_handle) ); diff --git a/ext/standard/tests/file/fgetcsv_variation14.phpt b/ext/standard/tests/file/fgetcsv_variation14.phpt index 14c72a24b1..b1b588e552 100644 --- a/ext/standard/tests/file/fgetcsv_variation14.phpt +++ b/ext/standard/tests/file/fgetcsv_variation14.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - reading the blank line --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -18,7 +18,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation14.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { @@ -44,8 +44,8 @@ $loop_counter = 1; // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields diff --git a/ext/standard/tests/file/fgetcsv_variation15.phpt b/ext/standard/tests/file/fgetcsv_variation15.phpt index c6859497ee..9ccb247b31 100644 --- a/ext/standard/tests/file/fgetcsv_variation15.phpt +++ b/ext/standard/tests/file/fgetcsv_variation15.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with default enclosure --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -28,7 +28,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation15.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -61,8 +61,8 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields diff --git a/ext/standard/tests/file/fgetcsv_variation16.phpt b/ext/standard/tests/file/fgetcsv_variation16.phpt index 9cfdd72460..8cd27eccc6 100644 --- a/ext/standard/tests/file/fgetcsv_variation16.phpt +++ b/ext/standard/tests/file/fgetcsv_variation16.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with default enclosure & length as 0 --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -30,7 +30,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation16.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -63,14 +63,14 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields // use length as 0 fseek($file_handle, 0, SEEK_SET); - var_dump( fgetcsv($file_handle, 0, $delimiter) ); + var_dump( fgetcsv($file_handle, 0, $delimiter) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); diff --git a/ext/standard/tests/file/fgetcsv_variation17.phpt b/ext/standard/tests/file/fgetcsv_variation17.phpt index b8d918659f..61759e0a94 100644 --- a/ext/standard/tests/file/fgetcsv_variation17.phpt +++ b/ext/standard/tests/file/fgetcsv_variation17.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with default enclosure & length less than line size --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -30,7 +30,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation17.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -63,8 +63,8 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields @@ -80,7 +80,7 @@ foreach ($csv_lists as $csv_list) { // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file diff --git a/ext/standard/tests/file/fgetcsv_variation18.phpt b/ext/standard/tests/file/fgetcsv_variation18.phpt index f0ebcb7fae..932858bc98 100644 --- a/ext/standard/tests/file/fgetcsv_variation18.phpt +++ b/ext/standard/tests/file/fgetcsv_variation18.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with default enclosure and different delimiter --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -30,7 +30,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation18.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -63,11 +63,11 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - + // use different delimiter than existing in file fseek($file_handle, 0, SEEK_SET); $del = "+"; @@ -75,7 +75,7 @@ foreach ($csv_lists as $csv_list) { // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file diff --git a/ext/standard/tests/file/fgetcsv_variation19.phpt b/ext/standard/tests/file/fgetcsv_variation19.phpt index cb510099bd..7278b503aa 100644 --- a/ext/standard/tests/file/fgetcsv_variation19.phpt +++ b/ext/standard/tests/file/fgetcsv_variation19.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with default enclosure & delimiter of two chars --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -31,7 +31,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation19.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -64,11 +64,11 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - + // use delimiter & enclosure char of two chars fseek($file_handle, 0, SEEK_SET); $del = "++"; @@ -76,7 +76,7 @@ foreach ($csv_lists as $csv_list) { // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file diff --git a/ext/standard/tests/file/fgetcsv_variation2.phpt b/ext/standard/tests/file/fgetcsv_variation2.phpt index d1e446d1f9..b696170036 100644 --- a/ext/standard/tests/file/fgetcsv_variation2.phpt +++ b/ext/standard/tests/file/fgetcsv_variation2.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with length as 0 --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -32,7 +32,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation2.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -67,11 +67,11 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - + // use length as 0 fseek($file_handle, 0, SEEK_SET); var_dump( fgetcsv($file_handle, 0, $delimiter, $enclosure) ); diff --git a/ext/standard/tests/file/fgetcsv_variation20.phpt b/ext/standard/tests/file/fgetcsv_variation20.phpt index 70bd8acbb0..49a32d92df 100644 --- a/ext/standard/tests/file/fgetcsv_variation20.phpt +++ b/ext/standard/tests/file/fgetcsv_variation20.phpt @@ -2,16 +2,16 @@ Test fgetcsv() : usage variations - with default enclosure, line without any csv fields --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ -/* +/* Testing fgetcsv() to read a line without any csv fields from a file when provided with default enclosure value */ - + echo "*** Testing fgetcsv() : with default enclosure, line without any csv fields ***\n"; $filename = dirname(__FILE__) . '/fgetcsv_variation20.tmp'; @@ -20,7 +20,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation20.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { @@ -46,11 +46,11 @@ $loop_counter = 1; // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - + // read the line which is without csv fields, provide delimiter and see the working of fgetcsv $fp_pos = ftell($file_handle); var_dump( fgetcsv($file_handle, 1024) ); diff --git a/ext/standard/tests/file/fgetcsv_variation21.phpt b/ext/standard/tests/file/fgetcsv_variation21.phpt index ae8c4f1ef6..dbfc2849d8 100644 --- a/ext/standard/tests/file/fgetcsv_variation21.phpt +++ b/ext/standard/tests/file/fgetcsv_variation21.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with default enclosure, blank line --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -20,7 +20,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation21.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { @@ -46,11 +46,11 @@ $loop_counter = 1; // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - + // read the line which is a blank line to see the working of fgetcsv $fp_pos = ftell($file_handle); var_dump( fgetcsv($file_handle, 1024, '+') ); diff --git a/ext/standard/tests/file/fgetcsv_variation22.phpt b/ext/standard/tests/file/fgetcsv_variation22.phpt index 9f35c1c1c3..5c3999b0d7 100644 --- a/ext/standard/tests/file/fgetcsv_variation22.phpt +++ b/ext/standard/tests/file/fgetcsv_variation22.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with default enclosure, file pointer pointing at end of file --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -31,7 +31,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation22.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -60,10 +60,10 @@ foreach ($csv_lists as $csv_list) { if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); - } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; - + } + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + // set the file pointer to EOF var_dump( fseek($file_handle, 0, SEEK_END) ); diff --git a/ext/standard/tests/file/fgetcsv_variation23.phpt b/ext/standard/tests/file/fgetcsv_variation23.phpt index b766f1e062..84c0e0bc8b 100644 --- a/ext/standard/tests/file/fgetcsv_variation23.phpt +++ b/ext/standard/tests/file/fgetcsv_variation23.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - empty file --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ diff --git a/ext/standard/tests/file/fgetcsv_variation24.phpt b/ext/standard/tests/file/fgetcsv_variation24.phpt index cdfadceb70..9ac3569b9e 100644 --- a/ext/standard/tests/file/fgetcsv_variation24.phpt +++ b/ext/standard/tests/file/fgetcsv_variation24.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - two chars as enclosure & delimiter (various write modes) --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -67,8 +67,8 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields @@ -80,7 +80,7 @@ foreach ($csv_lists as $csv_list) { // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file diff --git a/ext/standard/tests/file/fgetcsv_variation25.phpt b/ext/standard/tests/file/fgetcsv_variation25.phpt index 52e830cb5b..6dcb6474eb 100644 --- a/ext/standard/tests/file/fgetcsv_variation25.phpt +++ b/ext/standard/tests/file/fgetcsv_variation25.phpt @@ -2,16 +2,16 @@ Test fgetcsv() : usage variations - with negative length value along with enclosure and delimiter --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ -/* +/* Testing fgetcsv() to read from a file when provided with negative length argument along with delimiter and enclosure arguments */ - + echo "*** Testing fgetcsv() : with negative length value ***\n"; /* the array is with three elements in it. Each element should be read as @@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation25.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + fwrite($file_handle, $csv_field . "\n"); // write another line of text and a blank line // this will be used to test, if the fgetcsv() read more than a line and its @@ -70,17 +70,17 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - + // use the right delimiter and enclosure with negative length var_dump( fgetcsv($file_handle, -10, $delimiter, $enclosure) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file diff --git a/ext/standard/tests/file/fgetcsv_variation26.phpt b/ext/standard/tests/file/fgetcsv_variation26.phpt index c042eb4931..7ec33e6f22 100644 --- a/ext/standard/tests/file/fgetcsv_variation26.phpt +++ b/ext/standard/tests/file/fgetcsv_variation26.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - reading files opened in write only mode (Bug #42036) --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -38,7 +38,7 @@ foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { // create the file and add the content with has csv fields $file_handle = fopen($filename, $file_modes[$mode_counter] ); - + if ( !$file_handle ) { echo "Error: failed to create file $filename!\n"; exit(); @@ -46,7 +46,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + fwrite($file_handle, $csv_field . "\n"); // write another line of text and a blank line // this will be used to test, if the fgetcsv() read more than a line and its @@ -56,17 +56,17 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - + // use the right delimiter and enclosure with max length var_dump( fgetcsv($file_handle, 1024, $delimiter, $enclosure) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file diff --git a/ext/standard/tests/file/fgetcsv_variation27.phpt b/ext/standard/tests/file/fgetcsv_variation27.phpt index a215e90a3f..15133aa870 100644 --- a/ext/standard/tests/file/fgetcsv_variation27.phpt +++ b/ext/standard/tests/file/fgetcsv_variation27.phpt @@ -2,16 +2,16 @@ Test fgetcsv() : usage variations - with negative length value along with delimiter and no enclosure --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ -/* +/* Testing fgetcsv() to read from a file when provided with negative length argument along with delimiter and no enclosure arguments */ - + echo "*** Testing fgetcsv() : with negative length value ***\n"; /* the array is with three elements in it. Each element should be read as @@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation27.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + fwrite($file_handle, $csv_field . "\n"); // write another line of text and a blank line // this will be used to test, if the fgetcsv() read more than a line and its @@ -70,17 +70,17 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - + // use the right delimiter and enclosure with negative length var_dump( fgetcsv($file_handle, -10, $delimiter) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file diff --git a/ext/standard/tests/file/fgetcsv_variation28.phpt b/ext/standard/tests/file/fgetcsv_variation28.phpt index 4e6fed3171..1b1667325c 100644 --- a/ext/standard/tests/file/fgetcsv_variation28.phpt +++ b/ext/standard/tests/file/fgetcsv_variation28.phpt @@ -2,16 +2,16 @@ Test fgetcsv() : usage variations - with negative length value along with neither enclosure and nor delimiter --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ -/* +/* Testing fgetcsv() to read from a file when provided with negative length argument along with neither delimiter nor enclosure argument */ - + echo "*** Testing fgetcsv() : with negative length value ***\n"; /* the array is with three elements in it. Each element should be read as @@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation28.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + fwrite($file_handle, $csv_field . "\n"); // write another line of text and a blank line // this will be used to test, if the fgetcsv() read more than a line and its @@ -70,17 +70,17 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - + // use the right delimiter and enclosure with negative length var_dump( fgetcsv($file_handle, -10) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file diff --git a/ext/standard/tests/file/fgetcsv_variation29.phpt b/ext/standard/tests/file/fgetcsv_variation29.phpt index 0420860321..e2a40bffd1 100644 --- a/ext/standard/tests/file/fgetcsv_variation29.phpt +++ b/ext/standard/tests/file/fgetcsv_variation29.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with only file handle as argument, file pointer pointing at end of file --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -31,7 +31,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation29.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -61,9 +61,9 @@ foreach ($csv_lists as $csv_list) { if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); - } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + } + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // set the file pointer to EOF var_dump( fseek($file_handle, 0, SEEK_END) ); @@ -72,7 +72,7 @@ foreach ($csv_lists as $csv_list) { // now file pointer should point to end of the file, try reading again var_dump( feof($file_handle) ); - var_dump( fgetcsv($file_handle) ); + var_dump( fgetcsv($file_handle) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); diff --git a/ext/standard/tests/file/fgetcsv_variation3.phpt b/ext/standard/tests/file/fgetcsv_variation3.phpt index 8cde39da20..ce60f32f00 100644 --- a/ext/standard/tests/file/fgetcsv_variation3.phpt +++ b/ext/standard/tests/file/fgetcsv_variation3.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with delimiter as NULL --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -32,7 +32,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation3.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -67,8 +67,8 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields diff --git a/ext/standard/tests/file/fgetcsv_variation30.phpt b/ext/standard/tests/file/fgetcsv_variation30.phpt index e474b2d546..caedfba781 100644 --- a/ext/standard/tests/file/fgetcsv_variation30.phpt +++ b/ext/standard/tests/file/fgetcsv_variation30.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with file handle and length, file pointer pointing at end of file --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -31,7 +31,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation30.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -60,18 +60,18 @@ foreach ($csv_lists as $csv_list) { if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); - } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + } + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // set the file pointer to EOF var_dump( fseek($file_handle, 0, SEEK_END) ); - + // call fgetcsv() to parse csv fields // now file pointer should point to end of the file, try reading again var_dump( feof($file_handle) ); - var_dump( fgetcsv($file_handle, 1024) ); + var_dump( fgetcsv($file_handle, 1024) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); diff --git a/ext/standard/tests/file/fgetcsv_variation31.phpt b/ext/standard/tests/file/fgetcsv_variation31.phpt index 7d1e90e1f9..3113880393 100644 --- a/ext/standard/tests/file/fgetcsv_variation31.phpt +++ b/ext/standard/tests/file/fgetcsv_variation31.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with length and enclosure, file pointer pointing at end of file --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -31,7 +31,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation31.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -61,13 +61,13 @@ foreach ($csv_lists as $csv_list) { if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); - } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + } + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // set the file pointer to EOF var_dump( fseek($file_handle, 0, SEEK_END) ); - + // call fgetcsv() to parse csv fields // now file pointer should point to end of the file, try reading again diff --git a/ext/standard/tests/file/fgetcsv_variation4.phpt b/ext/standard/tests/file/fgetcsv_variation4.phpt index da945daa70..7eac3ed017 100644 --- a/ext/standard/tests/file/fgetcsv_variation4.phpt +++ b/ext/standard/tests/file/fgetcsv_variation4.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with enclosure as NULL --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -32,7 +32,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation4.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -66,8 +66,8 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields diff --git a/ext/standard/tests/file/fgetcsv_variation5.phpt b/ext/standard/tests/file/fgetcsv_variation5.phpt index d3564e4015..b73b7aa40e 100644 --- a/ext/standard/tests/file/fgetcsv_variation5.phpt +++ b/ext/standard/tests/file/fgetcsv_variation5.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with delimiter & enclosure as NULL --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation5.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -69,8 +69,8 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields diff --git a/ext/standard/tests/file/fgetcsv_variation6.phpt b/ext/standard/tests/file/fgetcsv_variation6.phpt index 844dd7c519..20f4a3b5cb 100644 --- a/ext/standard/tests/file/fgetcsv_variation6.phpt +++ b/ext/standard/tests/file/fgetcsv_variation6.phpt @@ -2,12 +2,12 @@ Test fgetcsv() : usage variations - with length less than line size --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ -/* +/* Testing fgetcsv() to read from a file when provided with the length argument value less than the line size */ @@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation6.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -69,8 +69,8 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields diff --git a/ext/standard/tests/file/fgetcsv_variation7.phpt b/ext/standard/tests/file/fgetcsv_variation7.phpt index 271a55b009..247d450cd3 100644 --- a/ext/standard/tests/file/fgetcsv_variation7.phpt +++ b/ext/standard/tests/file/fgetcsv_variation7.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with default arguments value --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -32,7 +32,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation7.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -66,8 +66,8 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields diff --git a/ext/standard/tests/file/fgetcsv_variation8.phpt b/ext/standard/tests/file/fgetcsv_variation8.phpt index bf06d29b40..51b6fdb546 100644 --- a/ext/standard/tests/file/fgetcsv_variation8.phpt +++ b/ext/standard/tests/file/fgetcsv_variation8.phpt @@ -2,12 +2,12 @@ Test fgetcsv() : usage variations - with different delimiter and enclosure --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ -/* +/* Testing fgetcsv() to read from a file when provided with values of delimiter and enclosure that are not present in the line read by fgetcsv() */ @@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation8.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -70,8 +70,8 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields @@ -83,7 +83,7 @@ foreach ($csv_lists as $csv_list) { // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file diff --git a/ext/standard/tests/file/fgetcsv_variation9.phpt b/ext/standard/tests/file/fgetcsv_variation9.phpt index 294241e6cd..72d82c7988 100644 --- a/ext/standard/tests/file/fgetcsv_variation9.phpt +++ b/ext/standard/tests/file/fgetcsv_variation9.phpt @@ -2,12 +2,12 @@ Test fgetcsv() : usage variations - with different delimiter but same enclosure --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ -/* +/* Testing fgetcsv() to read from a file when the delimiter argument value is not present in the line being read by the fgetcsv() */ @@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation9.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -69,11 +69,11 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - + // use different delimiter but same enclosure char fseek($file_handle, 0, SEEK_SET); $del = "+"; diff --git a/ext/standard/tests/file/fgets_error.phpt b/ext/standard/tests/file/fgets_error.phpt index c84d562027..048278cf5b 100644 --- a/ext/standard/tests/file/fgets_error.phpt +++ b/ext/standard/tests/file/fgets_error.phpt @@ -19,11 +19,11 @@ var_dump( fgets($fp, 10, $fp) ); // invalid length argument echo "-- Testing fgets() with invalid length arguments --\n"; -$len = 0; +$len = 0; var_dump( fgets($fp, $len) ); $len = -10; var_dump( fgets($fp, $len) ); -$len = 1; +$len = 1; var_dump( fgets($fp, $len) ); // return length - 1 always, expect false diff --git a/ext/standard/tests/file/fgets_variation1.phpt b/ext/standard/tests/file/fgets_variation1.phpt index a51ca6c81c..b4a86250ba 100644 --- a/ext/standard/tests/file/fgets_variation1.phpt +++ b/ext/standard/tests/file/fgets_variation1.phpt @@ -30,8 +30,8 @@ foreach ($file_modes as $file_mode ) { fwrite($file_handle, $data); // rewind the file pointer to beginning of the file - var_dump( rewind($file_handle) ); - var_dump( ftell($file_handle) ); + var_dump( rewind($file_handle) ); + var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); // read from file @@ -43,7 +43,7 @@ foreach ($file_modes as $file_mode ) { fclose($file_handle); // delete the file - unlink($filename); + unlink($filename); } echo "Done\n"; diff --git a/ext/standard/tests/file/fgets_variation2.phpt b/ext/standard/tests/file/fgets_variation2.phpt index 201755b69c..4c0ba2894c 100644 --- a/ext/standard/tests/file/fgets_variation2.phpt +++ b/ext/standard/tests/file/fgets_variation2.phpt @@ -11,7 +11,7 @@ Test fgets() function : usage variations - closed handle - closed file handle - unset file handle */ - + // include the header for common test function include ("file.inc"); diff --git a/ext/standard/tests/file/fgets_variation3.phpt b/ext/standard/tests/file/fgets_variation3.phpt index 09b20fcb23..6288477fd4 100644 --- a/ext/standard/tests/file/fgets_variation3.phpt +++ b/ext/standard/tests/file/fgets_variation3.phpt @@ -12,7 +12,7 @@ include ("file.inc"); $file_modes = array("w+", "w+b", "w+t", "a+", "a+b", "a+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric"); @@ -29,7 +29,7 @@ foreach($file_modes as $file_mode) { /* create files with $file_content_type */ $file_handle = fopen($filename, $file_mode); $data = fill_file($file_handle, $file_content_type, 50); - + if ( !$file_handle ) { echo "Error: failed to open file $filename!"; exit(); diff --git a/ext/standard/tests/file/fgets_variation4-win32-mb.phpt b/ext/standard/tests/file/fgets_variation4-win32-mb.phpt index 40223d3cdf..b5c3eaae8f 100644 --- a/ext/standard/tests/file/fgets_variation4-win32-mb.phpt +++ b/ext/standard/tests/file/fgets_variation4-win32-mb.phpt @@ -18,7 +18,7 @@ include ("file.inc"); $file_modes = array("w+", "w+b", "w+t", "a+", "a+b", "a+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric"); diff --git a/ext/standard/tests/file/fgets_variation4-win32.phpt b/ext/standard/tests/file/fgets_variation4-win32.phpt index c95ca287bd..d5b2c5a53d 100644 --- a/ext/standard/tests/file/fgets_variation4-win32.phpt +++ b/ext/standard/tests/file/fgets_variation4-win32.phpt @@ -18,7 +18,7 @@ include ("file.inc"); $file_modes = array("w+", "w+b", "w+t", "a+", "a+b", "a+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric"); diff --git a/ext/standard/tests/file/fgets_variation4.phpt b/ext/standard/tests/file/fgets_variation4.phpt index 1843c2e8b5..c858c8cb21 100644 --- a/ext/standard/tests/file/fgets_variation4.phpt +++ b/ext/standard/tests/file/fgets_variation4.phpt @@ -18,7 +18,7 @@ include ("file.inc"); $file_modes = array("w+", "w+b", "w+t", "a+", "a+b", "a+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric"); diff --git a/ext/standard/tests/file/fgets_variation5.phpt b/ext/standard/tests/file/fgets_variation5.phpt index 1907f541e2..c2ededf198 100644 --- a/ext/standard/tests/file/fgets_variation5.phpt +++ b/ext/standard/tests/file/fgets_variation5.phpt @@ -12,7 +12,7 @@ include ("file.inc"); $file_modes = array("w+", "w+b", "w+t", "a+", "a+b", "a+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric"); diff --git a/ext/standard/tests/file/fgets_variation6-win32.phpt b/ext/standard/tests/file/fgets_variation6-win32.phpt index fa01154bcf..a402cb1073 100644 --- a/ext/standard/tests/file/fgets_variation6-win32.phpt +++ b/ext/standard/tests/file/fgets_variation6-win32.phpt @@ -18,7 +18,7 @@ include ("file.inc"); $file_modes = array("w+", "w+b", "w+t", "a+", "a+b", "a+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric"); diff --git a/ext/standard/tests/file/fgets_variation6.phpt b/ext/standard/tests/file/fgets_variation6.phpt index 52da7094dd..2bcec8a3bd 100644 --- a/ext/standard/tests/file/fgets_variation6.phpt +++ b/ext/standard/tests/file/fgets_variation6.phpt @@ -18,7 +18,7 @@ include ("file.inc"); $file_modes = array("w+", "w+b", "w+t", "a+", "a+b", "a+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric"); diff --git a/ext/standard/tests/file/fgetss.phpt b/ext/standard/tests/file/fgetss.phpt index fc685113fc..41ac46dc92 100644 --- a/ext/standard/tests/file/fgetss.phpt +++ b/ext/standard/tests/file/fgetss.phpt @@ -38,7 +38,7 @@ var_dump(fgetss($fp, 0)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Deprecated: Function fgetss() is deprecated in %s on line %d string(18) "askasdfasdfaaaaaa " diff --git a/ext/standard/tests/file/fgetss1.phpt b/ext/standard/tests/file/fgetss1.phpt index 5054086d7d..0266371865 100644 --- a/ext/standard/tests/file/fgetss1.phpt +++ b/ext/standard/tests/file/fgetss1.phpt @@ -37,7 +37,7 @@ echo "Done\n"; $filename = dirname(__FILE__)."/fgetss1.html"; unlink($filename); ?> ---EXPECT-- +--EXPECT-- string(21) "askasdfasdf<b>aaaaaa " string(6) "dddddd" diff --git a/ext/standard/tests/file/fgetss_basic1.phpt b/ext/standard/tests/file/fgetss_basic1.phpt index 53ef38d4d8..788a2a5f37 100644 --- a/ext/standard/tests/file/fgetss_basic1.phpt +++ b/ext/standard/tests/file/fgetss_basic1.phpt @@ -34,32 +34,32 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "\n-- Testing fgetss() with file opened using $file_modes[$mode_counter] mode --\n"; /* create an empty file and write the strings with tags */ - $filename = dirname(__FILE__)."/fgetss_basic1.tmp"; + $filename = dirname(__FILE__)."/fgetss_basic1.tmp"; create_file ($filename); //create an empty file - file_put_contents($filename, $string_with_tags); + file_put_contents($filename, $string_with_tags); $file_handle = fopen($filename, $file_modes[$mode_counter]); if(!$file_handle) { echo "Error: failed to open file $filename!\n"; exit(); } - - rewind($file_handle); - /* read entire file and strip tags */ + + rewind($file_handle); + /* read entire file and strip tags */ echo "-- fgetss() with default length, file pointer at 0 --\n"; var_dump( fgetss($file_handle) ); // no length and allowable tags provided, reads entire file var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + rewind($file_handle); /* read entire file and strip tags tags */ echo "-- fgets() with length = 30, file pointer at 0 --\n"; var_dump( fgetss($file_handle ,30) ); // length parameter given,not reading entire file var_dump( ftell($file_handle) ); // checking file pointer position initially var_dump( feof($file_handle) ); // confirm file pointer is not at eof - + // close the file fclose($file_handle); - + // delete the file delete_file($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt b/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt index c875024718..518e39d4c9 100644 --- a/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt +++ b/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt @@ -34,7 +34,7 @@ EOT; if(substr(PHP_OS, 0, 3) == "WIN") { $string_with_tags = str_replace("\r",'', $string_with_tags); } -$filename = dirname(__FILE__)."/fgetss_basic2私はガラスを食べられます.tmp"; +$filename = dirname(__FILE__)."/fgetss_basic2私はガラスを食べられます.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t"); @@ -49,7 +49,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); @@ -68,10 +68,10 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( fgetss($file_handle ,30) ); // length parameter given,not reading entire file var_dump( ftell($file_handle) ); // checking file pointer position initially var_dump( feof($file_handle) ); // confirm file pointer is not at eof - + // close the file fclose($file_handle); - + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_basic2-win32.phpt b/ext/standard/tests/file/fgetss_basic2-win32.phpt index c7f3aa4c06..c78fed27c1 100644 --- a/ext/standard/tests/file/fgetss_basic2-win32.phpt +++ b/ext/standard/tests/file/fgetss_basic2-win32.phpt @@ -34,7 +34,7 @@ EOT; if(substr(PHP_OS, 0, 3) == "WIN") { $string_with_tags = str_replace("\r",'', $string_with_tags); } -$filename = dirname(__FILE__)."/fgetss_basic2.tmp"; +$filename = dirname(__FILE__)."/fgetss_basic2.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t"); @@ -49,7 +49,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); @@ -68,10 +68,10 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( fgetss($file_handle ,30) ); // length parameter given,not reading entire file var_dump( ftell($file_handle) ); // checking file pointer position initially var_dump( feof($file_handle) ); // confirm file pointer is not at eof - + // close the file fclose($file_handle); - + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_basic2.phpt b/ext/standard/tests/file/fgetss_basic2.phpt index 771eabeaa1..4dc1fe3b45 100644 --- a/ext/standard/tests/file/fgetss_basic2.phpt +++ b/ext/standard/tests/file/fgetss_basic2.phpt @@ -32,7 +32,7 @@ is a heredoc string. <pg>ksklnm@@$$&$&^%&^%&^%&</pg> <html> html </html> <?php echo "php"; ?> EOT; -$filename = dirname(__FILE__)."/fgetss_basic2.tmp"; +$filename = dirname(__FILE__)."/fgetss_basic2.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t"); @@ -47,7 +47,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); @@ -66,10 +66,10 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( fgetss($file_handle ,30) ); // length parameter given,not reading entire file var_dump( ftell($file_handle) ); // checking file pointer position initially var_dump( feof($file_handle) ); // confirm file pointer is not at eof - + // close the file fclose($file_handle); - + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_error.phpt b/ext/standard/tests/file/fgetss_error.phpt index 893aca221a..6dffe554b6 100644 --- a/ext/standard/tests/file/fgetss_error.phpt +++ b/ext/standard/tests/file/fgetss_error.phpt @@ -21,12 +21,12 @@ var_dump( fgetss($fp, 100, '<p><a>', $fp) ); // invalid length argument echo "-- Testing fgetss() with invalid length arguments --\n"; -$len = 0; +$len = 0; $allowable_tags = '<p><a>'; var_dump( fgetss($fp, $len, $allowable_tags) ); $len = -10; var_dump( fgetss($fp, $len, $allowable_tags) ); -$len = 1; +$len = 1; var_dump( fgetss($fp, $len, $allowable_tags) ); // return length - 1 always, expect false // test invalid arguments : non-resources diff --git a/ext/standard/tests/file/fgetss_variation1-win32.phpt b/ext/standard/tests/file/fgetss_variation1-win32.phpt index 688f5e624a..f12127614a 100644 --- a/ext/standard/tests/file/fgetss_variation1-win32.phpt +++ b/ext/standard/tests/file/fgetss_variation1-win32.phpt @@ -57,22 +57,22 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - /* read entire file and strip tags */ + /* read entire file and strip tags */ echo "-- fgetss() with default length, file pointer at 0 , expected : no character should be read --\n"; var_dump( fgetss($file_handle) ); // expected : no character should be read var_dump( ftell($file_handle) ); //ensure that file pointer position is not changed var_dump( feof($file_handle) ); // check if end of file pointer is set - + // close the file fclose($file_handle); - + // delete the file delete_file($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation1.phpt b/ext/standard/tests/file/fgetss_variation1.phpt index c716090541..9f9fa1a16d 100644 --- a/ext/standard/tests/file/fgetss_variation1.phpt +++ b/ext/standard/tests/file/fgetss_variation1.phpt @@ -53,22 +53,22 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - /* read entire file and strip tags */ + /* read entire file and strip tags */ echo "-- fgetss() with default length, file pointer at 0 , expected : no character should be read --\n"; var_dump( fgetss($file_handle) ); // expected : no character should be read var_dump( ftell($file_handle) ); //ensure that file pointer position is not changed var_dump( feof($file_handle) ); // check if end of file pointer is set - + // close the file fclose($file_handle); - + // delete the file delete_file($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation2.phpt b/ext/standard/tests/file/fgetss_variation2.phpt index e8d168e46f..e9d19a7a26 100644 --- a/ext/standard/tests/file/fgetss_variation2.phpt +++ b/ext/standard/tests/file/fgetss_variation2.phpt @@ -29,7 +29,7 @@ this text contains some html tags <body> body </body> <br> br </br> this is the line with \n character. EOT; -$filename = dirname(__FILE__)."/fgetss_variation2.tmp"; +$filename = dirname(__FILE__)."/fgetss_variation2.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("r","rb", "rt","r+", "r+b", "r+t"); @@ -39,7 +39,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { /* create an empty file and write the strings with tags */ create_file ($filename); //create an empty file - file_put_contents($filename, $string_with_tags); + file_put_contents($filename, $string_with_tags); $file_handle = fopen($filename, $file_modes[$mode_counter]); if(!$file_handle) { echo "Error: failed to open file $filename!\n"; @@ -51,7 +51,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( rewind($file_handle) ); var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + /* rewind the file and read the file line by line with allowable tags */ echo "-- Reading line by line with allowable tags: <test>, <html>, <?> --\n"; rewind($file_handle); @@ -62,9 +62,9 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( ftell($file_handle) ); // check the file pointer position var_dump( feof($file_handle) ); // check if eof reached } - + // close the file - fclose($file_handle); + fclose($file_handle); // delete the file delete_file($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation3-win32.phpt b/ext/standard/tests/file/fgetss_variation3-win32.phpt index 19699b2fb3..9f61d23fc0 100644 --- a/ext/standard/tests/file/fgetss_variation3-win32.phpt +++ b/ext/standard/tests/file/fgetss_variation3-win32.phpt @@ -41,7 +41,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") { $string_with_tags = str_replace("\r",'', $string_with_tags); } -$filename = dirname(__FILE__)."/fgetss_variation3.tmp"; +$filename = dirname(__FILE__)."/fgetss_variation3.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t"); @@ -56,7 +56,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - + // rewind the file pointer to beginning of the file rewind($file_handle); var_dump( ftell($file_handle) ); @@ -72,10 +72,10 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( ftell($file_handle) ); // check the file pointer position var_dump( feof($file_handle) ); // check if eof reached } - + // close the file fclose($file_handle); - + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation3.phpt b/ext/standard/tests/file/fgetss_variation3.phpt index c87925cb8e..1d7183a9d7 100644 --- a/ext/standard/tests/file/fgetss_variation3.phpt +++ b/ext/standard/tests/file/fgetss_variation3.phpt @@ -37,7 +37,7 @@ this text contains some html tags <body> body </body> <br> br </br> this is the line with \n character. EOT; -$filename = dirname(__FILE__)."/fgetss_variation3.tmp"; +$filename = dirname(__FILE__)."/fgetss_variation3.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t"); @@ -52,7 +52,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - + // rewind the file pointer to beginning of the file rewind($file_handle); var_dump( ftell($file_handle) ); @@ -68,10 +68,10 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( ftell($file_handle) ); // check the file pointer position var_dump( feof($file_handle) ); // check if eof reached } - + // close the file fclose($file_handle); - + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation4.phpt b/ext/standard/tests/file/fgetss_variation4.phpt index 60f7cdab63..cd87b8bc25 100644 --- a/ext/standard/tests/file/fgetss_variation4.phpt +++ b/ext/standard/tests/file/fgetss_variation4.phpt @@ -32,7 +32,7 @@ this text contains some html tags <body> body </body> <br> br </br> this is the line with \n character. EOT; -$filename = dirname(__FILE__)."/fgetss_variation4.tmp"; +$filename = dirname(__FILE__)."/fgetss_variation4.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("r","rb", "rt","r+", "r+b", "r+t"); @@ -42,7 +42,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { /* create an empty file and write the strings with tags */ create_file ($filename); //create an empty file - file_put_contents($filename, $string_with_tags); + file_put_contents($filename, $string_with_tags); $file_handle = fopen($filename, $file_modes[$mode_counter]); if(!$file_handle) { echo "Error: failed to open file $filename!\n"; @@ -54,7 +54,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( rewind($file_handle) ); var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + echo "-- Reading when file pointer points to EOF --\n"; var_dump( fseek($file_handle,0,SEEK_END) ); // now file pointer at end var_dump( ftell($file_handle) ); //ensure file pointer at end @@ -66,9 +66,9 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( fgetss($file_handle, 80, "<test>, <html>, <?>") ); var_dump( ftell($file_handle) ); // find out file position var_dump( feof($file_handle) ); // ensure that file pointer is at eof - + // close the file - fclose($file_handle); + fclose($file_handle); // delete the file delete_file($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation5-win32.phpt b/ext/standard/tests/file/fgetss_variation5-win32.phpt index 211c158ae2..77cf918749 100644 --- a/ext/standard/tests/file/fgetss_variation5-win32.phpt +++ b/ext/standard/tests/file/fgetss_variation5-win32.phpt @@ -39,7 +39,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") { $string_with_tags = str_replace("\r",'', $string_with_tags); } -$filename = dirname(__FILE__)."/fgetss_variation5.tmp"; +$filename = dirname(__FILE__)."/fgetss_variation5.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t"); @@ -72,10 +72,10 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( ftell($file_handle) ); // find out file position var_dump( feof($file_handle) ); // ensure that file pointer is at eof - + // close the file fclose($file_handle); - + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation5.phpt b/ext/standard/tests/file/fgetss_variation5.phpt index 17e0935e84..a2e3baf22c 100644 --- a/ext/standard/tests/file/fgetss_variation5.phpt +++ b/ext/standard/tests/file/fgetss_variation5.phpt @@ -36,7 +36,7 @@ this text contains some html tags <body> body </body> <br> br </br> this is the line with \n character. EOT; -$filename = dirname(__FILE__)."/fgetss_variation5.tmp"; +$filename = dirname(__FILE__)."/fgetss_variation5.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t"); @@ -69,10 +69,10 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( ftell($file_handle) ); // find out file position var_dump( feof($file_handle) ); // ensure that file pointer is at eof - + // close the file fclose($file_handle); - + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/file_basic.phpt b/ext/standard/tests/file/file_basic.phpt index d271c216f6..d93f7f84ed 100644 --- a/ext/standard/tests/file/file_basic.phpt +++ b/ext/standard/tests/file/file_basic.phpt @@ -2,7 +2,7 @@ Test file() function : basic functionality --FILE-- <?php -/* +/* * Prototype: array file ( string filename [,int use-include_path [,resource context]] ); * Description: Reads entire file into an array * Returns the file in an array diff --git a/ext/standard/tests/file/file_error.phpt b/ext/standard/tests/file/file_error.phpt index 1e7d51237a..dd9a468e57 100644 --- a/ext/standard/tests/file/file_error.phpt +++ b/ext/standard/tests/file/file_error.phpt @@ -2,7 +2,7 @@ Test file() function : error conditions --FILE-- <?php -/* +/* Prototype: array file ( string filename [,int use-include_path [,resource context]] ); Description: Reads entire file into an array Returns the file in an array diff --git a/ext/standard/tests/file/file_exists_error.phpt b/ext/standard/tests/file/file_exists_error.phpt index b20b2fe3a0..fc7a7487c4 100644 --- a/ext/standard/tests/file/file_exists_error.phpt +++ b/ext/standard/tests/file/file_exists_error.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : proto bool file_exists(string filename) * Description: Returns true if filename exists * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_exists() : error conditions ***\n"; diff --git a/ext/standard/tests/file/file_exists_variation1.phpt b/ext/standard/tests/file/file_exists_variation1.phpt index 2e8fd58d8e..9a3122fa07 100644 --- a/ext/standard/tests/file/file_exists_variation1.phpt +++ b/ext/standard/tests/file/file_exists_variation1.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : proto bool file_exists(string filename) * Description: Returns true if filename exists * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_exists() : usage variations ***\n"; diff --git a/ext/standard/tests/file/file_get_contents_error.phpt b/ext/standard/tests/file/file_get_contents_error.phpt index 631a138a07..f06628f516 100644 --- a/ext/standard/tests/file/file_get_contents_error.phpt +++ b/ext/standard/tests/file/file_get_contents_error.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype: string file_get_contents( string $filename{, bool $use_include_path[, - * resource $context[, int $offset[, int $maxlen]]]] ) + * resource $context[, int $offset[, int $maxlen]]]] ) * Description: Reads entire file into a string */ @@ -28,7 +28,7 @@ print( file_get_contents($file_path."/file1.tmp", false, $file_handle, 1, 2, "ex echo "\n-- Testing for invalid negative maxlen values --"; var_dump( file_get_contents($file_path."/file1.tmp", FALSE, $file_handle, 0, -5) ); - + delete_files($file_path, 1); fclose($file_handle); unlink($file_path."/file_put_contents_error.tmp"); diff --git a/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt b/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt index 72fe121533..b2a09798e3 100644 --- a/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt +++ b/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt @@ -3,7 +3,7 @@ Test file-get_contents() and file_put_contents() functions : error conditions --FILE-- <?php /* Prototype: string file_get_contents( string $filename{, bool $use_include_path[, - * resource $context[, int $offset[, int $maxlen]]]] ) + * resource $context[, int $offset[, int $maxlen]]]] ) * Description: Reads entire file into a string */ @@ -31,7 +31,7 @@ print( file_get_contents("abc.tmp", false, $file_handle, 1, 2, "extra_argument") echo "\n-- Testing for invalid negative maxlen values --"; file_put_contents($file_path."/file_put_contents1.tmp", "Garbage data in the file"); var_dump( file_get_contents($file_path."/file_put_contents1.tmp", FALSE, NULL, 0, -5) ); - + fclose($file_handle); echo "\n*** Done ***\n"; diff --git a/ext/standard/tests/file/file_get_contents_variation1.phpt b/ext/standard/tests/file/file_get_contents_variation1.phpt index ddc926180d..28a66067a3 100644 --- a/ext/standard/tests/file/file_get_contents_variation1.phpt +++ b/ext/standard/tests/file/file_get_contents_variation1.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : variation ***\n"; @@ -40,7 +40,7 @@ function runtest() { fclose($h); $line = file_get_contents($filename, true); echo "$line\n"; - unlink($secondFile); + unlink($secondFile); } ?> diff --git a/ext/standard/tests/file/file_get_contents_variation2.phpt b/ext/standard/tests/file/file_get_contents_variation2.phpt index 510ec12aed..6142386e63 100644 --- a/ext/standard/tests/file/file_get_contents_variation2.phpt +++ b/ext/standard/tests/file/file_get_contents_variation2.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : variation ***\n"; @@ -41,7 +41,7 @@ function runtest() { fclose($h); $line = file_get_contents($filename, true); echo "$line\n"; - unlink($scriptLocFile); + unlink($scriptLocFile); } ?> diff --git a/ext/standard/tests/file/file_get_contents_variation3.phpt b/ext/standard/tests/file/file_get_contents_variation3.phpt index 035ecd3d68..a6b99be1b3 100644 --- a/ext/standard/tests/file/file_get_contents_variation3.phpt +++ b/ext/standard/tests/file/file_get_contents_variation3.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : usage variation ***\n"; diff --git a/ext/standard/tests/file/file_get_contents_variation4.phpt b/ext/standard/tests/file/file_get_contents_variation4.phpt index 6c7f5a132c..5272489ae1 100644 --- a/ext/standard/tests/file/file_get_contents_variation4.phpt +++ b/ext/standard/tests/file/file_get_contents_variation4.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : usage variation ***\n"; @@ -107,10 +107,10 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + //non context resource 'file resource' => $fileRes, - + //valid stream context 'stream context' => $strContext, ); diff --git a/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt b/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt index e4d610c035..cd536f5617 100644 --- a/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt +++ b/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt @@ -9,7 +9,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : usage variation ***\n"; diff --git a/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt b/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt index 8e23c65791..7fc63b4d9e 100644 --- a/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt +++ b/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt @@ -9,7 +9,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : usage variation ***\n"; diff --git a/ext/standard/tests/file/file_get_contents_variation6.phpt b/ext/standard/tests/file/file_get_contents_variation6.phpt index f253957709..b131a4bf54 100644 --- a/ext/standard/tests/file/file_get_contents_variation6.phpt +++ b/ext/standard/tests/file/file_get_contents_variation6.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : usage variation ***\n"; diff --git a/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt b/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt index cc8eb40f49..ad09ffb80f 100644 --- a/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt +++ b/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : variation ***\n"; @@ -35,14 +35,14 @@ $allDirs = array( "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir, "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir, "$absSubDir\\BADDIR", - + // relative paths $mainDir."\\".$subDir, $mainDir."\\\\".$subDir, $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, - "BADDIR", - + "BADDIR", + // unixifed path $unixifiedDir, ); diff --git a/ext/standard/tests/file/file_get_contents_variation7-win32.phpt b/ext/standard/tests/file/file_get_contents_variation7-win32.phpt index d350b4b037..2217789f09 100644 --- a/ext/standard/tests/file/file_get_contents_variation7-win32.phpt +++ b/ext/standard/tests/file/file_get_contents_variation7-win32.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : variation ***\n"; @@ -35,14 +35,14 @@ $allDirs = array( "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir, "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir, "$absSubDir\\BADDIR", - + // relative paths $mainDir."\\".$subDir, $mainDir."\\\\".$subDir, $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, - "BADDIR", - + "BADDIR", + // unixifed path $unixifiedDir, ); diff --git a/ext/standard/tests/file/file_get_contents_variation7.phpt b/ext/standard/tests/file/file_get_contents_variation7.phpt index 17c55b6135..b762e16165 100644 --- a/ext/standard/tests/file/file_get_contents_variation7.phpt +++ b/ext/standard/tests/file/file_get_contents_variation7.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : variation ***\n"; @@ -29,14 +29,14 @@ $allDirs = array( "$absSubDir/../../".$mainDir."/./".$subDir, "$absSubDir/..///".$subDir."//..//../".$subDir, "$absSubDir/BADDIR", - + // relative paths $mainDir."/".$subDir, $mainDir."//".$subDir, $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, - "BADDIR", - + "BADDIR", + ); $filename = 'FileGetContentsVar7.tmp'; diff --git a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt index bb62eb47fb..8fa50a7b02 100644 --- a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt +++ b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt @@ -13,12 +13,12 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : variation ***\n"; -/* An array of filenames */ +/* An array of filenames */ $names_arr = array( /* Invalid args */ "-1" => -1, @@ -30,8 +30,8 @@ $names_arr = array( "\\0" => "\0", "array()" => array(), - /* prefix with path separator of a non existing directory*/ - "/no/such/file/dir" => "/no/such/file/dir", + /* prefix with path separator of a non existing directory*/ + "/no/such/file/dir" => "/no/such/file/dir", "php/php"=> "php/php" ); diff --git a/ext/standard/tests/file/file_get_contents_variation8.phpt b/ext/standard/tests/file/file_get_contents_variation8.phpt index 5b325b0e98..7034efa503 100644 --- a/ext/standard/tests/file/file_get_contents_variation8.phpt +++ b/ext/standard/tests/file/file_get_contents_variation8.phpt @@ -13,13 +13,13 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : variation ***\n"; -/* An array of filenames */ +/* An array of filenames */ $names_arr = array( - /* Invalid args */ + /* Invalid args */ -1, TRUE, FALSE, @@ -30,7 +30,7 @@ $names_arr = array( array(), /* prefix with path separator of a non existing directory*/ - "/no/such/file/dir", + "/no/such/file/dir", "php/php" ); diff --git a/ext/standard/tests/file/file_get_contents_variation9.phpt b/ext/standard/tests/file/file_get_contents_variation9.phpt index 09d33f9f32..b49935a948 100644 --- a/ext/standard/tests/file/file_get_contents_variation9.phpt +++ b/ext/standard/tests/file/file_get_contents_variation9.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : variation ***\n"; diff --git a/ext/standard/tests/file/file_put_contents.phpt b/ext/standard/tests/file/file_put_contents.phpt index 4566c37567..1607ab1bde 100644 --- a/ext/standard/tests/file/file_put_contents.phpt +++ b/ext/standard/tests/file/file_put_contents.phpt @@ -21,7 +21,7 @@ var_dump(file_put_contents($file, "string", 0, $fp)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: file_put_contents(): supplied resource is not a valid stream resource in %s on line %d bool(false) bool(false) diff --git a/ext/standard/tests/file/file_put_contents_variation1.phpt b/ext/standard/tests/file/file_put_contents_variation1.phpt index a0d275ccc5..9091c34ded 100644 --- a/ext/standard/tests/file/file_put_contents_variation1.phpt +++ b/ext/standard/tests/file/file_put_contents_variation1.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_put_contents() : variation ***\n"; @@ -28,7 +28,7 @@ echo filesize($filename)."\n"; readfile($filename); echo "\n"; unlink($filename); - + ?> ===DONE=== diff --git a/ext/standard/tests/file/file_put_contents_variation2.phpt b/ext/standard/tests/file/file_put_contents_variation2.phpt index 753e287504..846517d43f 100644 --- a/ext/standard/tests/file/file_put_contents_variation2.phpt +++ b/ext/standard/tests/file/file_put_contents_variation2.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_put_contents() : usage variation ***\n"; diff --git a/ext/standard/tests/file/file_put_contents_variation3.phpt b/ext/standard/tests/file/file_put_contents_variation3.phpt index 4a8daad29f..537ced2d91 100644 --- a/ext/standard/tests/file/file_put_contents_variation3.phpt +++ b/ext/standard/tests/file/file_put_contents_variation3.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_put_contents() : usage variation ***\n"; @@ -106,10 +106,10 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + //non context resource 'file resource' => $fileRes, - + //valid stream context 'stream context' => $strContext, ); diff --git a/ext/standard/tests/file/file_put_contents_variation4.phpt b/ext/standard/tests/file/file_put_contents_variation4.phpt index 62d814c9fd..7c3650764d 100644 --- a/ext/standard/tests/file/file_put_contents_variation4.phpt +++ b/ext/standard/tests/file/file_put_contents_variation4.phpt @@ -7,13 +7,13 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ require_once('fopen_include_path.inc'); -$thisTestDir = basename(__FILE__, ".php") . ".dir"; +$thisTestDir = basename(__FILE__, ".php") . ".dir"; mkdir($thisTestDir); chdir($thisTestDir); diff --git a/ext/standard/tests/file/file_put_contents_variation5.phpt b/ext/standard/tests/file/file_put_contents_variation5.phpt index fe1961d16c..fed872f8a3 100644 --- a/ext/standard/tests/file/file_put_contents_variation5.phpt +++ b/ext/standard/tests/file/file_put_contents_variation5.phpt @@ -10,7 +10,7 @@ $thisTestDir = dirname(__FILE__) . '/' .basename(__FILE__, ".php") . ".directory mkdir($thisTestDir); chdir($thisTestDir); -$filename = basename(__FILE__, ".php") . ".tmp"; +$filename = basename(__FILE__, ".php") . ".tmp"; $scriptLocFile = dirname(__FILE__)."/".$filename; $newpath = "rubbish"; @@ -35,9 +35,9 @@ function runtest() { echo "Fail - this is PHP52 behaviour\n"; unlink($scriptLocFile); }else { - $line = file_get_contents($filename); + $line = file_get_contents($filename); echo "$line\n"; - unlink($filename); + unlink($filename); } } ?> diff --git a/ext/standard/tests/file/file_put_contents_variation6.phpt b/ext/standard/tests/file/file_put_contents_variation6.phpt index a0977faff8..475981b3ef 100644 --- a/ext/standard/tests/file/file_put_contents_variation6.phpt +++ b/ext/standard/tests/file/file_put_contents_variation6.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_put_contents() : variation ***\n"; @@ -41,10 +41,10 @@ function runtest() { // in the include path. In this case it doesn't so the file should be written in the current dir. file_put_contents($filename, "File in include path", FILE_USE_INCLUDE_PATH); - file_put_contents($filename, ". This was appended", FILE_USE_INCLUDE_PATH | FILE_APPEND); + file_put_contents($filename, ". This was appended", FILE_USE_INCLUDE_PATH | FILE_APPEND); $line = file_get_contents($filename); echo "$line\n"; - unlink($filename); + unlink($filename); } ?> diff --git a/ext/standard/tests/file/file_put_contents_variation7-win32.phpt b/ext/standard/tests/file/file_put_contents_variation7-win32.phpt index e1a94a2043..c42bf39a84 100644 --- a/ext/standard/tests/file/file_put_contents_variation7-win32.phpt +++ b/ext/standard/tests/file/file_put_contents_variation7-win32.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_put_contents() : usage variation ***\n"; @@ -39,14 +39,14 @@ $allDirs = array( "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir, "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir, "$absSubDir\\BADDIR", - + // relative paths $mainDir."\\".$subDir, $mainDir."\\\\".$subDir, $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, - "BADDIR", - + "BADDIR", + // unixifed path $unixifiedDir, ); @@ -73,7 +73,7 @@ for($i = 0; $i<count($allDirs); $i++) { else { echo "No data written\n"; } - + } chdir($old_dir_path); diff --git a/ext/standard/tests/file/file_put_contents_variation7.phpt b/ext/standard/tests/file/file_put_contents_variation7.phpt index b1b2face60..4f8f5232d5 100644 --- a/ext/standard/tests/file/file_put_contents_variation7.phpt +++ b/ext/standard/tests/file/file_put_contents_variation7.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_put_contents() : usage variation ***\n"; @@ -33,14 +33,14 @@ $allDirs = array( "$absSubDir/../../".$mainDir."/./".$subDir, "$absSubDir/..///".$subDir."//..//../".$subDir, "$absSubDir/BADDIR", - + // relative paths $mainDir."/".$subDir, $mainDir."//".$subDir, $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, - "BADDIR", - + "BADDIR", + ); $filename = 'FileGetContentsVar7.tmp'; @@ -65,7 +65,7 @@ for($i = 0; $i<count($allDirs); $i++) { else { echo "No data written\n"; } - + } chdir($old_dir_path); diff --git a/ext/standard/tests/file/file_put_contents_variation8-win32.phpt b/ext/standard/tests/file/file_put_contents_variation8-win32.phpt index 92fe7b3d6a..96951a4419 100644 --- a/ext/standard/tests/file/file_put_contents_variation8-win32.phpt +++ b/ext/standard/tests/file/file_put_contents_variation8-win32.phpt @@ -12,12 +12,12 @@ if(substr(PHP_OS, 0, 3) != "WIN") /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_put_contents() : usage variation ***\n"; -/* An array of filenames */ +/* An array of filenames */ $names_arr = array( "-1" => -1, "TRUE" => TRUE, @@ -28,8 +28,8 @@ $names_arr = array( "\\0" => "\0", "array()" => array(), - /* prefix with path separator of a non existing directory*/ - "/no/such/file/dir" => "/no/such/file/dir", + /* prefix with path separator of a non existing directory*/ + "/no/such/file/dir" => "/no/such/file/dir", "php/php"=> "php/php" ); @@ -42,7 +42,7 @@ foreach($names_arr as $key =>$value) { unlink($value); } else { echo "Failed to write data to: $key\n"; - } + } }; ?> diff --git a/ext/standard/tests/file/file_put_contents_variation9.phpt b/ext/standard/tests/file/file_put_contents_variation9.phpt index 79a42fe9b1..5ed3ba34b1 100644 --- a/ext/standard/tests/file/file_put_contents_variation9.phpt +++ b/ext/standard/tests/file/file_put_contents_variation9.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_put_contents() : usage variation ***\n"; @@ -34,7 +34,7 @@ run_test($softlink); //can only create a hardlink if the file exists. file_put_contents($filename,""); -link($filename, $hardlink); +link($filename, $hardlink); run_test($hardlink); unlink($chainlink); diff --git a/ext/standard/tests/file/file_variation.phpt b/ext/standard/tests/file/file_variation.phpt index 9629d37aa9..4eaffc330e 100644 --- a/ext/standard/tests/file/file_variation.phpt +++ b/ext/standard/tests/file/file_variation.phpt @@ -2,7 +2,7 @@ Test file() function : usage variations --FILE-- <?php -/* +/* * Prototype: array file ( string filename [,int use-include_path [,resource context]] ); * Description: Reads entire file into an array Returns the file in an array @@ -17,8 +17,8 @@ foreach( $data_array as $data ) { echo "--Iteration $count --\n"; $fh = fopen($file_path."/file_variation.tmp", "w"); fwrite($fh, $data); - var_dump( file($file_path."/file_variation.tmp", FILE_IGNORE_NEW_LINES) ); - var_dump( file($file_path."/file_variation.tmp", FILE_SKIP_EMPTY_LINES) ); + var_dump( file($file_path."/file_variation.tmp", FILE_IGNORE_NEW_LINES) ); + var_dump( file($file_path."/file_variation.tmp", FILE_SKIP_EMPTY_LINES) ); $count++; fclose($fh); } diff --git a/ext/standard/tests/file/file_variation2.phpt b/ext/standard/tests/file/file_variation2.phpt index ab37ea5c45..f1b22283fa 100644 --- a/ext/standard/tests/file/file_variation2.phpt +++ b/ext/standard/tests/file/file_variation2.phpt @@ -5,7 +5,7 @@ Test file() function : first parameter variation /* Prototype : array file(string filename [, int flags[, resource context]]) * Description: Read entire file into an array * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file() : usage variation ***\n"; diff --git a/ext/standard/tests/file/file_variation3.phpt b/ext/standard/tests/file/file_variation3.phpt index 250621ef73..395047567a 100644 --- a/ext/standard/tests/file/file_variation3.phpt +++ b/ext/standard/tests/file/file_variation3.phpt @@ -7,7 +7,7 @@ Test file() function : second parameter variation /* Prototype : array file(string filename [, int flags[, resource context]]) * Description: Read entire file into an array * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file() : usage variation ***\n"; diff --git a/ext/standard/tests/file/file_variation4.phpt b/ext/standard/tests/file/file_variation4.phpt index 9c92ae699f..c5c2342fcf 100644 --- a/ext/standard/tests/file/file_variation4.phpt +++ b/ext/standard/tests/file/file_variation4.phpt @@ -5,7 +5,7 @@ Test file() function : third parameter variation /* Prototype : array file(string filename [, int flags[, resource context]]) * Description: Read entire file into an array * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file() : usage variation ***\n"; @@ -107,7 +107,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // file stream resource 'file stream resource' => $file_stream_resource, ); diff --git a/ext/standard/tests/file/file_variation5.phpt b/ext/standard/tests/file/file_variation5.phpt index 1f15491118..b8badd0e42 100644 --- a/ext/standard/tests/file/file_variation5.phpt +++ b/ext/standard/tests/file/file_variation5.phpt @@ -25,7 +25,7 @@ var_dump(file("./$test_dirname/../$filename")); echo "\nfile() on a path containing .. with invalid directories\n"; var_dump(file("./$test_dirname/bad_dir/../../$filename")); - + echo "\nfile() on a linked file\n"; $linkname = "somelink"; var_dump(symlink($filepath, $linkname)); diff --git a/ext/standard/tests/file/file_variation8-win32.phpt b/ext/standard/tests/file/file_variation8-win32.phpt index ca3be36b56..1a189164f5 100644 --- a/ext/standard/tests/file/file_variation8-win32.phpt +++ b/ext/standard/tests/file/file_variation8-win32.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") /* Prototype : array file(string filename [, int flags[, resource context]]) * Description: Read entire file into an array * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file() : variation ***\n"; @@ -35,14 +35,14 @@ $allDirs = array( "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir, "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir, "$absSubDir\\BADDIR", - + // relative paths $mainDir."\\".$subDir, $mainDir."\\\\".$subDir, $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, - "BADDIR", - + "BADDIR", + // unixifed path $unixifiedDir, ); diff --git a/ext/standard/tests/file/file_variation8.phpt b/ext/standard/tests/file/file_variation8.phpt index be18fcb032..fd0d98f604 100644 --- a/ext/standard/tests/file/file_variation8.phpt +++ b/ext/standard/tests/file/file_variation8.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : array file(string filename [, int flags[, resource context]]) * Description: Read entire file into an array * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file() : variation ***\n"; @@ -29,14 +29,14 @@ $allDirs = array( "$absSubDir/../../".$mainDir."/./".$subDir, "$absSubDir/..///".$subDir."//..//../".$subDir, "$absSubDir/BADDIR", - + // relative paths $mainDir."/".$subDir, $mainDir."//".$subDir, $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, - "BADDIR", - + "BADDIR", + ); $filename = 'FileGetContentsVar7.tmp'; diff --git a/ext/standard/tests/file/file_variation9.phpt b/ext/standard/tests/file/file_variation9.phpt index 623fa56409..59e5cee8b5 100644 --- a/ext/standard/tests/file/file_variation9.phpt +++ b/ext/standard/tests/file/file_variation9.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : array file(string filename [, int flags[, resource context]]) * Description: Read entire file into an array * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file() : variation ***\n"; @@ -21,7 +21,7 @@ $contents = array( "File has\r\nmultiple crlfs\n\r\n" ); -@unlink($testfile); +@unlink($testfile); foreach ($contents as $content) { $h = fopen($testfile, "w"); fwrite($h, $content); diff --git a/ext/standard/tests/file/filegroup_basic.phpt b/ext/standard/tests/file/filegroup_basic.phpt index 36333b21ba..2c8216a0ad 100644 --- a/ext/standard/tests/file/filegroup_basic.phpt +++ b/ext/standard/tests/file/filegroup_basic.phpt @@ -12,7 +12,7 @@ if( substr(PHP_OS, 0, 3) == 'WIN') { * Description: Returns the group ID of the file, or FALSE in case of an error. */ -echo "*** Testing filegroup(): basic functionality ***\n"; +echo "*** Testing filegroup(): basic functionality ***\n"; echo "-- Testing with the file or directory created by owner --\n"; diff --git a/ext/standard/tests/file/filegroup_variation1.phpt b/ext/standard/tests/file/filegroup_variation1.phpt index ee76477ac8..4b4a9aa00e 100644 --- a/ext/standard/tests/file/filegroup_variation1.phpt +++ b/ext/standard/tests/file/filegroup_variation1.phpt @@ -13,7 +13,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { * Description: Returns the group ID of the file, or FALSE in case of an error. */ -/* Creating soft and hard links to a file and applying filegroup() on links */ +/* Creating soft and hard links to a file and applying filegroup() on links */ $file_path = dirname(__FILE__); fclose( fopen($file_path."/filegroup_variation1.tmp", "w") ); diff --git a/ext/standard/tests/file/filegroup_variation2.phpt b/ext/standard/tests/file/filegroup_variation2.phpt index afac40c9ab..966a9f43b7 100644 --- a/ext/standard/tests/file/filegroup_variation2.phpt +++ b/ext/standard/tests/file/filegroup_variation2.phpt @@ -23,12 +23,12 @@ $filenames = array( FALSE, NULL, $file_handle, - + /* scalars */ 1234, 0 ); - + /* loop through to test each element the above array */ foreach( $filenames as $filename ) { var_dump( filegroup($filename) ); diff --git a/ext/standard/tests/file/filegroup_variation3.phpt b/ext/standard/tests/file/filegroup_variation3.phpt index b275944f78..ebefeb7e3f 100644 --- a/ext/standard/tests/file/filegroup_variation3.phpt +++ b/ext/standard/tests/file/filegroup_variation3.phpt @@ -28,7 +28,7 @@ $files_arr = array( "/filegroup_variation3//filegroup_variation3.tmp", "//filegroup_variation3//filegroup_variation3.tmp", "/filegroup_variation3/*.tmp", - "filegroup_variation3/filegroup*.tmp", + "filegroup_variation3/filegroup*.tmp", /* Testing Binary safe */ "/filegroup_variation3/filegroup_variation3.tmp".chr(0), diff --git a/ext/standard/tests/file/fileinode_basic.phpt b/ext/standard/tests/file/fileinode_basic.phpt index 98e5cf0836..c7fc77e7d5 100644 --- a/ext/standard/tests/file/fileinode_basic.phpt +++ b/ext/standard/tests/file/fileinode_basic.phpt @@ -2,7 +2,7 @@ Test fileinode() function: Basic functionality --FILE-- <?php -/* +/* Prototype: int fileinode ( string $filename ); Description: Returns the inode number of the file, or FALSE in case of an error. */ diff --git a/ext/standard/tests/file/fileinode_error.phpt b/ext/standard/tests/file/fileinode_error.phpt index eb5d79e0c3..892121cc96 100644 --- a/ext/standard/tests/file/fileinode_error.phpt +++ b/ext/standard/tests/file/fileinode_error.phpt @@ -2,7 +2,7 @@ Test fileinode() function: Error conditions --FILE-- <?php -/* +/* Prototype: int fileinode ( string $filename ); Description: Returns the inode number of the file, or FALSE in case of an error. */ diff --git a/ext/standard/tests/file/fileinode_variation.phpt b/ext/standard/tests/file/fileinode_variation.phpt index 1fac953098..9504766d9d 100644 --- a/ext/standard/tests/file/fileinode_variation.phpt +++ b/ext/standard/tests/file/fileinode_variation.phpt @@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { ?> --FILE-- <?php -/* +/* Prototype: int fileinode ( string $filename ); Description: Returns the inode number of the file, or FALSE in case of an error. */ diff --git a/ext/standard/tests/file/fileinode_variation1.phpt b/ext/standard/tests/file/fileinode_variation1.phpt index d251cc3f85..4961db19a6 100644 --- a/ext/standard/tests/file/fileinode_variation1.phpt +++ b/ext/standard/tests/file/fileinode_variation1.phpt @@ -9,12 +9,12 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { } --FILE-- <?php -/* +/* Prototype: int fileinode ( string $filename ); Description: Returns the inode number of the file, or FALSE in case of an error. */ -/* Creating soft and hard links to a file and applying fileinode() on links */ +/* Creating soft and hard links to a file and applying fileinode() on links */ $file_path = dirname(__FILE__); fclose( fopen($file_path."/fileinode_variation1.tmp", "w") ); diff --git a/ext/standard/tests/file/fileinode_variation2.phpt b/ext/standard/tests/file/fileinode_variation2.phpt index e8e7af6a6e..447c189e04 100644 --- a/ext/standard/tests/file/fileinode_variation2.phpt +++ b/ext/standard/tests/file/fileinode_variation2.phpt @@ -4,7 +4,7 @@ Test fileinode() function: usage variations - invalid filenames Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php -/* +/* Prototype: int fileinode ( string $filename ); Description: Returns the inode number of the file, or FALSE in case of an error. */ @@ -24,12 +24,12 @@ $filenames = array( FALSE, NULL, $file_handle, - + /* scalars */ 1234, 0 ); - + /* loop through to test each element the above array */ foreach( $filenames as $filename ) { var_dump( fileinode($filename) ); diff --git a/ext/standard/tests/file/fileinode_variation3.phpt b/ext/standard/tests/file/fileinode_variation3.phpt index ca84864b59..2f51e8f595 100644 --- a/ext/standard/tests/file/fileinode_variation3.phpt +++ b/ext/standard/tests/file/fileinode_variation3.phpt @@ -4,7 +4,7 @@ Test fileinode() function: usage variations - diff. path notations Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php -/* +/* Prototype: int fileinode ( string $filename ); Description: Returns the inode number of the file, or FALSE in case of an error. */ @@ -29,7 +29,7 @@ $files_arr = array( "/fileinode_variation3//fileinode_variation3.tmp", "//fileinode_variation3//fileinode_variation3.tmp", "/fileinode_variation3/*.tmp", - "fileinode_variation3/fileinode*.tmp", + "fileinode_variation3/fileinode*.tmp", /* Testing Binary safe */ "/fileinode_variation3/fileinode_variation3.tmp".chr(0), diff --git a/ext/standard/tests/file/fileowner_basic.phpt b/ext/standard/tests/file/fileowner_basic.phpt index 5b5ff9a900..05e4c16ef8 100644 --- a/ext/standard/tests/file/fileowner_basic.phpt +++ b/ext/standard/tests/file/fileowner_basic.phpt @@ -7,7 +7,7 @@ Test fileowner() function: basic functionality * FALSE in case of an error. */ -echo "*** Testing fileowner(): basic functionality ***\n"; +echo "*** Testing fileowner(): basic functionality ***\n"; echo "-- Testing with the file or directory created by owner --\n"; var_dump( fileowner(__FILE__) ); diff --git a/ext/standard/tests/file/fileowner_variation1.phpt b/ext/standard/tests/file/fileowner_variation1.phpt index b70ac366d2..e40175d1bd 100644 --- a/ext/standard/tests/file/fileowner_variation1.phpt +++ b/ext/standard/tests/file/fileowner_variation1.phpt @@ -14,7 +14,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { * FALSE in case of an error. */ -/* Creating soft and hard links to a file and applying fileowner() on links */ +/* Creating soft and hard links to a file and applying fileowner() on links */ $file_path = dirname(__FILE__); fclose( fopen($file_path."/fileowner_variation1.tmp", "w") ); diff --git a/ext/standard/tests/file/fileowner_variation2.phpt b/ext/standard/tests/file/fileowner_variation2.phpt index feff767879..83eeb6d5c0 100644 --- a/ext/standard/tests/file/fileowner_variation2.phpt +++ b/ext/standard/tests/file/fileowner_variation2.phpt @@ -24,12 +24,12 @@ $filenames = array( FALSE, NULL, $file_handle, - + /* scalars */ 1234, 0 ); - + /* loop through to test each element the above array */ foreach( $filenames as $filename ) { var_dump( fileowner($filename) ); diff --git a/ext/standard/tests/file/fileowner_variation3.phpt b/ext/standard/tests/file/fileowner_variation3.phpt index 6f91c31d11..5768f528f1 100644 --- a/ext/standard/tests/file/fileowner_variation3.phpt +++ b/ext/standard/tests/file/fileowner_variation3.phpt @@ -29,7 +29,7 @@ $files_arr = array( "/fileowner_variation3//fileowner_variation3.tmp", "//fileowner_variation3//fileowner_variation3.tmp", "/fileowner_variation3/*.tmp", - "fileowner_variation3/fileowner*.tmp", + "fileowner_variation3/fileowner*.tmp", /* Testing Binary safe */ "/fileowner_variation3/fileowner_variation3.tmp".chr(0), diff --git a/ext/standard/tests/file/fileperms_variation1.phpt b/ext/standard/tests/file/fileperms_variation1.phpt index e90cf8784f..fdcedcac59 100644 --- a/ext/standard/tests/file/fileperms_variation1.phpt +++ b/ext/standard/tests/file/fileperms_variation1.phpt @@ -13,7 +13,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { * Description: Returns the group ID of the file, or FALSE in case of an error. */ -/* Creating soft and hard links to a file and applying fileperms() on links */ +/* Creating soft and hard links to a file and applying fileperms() on links */ $file_path = dirname(__FILE__); fclose( fopen($file_path."/fileperms_variation1.tmp", "w") ); diff --git a/ext/standard/tests/file/fileperms_variation2.phpt b/ext/standard/tests/file/fileperms_variation2.phpt index 47c0c6593a..f9b190bcf8 100644 --- a/ext/standard/tests/file/fileperms_variation2.phpt +++ b/ext/standard/tests/file/fileperms_variation2.phpt @@ -23,12 +23,12 @@ $filenames = array( FALSE, NULL, $file_handle, - + /* scalars */ 1234, 0 ); - + /* loop through to test each element the above array */ foreach( $filenames as $filename ) { var_dump( fileperms($filename) ); diff --git a/ext/standard/tests/file/fileperms_variation3.phpt b/ext/standard/tests/file/fileperms_variation3.phpt index 575fe11a2f..6ae97d1601 100644 --- a/ext/standard/tests/file/fileperms_variation3.phpt +++ b/ext/standard/tests/file/fileperms_variation3.phpt @@ -28,7 +28,7 @@ $files_arr = array( "/fileperms_variation3//fileperms_variation3.tmp", "//fileperms_variation3//fileperms_variation3.tmp", "/fileperms_variation3/*.tmp", - "fileperms_variation3/fileperms*.tmp", + "fileperms_variation3/fileperms*.tmp", /* Testing Binary safe */ "/fileperms_variation3/fileperms_variation3.tmp".chr(0), diff --git a/ext/standard/tests/file/filesize_basic.phpt b/ext/standard/tests/file/filesize_basic.phpt index 58041b95c3..63d1f45c2f 100644 --- a/ext/standard/tests/file/filesize_basic.phpt +++ b/ext/standard/tests/file/filesize_basic.phpt @@ -2,14 +2,14 @@ Test filesize() function: basic functionaity --FILE-- <?php -/* +/* * Prototype: int filesize ( string $filename ); * Description: Returns the size of the file in bytes, or FALSE * (and generates an error of level E_WARNING) in case of an error. */ -echo "*** Testing size of files and directories with filesize() ***\n"; +echo "*** Testing size of files and directories with filesize() ***\n"; $file_path = dirname(__FILE__); @@ -30,7 +30,7 @@ $file_path = dirname(__FILE__); $file_name = $file_path."/filesize_basic.tmp"; unlink($file_name); ?> ---EXPECTF-- +--EXPECTF-- *** Testing size of files and directories with filesize() *** int(%d) int(%d) diff --git a/ext/standard/tests/file/filesize_error.phpt b/ext/standard/tests/file/filesize_error.phpt index 6d8cfa8693..3dda0c9250 100644 --- a/ext/standard/tests/file/filesize_error.phpt +++ b/ext/standard/tests/file/filesize_error.phpt @@ -2,7 +2,7 @@ Test filesize() function: error conditions --FILE-- <?php -/* +/* * Prototype : int filesize ( string $filename ); * Description : Returns the size of the file in bytes, or FALSE * (and generates an error of level E_WARNING) in case of an error. @@ -23,7 +23,7 @@ echo "\n"; echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECTF-- *** Testing filesize(): error conditions *** Warning: filesize(): stat failed for /no/such/file in %s on line %d bool(false) diff --git a/ext/standard/tests/file/filesize_variation1-win32-mb.phpt b/ext/standard/tests/file/filesize_variation1-win32-mb.phpt index d4ec8e571e..07fa39bd9e 100644 --- a/ext/standard/tests/file/filesize_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/filesize_variation1-win32-mb.phpt @@ -7,7 +7,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { } --FILE-- <?php -/* +/* Prototype : int filesize ( string $filename ); Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. @@ -16,7 +16,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { $file_path = dirname(__FILE__); require($file_path."/file.inc"); -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; echo "*** Checking filesize() with different size of files ***\n"; for($size = 1; $size <10000; $size = $size+1000) diff --git a/ext/standard/tests/file/filesize_variation1-win32.phpt b/ext/standard/tests/file/filesize_variation1-win32.phpt index 3c2841afe0..07fccac11e 100644 --- a/ext/standard/tests/file/filesize_variation1-win32.phpt +++ b/ext/standard/tests/file/filesize_variation1-win32.phpt @@ -7,7 +7,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { } --FILE-- <?php -/* +/* Prototype : int filesize ( string $filename ); Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. @@ -16,7 +16,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { $file_path = dirname(__FILE__); require($file_path."/file.inc"); -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; echo "*** Checking filesize() with different size of files ***\n"; for($size = 1; $size <10000; $size = $size+1000) diff --git a/ext/standard/tests/file/filesize_variation1.phpt b/ext/standard/tests/file/filesize_variation1.phpt index 0a490cd7e6..ef9ef34b5e 100644 --- a/ext/standard/tests/file/filesize_variation1.phpt +++ b/ext/standard/tests/file/filesize_variation1.phpt @@ -7,7 +7,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { } --FILE-- <?php -/* +/* Prototype : int filesize ( string $filename ); Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. @@ -16,7 +16,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { $file_path = dirname(__FILE__); require($file_path."/file.inc"); -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; echo "*** Checking filesize() with different size of files ***\n"; for($size = 1; $size <10000; $size = $size+1000) diff --git a/ext/standard/tests/file/filesize_variation2-win32.phpt b/ext/standard/tests/file/filesize_variation2-win32.phpt index 7322b78aae..3b0d46a95b 100644 --- a/ext/standard/tests/file/filesize_variation2-win32.phpt +++ b/ext/standard/tests/file/filesize_variation2-win32.phpt @@ -7,7 +7,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { } --FILE-- <?php -/* +/* Prototype : int filesize ( string $filename ); Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. @@ -16,7 +16,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { $file_path = dirname(__FILE__); require($file_path."/file.inc"); -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; echo "\n*** Testing size of a dir, sub-dir and file with filesize() ***\n"; echo "-- Creating a base dir, and checking its size --\n"; @@ -24,7 +24,7 @@ mkdir( $file_path."/filesize_variation2"); var_dump( filesize( $file_path."/filesize_variation2")); clearstatcache(); -echo "-- Creating a file inside base dir, and checking dir & file size --\n"; +echo "-- Creating a file inside base dir, and checking dir & file size --\n"; create_files($file_path."/filesize_variation2", 1, "numeric", 0755, 1, "w", "filesize_variation", 2); var_dump( filesize( $file_path."/filesize_variation2")); clearstatcache(); diff --git a/ext/standard/tests/file/filesize_variation2.phpt b/ext/standard/tests/file/filesize_variation2.phpt index 8a7594ee79..d42a276f99 100644 --- a/ext/standard/tests/file/filesize_variation2.phpt +++ b/ext/standard/tests/file/filesize_variation2.phpt @@ -7,7 +7,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { } --FILE-- <?php -/* +/* Prototype : int filesize ( string $filename ); Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. @@ -16,7 +16,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { $file_path = dirname(__FILE__); require($file_path."/file.inc"); -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; echo "\n*** Testing size of a dir, sub-dir and file with filesize() ***\n"; echo "-- Creating a base dir, and checking its size --\n"; @@ -24,7 +24,7 @@ mkdir( $file_path."/filesize_variation2"); var_dump( filesize( $file_path."/filesize_variation2")); clearstatcache(); -echo "-- Creating a file inside base dir, and checking dir & file size --\n"; +echo "-- Creating a file inside base dir, and checking dir & file size --\n"; create_files($file_path."/filesize_variation2", 1, "numeric", 0755, 1, "w", "filesize_variation"); var_dump( filesize( $file_path."/filesize_variation2")); clearstatcache(); diff --git a/ext/standard/tests/file/filesize_variation3-win32.phpt b/ext/standard/tests/file/filesize_variation3-win32.phpt index 94ba6f478a..8e7a0a1289 100644 --- a/ext/standard/tests/file/filesize_variation3-win32.phpt +++ b/ext/standard/tests/file/filesize_variation3-win32.phpt @@ -7,7 +7,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { } --FILE-- <?php -/* +/* Prototype : int filesize ( string $filename ); Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. @@ -15,7 +15,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { $file_path = dirname(__FILE__); -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; $filename = $file_path."/filesize_variation3.tmp"; $file_handle = fopen($filename, "w"); fwrite($file_handle, str_repeat("Hello,World ", 1000) ); // create file of size 12000 bytes diff --git a/ext/standard/tests/file/filesize_variation3.phpt b/ext/standard/tests/file/filesize_variation3.phpt index 67d46998d2..f70b84e619 100644 --- a/ext/standard/tests/file/filesize_variation3.phpt +++ b/ext/standard/tests/file/filesize_variation3.phpt @@ -7,7 +7,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { } --FILE-- <?php -/* +/* Prototype : int filesize ( string $filename ); Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. @@ -15,7 +15,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { $file_path = dirname(__FILE__); -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; $filename = $file_path."/filesize_variation3.tmp"; $file_handle = fopen($filename, "w"); fwrite($file_handle, str_repeat("Hello,World ", 1000) ); // create file of size 12000 bytes diff --git a/ext/standard/tests/file/filesize_variation4-win32.phpt b/ext/standard/tests/file/filesize_variation4-win32.phpt index 5b6aec9fe9..0893b81f2f 100644 --- a/ext/standard/tests/file/filesize_variation4-win32.phpt +++ b/ext/standard/tests/file/filesize_variation4-win32.phpt @@ -7,7 +7,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { } --FILE-- <?php -/* +/* Prototype : int filesize ( string $filename ); Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. @@ -16,7 +16,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { $file_path = dirname(__FILE__); require($file_path."/file.inc"); -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; echo "\n*** Testing filesize() with data written using different file modes and by creating holes in file ***\n"; $filename = $file_path."/filesize_variation4.tmp"; diff --git a/ext/standard/tests/file/filesize_variation4.phpt b/ext/standard/tests/file/filesize_variation4.phpt index ffea82c234..59f8df9b77 100644 --- a/ext/standard/tests/file/filesize_variation4.phpt +++ b/ext/standard/tests/file/filesize_variation4.phpt @@ -7,7 +7,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { } --FILE-- <?php -/* +/* Prototype : int filesize ( string $filename ); Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. @@ -17,7 +17,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { $file_path = dirname(__FILE__); -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; echo "\n*** Testing filesize() with data written using different file modes and by creating holes in file ***\n"; $filename = $file_path."/filesize_variation4.tmp"; diff --git a/ext/standard/tests/file/filesize_variation5.phpt b/ext/standard/tests/file/filesize_variation5.phpt index 638f8ba8ed..05c18a12ee 100644 --- a/ext/standard/tests/file/filesize_variation5.phpt +++ b/ext/standard/tests/file/filesize_variation5.phpt @@ -4,13 +4,13 @@ Test filesize() function: usage variations - size of files Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php -/* +/* * Prototype : int filesize ( string $filename ); * Description : Returns the size of the file in bytes, or FALSE * (and generates an error of level E_WARNING) in case of an error. */ -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; /* null, false, "", " " */ var_dump( filesize(NULL) ); @@ -20,7 +20,7 @@ var_dump( filesize(' ') ); var_dump( filesize('|') ); echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECTF-- *** Testing filesize(): usage variations *** bool(false) bool(false) diff --git a/ext/standard/tests/file/filestat.phpt b/ext/standard/tests/file/filestat.phpt index d02f9f2a10..f6031219c7 100644 --- a/ext/standard/tests/file/filestat.phpt +++ b/ext/standard/tests/file/filestat.phpt @@ -29,7 +29,7 @@ var_dump(filectime("/no/such/file/or/dir")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(%d) int(%d) int(%d) diff --git a/ext/standard/tests/file/filetype_variation2.phpt b/ext/standard/tests/file/filetype_variation2.phpt index b6a2961843..400a74dc4f 100644 --- a/ext/standard/tests/file/filetype_variation2.phpt +++ b/ext/standard/tests/file/filetype_variation2.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { } if (!file_exists("/dev/null")) { die('skip /dev/null not available'); -} +} ?> --FILE-- <?php diff --git a/ext/standard/tests/file/flock.phpt b/ext/standard/tests/file/flock.phpt index ab08de5256..2330270113 100644 --- a/ext/standard/tests/file/flock.phpt +++ b/ext/standard/tests/file/flock.phpt @@ -40,7 +40,7 @@ echo "Done\n"; $file = dirname(__FILE__)."/flock.dat"; unlink($file); ?> ---EXPECTF-- +--EXPECTF-- Warning: flock() expects at least 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/file/flock_basic.phpt b/ext/standard/tests/file/flock_basic.phpt index bb27cb439f..154b41e4cd 100644 --- a/ext/standard/tests/file/flock_basic.phpt +++ b/ext/standard/tests/file/flock_basic.phpt @@ -2,13 +2,13 @@ Test flock() function: Basic functionality --FILE-- <?php -/* +/* Prototype: bool flock(resource $handle, int $operation [, int &$wouldblock]); Description: PHP supports a portable way of locking complete files in an advisory way */ -echo "*** Testing flock() fun with file and dir ***\n"; +echo "*** Testing flock() fun with file and dir ***\n"; $file_path = dirname(__FILE__); $file_handle = fopen("$file_path/lock.tmp", "w"); @@ -30,7 +30,7 @@ rmdir("$file_path/dir"); echo "\n*** Done ***\n"; ?> ---EXPECT-- +--EXPECT-- *** Testing flock() fun with file and dir *** bool(true) bool(true) diff --git a/ext/standard/tests/file/flock_error.phpt b/ext/standard/tests/file/flock_error.phpt index 216e70c246..952a4d9105 100644 --- a/ext/standard/tests/file/flock_error.phpt +++ b/ext/standard/tests/file/flock_error.phpt @@ -2,7 +2,7 @@ Test flock() function: Error conditions --FILE-- <?php -/* +/* Prototype: bool flock(resource $handle, int $operation [, int &$wouldblock]); Description: PHP supports a portable way of locking complete files in an advisory way @@ -55,7 +55,7 @@ echo "\n*** Done ***\n"; $file = dirname(__FILE__)."/flock.tmp"; unlink($file); ?> ---EXPECTF-- +--EXPECTF-- *** Testing error conditions *** --- Iteration 0 --- diff --git a/ext/standard/tests/file/flock_variation.phpt b/ext/standard/tests/file/flock_variation.phpt index 02cb0ff282..dfb442086e 100644 --- a/ext/standard/tests/file/flock_variation.phpt +++ b/ext/standard/tests/file/flock_variation.phpt @@ -2,7 +2,7 @@ Test flock() function: Variations --FILE-- <?php -/* +/* Prototype: bool flock(resource $handle, int $operation [, int &$wouldblock]); Description: PHP supports a portable way of locking complete files in an advisory way @@ -21,7 +21,7 @@ $operations = array( LOCK_EX|LOCK_NB, LOCK_SH|LOCK_EX, LOCK_UN, - 1, + 1, 2, 2.234, TRUE @@ -64,7 +64,7 @@ fclose($fp); echo "\n*** Done ***\n"; ?> ---EXPECT-- +--EXPECT-- *** Testing flock() fun with the various operation and wouldblock values *** --- Outer iteration 0 --- diff --git a/ext/standard/tests/file/fnmatch_variation.phpt b/ext/standard/tests/file/fnmatch_variation.phpt index 6d28528c1c..cbc405eaea 100644 --- a/ext/standard/tests/file/fnmatch_variation.phpt +++ b/ext/standard/tests/file/fnmatch_variation.phpt @@ -43,7 +43,7 @@ $pattern_arr = array( 17 => "?match?", 18 => "match.tmp", 19 => "/match.tmp", -20 => "/match.tmp/", +20 => "/match.tmp/", 21 => 'match.tmp', 22 => 'match.tmp\0', 23 => "match.tmp\0", diff --git a/ext/standard/tests/file/fopen_variation10-win32.phpt b/ext/standard/tests/file/fopen_variation10-win32.phpt index 5f38cbba65..1d533a0b87 100644 --- a/ext/standard/tests/file/fopen_variation10-win32.phpt +++ b/ext/standard/tests/file/fopen_variation10-win32.phpt @@ -17,7 +17,7 @@ if (!is_writable('c:\\fopen_variation10.tmp')) { /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fopen() : variation ***\n"; @@ -30,16 +30,16 @@ mkdir('c:\\'.$rootdir); $unixifiedDir = '/'.substr(str_replace('\\','/',$testdir),3); -$paths = array('c:\\', - 'c:', - 'c', - '\\', - '/', +$paths = array('c:\\', + 'c:', + 'c', + '\\', + '/', 'c:'.$rootdir, - 'c:adir', - 'c:\\/', + 'c:adir', + 'c:\\/', 'c:\\'.$rootdir.'\\/', - 'c:\\'.$rootdir.'\\', + 'c:\\'.$rootdir.'\\', 'c:\\'.$rootdir.'/', $unixifiedDir, '/sortout'); diff --git a/ext/standard/tests/file/fopen_variation11-win32.phpt b/ext/standard/tests/file/fopen_variation11-win32.phpt index 85265063d1..b21b422166 100644 --- a/ext/standard/tests/file/fopen_variation11-win32.phpt +++ b/ext/standard/tests/file/fopen_variation11-win32.phpt @@ -16,7 +16,7 @@ if (!is_writable('c:\\fopen_variation10.tmp')) { /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fopen() : variation ***\n"; @@ -29,16 +29,16 @@ mkdir('c:\\'.$rootdir); $unixifiedDir = '/'.substr(str_replace('\\','/',$testdir),3); -$paths = array('c:\\', - 'c:', - 'c', - '\\', - '/', +$paths = array('c:\\', + 'c:', + 'c', + '\\', + '/', 'c:'.$rootdir, - 'c:adir', - 'c:\\/', + 'c:adir', + 'c:\\/', 'c:\\'.$rootdir.'\\/', - 'c:\\'.$rootdir.'\\', + 'c:\\'.$rootdir.'\\', 'c:\\'.$rootdir.'/', $unixifiedDir, '/sortout'); diff --git a/ext/standard/tests/file/fopen_variation12.phpt b/ext/standard/tests/file/fopen_variation12.phpt index c207ec1836..881fa77430 100644 --- a/ext/standard/tests/file/fopen_variation12.phpt +++ b/ext/standard/tests/file/fopen_variation12.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ set_include_path("rubbish"); @@ -16,12 +16,12 @@ restore_include_path(); function testme() { - $tmpfile = basename(__FILE__, ".php") . ".tmp"; + $tmpfile = basename(__FILE__, ".php") . ".tmp"; $h = fopen($tmpfile, "w", true); fwrite($h, "This is the test file"); fclose($h); - - + + $h = @fopen($tmpfile, "r"); if ($h === false) { echo "Not created in working dir\n"; @@ -31,9 +31,9 @@ function testme() { fclose($h); unlink($tmpfile); } - - $scriptDirFile = dirname(__FILE__).'/'.$tmpfile; + + $scriptDirFile = dirname(__FILE__).'/'.$tmpfile; $h = @fopen($scriptDirFile, "r"); if ($h === false) { echo "Not created in script dir\n"; @@ -41,7 +41,7 @@ function testme() { else { echo "created in script dir\n"; fclose($h); - unlink($scriptDirFile); + unlink($scriptDirFile); } } ?> diff --git a/ext/standard/tests/file/fopen_variation13.phpt b/ext/standard/tests/file/fopen_variation13.phpt index d540d70006..94dea21250 100644 --- a/ext/standard/tests/file/fopen_variation13.phpt +++ b/ext/standard/tests/file/fopen_variation13.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ require_once('fopen_include_path.inc'); @@ -28,13 +28,13 @@ function runtest() { $tempDir = 'fopen_variation13.dir.tmp'; $tmpfile = 'fopen_variation13.tmp'; $absFile = getcwd().'/'.$tempDir.'/'.$tmpfile; - + mkdir($tempDir); $h = fopen($absFile, "w", true); fwrite($h, "This is the test file"); fclose($h); - - + + $h = fopen($absFile, "r"); if ($h === false) { echo "Not created absolute location\n"; @@ -45,7 +45,7 @@ function runtest() { } unlink($absFile); rmdir($tempDir); - + } ?> ===DONE=== diff --git a/ext/standard/tests/file/fopen_variation14-win32.phpt b/ext/standard/tests/file/fopen_variation14-win32.phpt index 554d8c6ded..73f00a4596 100644 --- a/ext/standard/tests/file/fopen_variation14-win32.phpt +++ b/ext/standard/tests/file/fopen_variation14-win32.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fopen() : variation ***\n"; @@ -53,15 +53,15 @@ function runtest($fileURIs) { $iteration = 0; foreach($fileURIs as $fileURI) { echo "--- READ: $fileURI ---\n"; - + $readData = "read:$iteration"; $writeData = "write:$iteration"; - + // create the file and test read $h = fopen($absFile, 'w'); fwrite($h, $readData); fclose($h); - + $h = fopen($fileURI, 'r'); if ($h !== false) { if (fread($h, 4096) != $readData) { @@ -73,14 +73,14 @@ function runtest($fileURIs) { fclose($h); } unlink($absFile); - - echo "--- WRITE: $fileURI ---\n"; + + echo "--- WRITE: $fileURI ---\n"; // create the file to test write $h = fopen($fileURI, 'w'); if ($h !== false) { fwrite($h, $writeData); fclose($h); - + $h = fopen($absFile, 'r'); if ($h !== false) { if (fread($h, 4096) != $writeData) { diff --git a/ext/standard/tests/file/fopen_variation14.phpt b/ext/standard/tests/file/fopen_variation14.phpt index aa4e05b892..465ddbcc86 100644 --- a/ext/standard/tests/file/fopen_variation14.phpt +++ b/ext/standard/tests/file/fopen_variation14.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fopen() : variation ***\n"; @@ -45,15 +45,15 @@ function runtest($fileURIs) { $iteration = 0; foreach($fileURIs as $fileURI) { echo "--- READ: $fileURI ---\n"; - + $readData = "read:$iteration"; $writeData = "write:$iteration"; - + // create the file and test read $h = fopen($absFile, 'w'); fwrite($h, $readData); fclose($h); - + $h = fopen($fileURI, 'r'); if ($h !== false) { if (fread($h, 4096) != $readData) { @@ -65,14 +65,14 @@ function runtest($fileURIs) { fclose($h); } unlink($absFile); - - echo "--- WRITE: $fileURI ---\n"; + + echo "--- WRITE: $fileURI ---\n"; // create the file to test write $h = fopen($fileURI, 'w'); if ($h !== false) { fwrite($h, $writeData); fclose($h); - + $h = fopen($absFile, 'r'); if ($h !== false) { if (fread($h, 4096) != $writeData) { diff --git a/ext/standard/tests/file/fopen_variation15-win32.phpt b/ext/standard/tests/file/fopen_variation15-win32.phpt index 8599306eda..88a450b735 100644 --- a/ext/standard/tests/file/fopen_variation15-win32.phpt +++ b/ext/standard/tests/file/fopen_variation15-win32.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fopen() : variation ***\n"; @@ -57,15 +57,15 @@ function runtest($fileURIs) { $iteration = 0; foreach($fileURIs as $fileURI) { echo "--- READ: $fileURI ---\n"; - + $readData = "read:$iteration"; $writeData = "write:$iteration"; - + // create the file and test read $h = fopen($absFile, 'w'); fwrite($h, $readData); fclose($h); - + $h = fopen($fileURI, 'r', true); if ($h !== false) { if (fread($h, 4096) != $readData) { @@ -77,14 +77,14 @@ function runtest($fileURIs) { fclose($h); } unlink($absFile); - - echo "--- WRITE: $fileURI ---\n"; + + echo "--- WRITE: $fileURI ---\n"; // create the file to test write $h = fopen($fileURI, 'w', true); if ($h !== false) { fwrite($h, $writeData); fclose($h); - + $h = fopen($absFile, 'r'); if ($h !== false) { if (fread($h, 4096) != $writeData) { diff --git a/ext/standard/tests/file/fopen_variation15.phpt b/ext/standard/tests/file/fopen_variation15.phpt index 24b01fbe8c..58184edb36 100644 --- a/ext/standard/tests/file/fopen_variation15.phpt +++ b/ext/standard/tests/file/fopen_variation15.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fopen() : variation ***\n"; @@ -49,15 +49,15 @@ function runtest($fileURIs) { $iteration = 0; foreach($fileURIs as $fileURI) { echo "--- READ: $fileURI ---\n"; - + $readData = "read:$iteration"; $writeData = "write:$iteration"; - + // create the file and test read $h = fopen($absFile, 'w'); fwrite($h, $readData); fclose($h); - + $h = fopen($fileURI, 'r', true); if ($h !== false) { if (fread($h, 4096) != $readData) { @@ -69,14 +69,14 @@ function runtest($fileURIs) { fclose($h); } unlink($absFile); - - echo "--- WRITE: $fileURI ---\n"; + + echo "--- WRITE: $fileURI ---\n"; // create the file to test write $h = fopen($fileURI, 'w', true); if ($h !== false) { fwrite($h, $writeData); fclose($h); - + $h = fopen($absFile, 'r'); if ($h !== false) { if (fread($h, 4096) != $writeData) { diff --git a/ext/standard/tests/file/fopen_variation16.phpt b/ext/standard/tests/file/fopen_variation16.phpt index 8b793f7858..82b259057a 100644 --- a/ext/standard/tests/file/fopen_variation16.phpt +++ b/ext/standard/tests/file/fopen_variation16.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ require_once('fopen_include_path.inc'); @@ -31,18 +31,18 @@ rmdir($thisTestDir); function runtest() { global $dir1; - + $extraDir = "extraDir16"; mkdir($dir1.'/'.$extraDir); mkdir($extraDir); - + $tmpfile = $extraDir.'/fopen_variation16.tmp'; $h = fopen($tmpfile, "w+", true); fwrite($h, "This is the test file"); fclose($h); - + $h = @fopen($dir1.'/'.$tmpfile, "r"); if ($h === false) { echo "Not created in dir1\n"; @@ -60,10 +60,10 @@ function runtest() { echo "found file - not in dir1\n"; fclose($h); } - - unlink($tmpfile); - rmdir($dir1.'/'.$extraDir); - rmdir($extraDir); + + unlink($tmpfile); + rmdir($dir1.'/'.$extraDir); + rmdir($extraDir); } ?> ===DONE=== diff --git a/ext/standard/tests/file/fopen_variation17.phpt b/ext/standard/tests/file/fopen_variation17.phpt index 461807d26f..b034523609 100644 --- a/ext/standard/tests/file/fopen_variation17.phpt +++ b/ext/standard/tests/file/fopen_variation17.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() function : variation: use include path create and read a file (relative) +Test fopen() function : variation: use include path create and read a file (relative) --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ require_once('fopen_include_path.inc'); @@ -31,17 +31,17 @@ rmdir($thisTestDir); function runtest() { global $dir1; - + $extraDir = "extraDir17"; mkdir($dir1.'/'.$extraDir); mkdir($extraDir); - + $tmpfile = $extraDir . '/' . basename(__FILE__, ".php") . ".tmp"; $h = fopen($tmpfile, "w+", true); fwrite($h, "This is the test file"); fclose($h); - + $h = @fopen($dir1.'/'.$tmpfile, "r"); if ($h === false) { echo "Not created in dir1\n"; @@ -59,10 +59,10 @@ function runtest() { echo "found file for reading\n"; fclose($h); } - - unlink($tmpfile); - rmdir($dir1.'/'.$extraDir); - rmdir($extraDir); + + unlink($tmpfile); + rmdir($dir1.'/'.$extraDir); + rmdir($extraDir); } ?> ===DONE=== diff --git a/ext/standard/tests/file/fopen_variation19.phpt b/ext/standard/tests/file/fopen_variation19.phpt index 031ba45734..ad1bfb133c 100644 --- a/ext/standard/tests/file/fopen_variation19.phpt +++ b/ext/standard/tests/file/fopen_variation19.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ $tmpDir = 'fopenVar19.Dir'; diff --git a/ext/standard/tests/file/fopen_variation3.phpt b/ext/standard/tests/file/fopen_variation3.phpt index b4301743d4..6837c25ce2 100644 --- a/ext/standard/tests/file/fopen_variation3.phpt +++ b/ext/standard/tests/file/fopen_variation3.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fopen() : usage variation ***\n"; diff --git a/ext/standard/tests/file/fopen_variation4.phpt b/ext/standard/tests/file/fopen_variation4.phpt index 7a92a0a29f..a2578a700d 100644 --- a/ext/standard/tests/file/fopen_variation4.phpt +++ b/ext/standard/tests/file/fopen_variation4.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fopen() : usage variation ***\n"; @@ -103,7 +103,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + //file resource 'file resource' => $fileresource ); diff --git a/ext/standard/tests/file/fopen_variation5.phpt b/ext/standard/tests/file/fopen_variation5.phpt index ecfac73007..7baac85e01 100644 --- a/ext/standard/tests/file/fopen_variation5.phpt +++ b/ext/standard/tests/file/fopen_variation5.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ @@ -40,7 +40,7 @@ chdir($workingDir); //define the files to go into these directories, create one in dir2 echo "\n--- testing include path ---\n"; -set_include_path($newIncludePath); +set_include_path($newIncludePath); $modes = array("r", "r+", "rt"); foreach($modes as $mode) { test_fopen($mode); @@ -60,7 +60,7 @@ rmdir($thisTestDir); function test_fopen($mode) { global $scriptFile, $secondFile, $firstFile, $filename; - + // create a file in the middle directory $h = fopen($secondFile, "w"); fwrite($h, "in dir2"); @@ -77,44 +77,44 @@ function test_fopen($mode) { $h = fopen($firstFile, "w"); fwrite($h, "in dir1"); fclose($h); - + //should now read dir1 file $h = fopen($filename, $mode, true); fpassthru($h); fclose($h); echo "\n"; - + // create a file in working directory $h = fopen($filename, "w"); fwrite($h, "in working dir"); fclose($h); - + //should still read dir1 file $h = fopen($filename, $mode, true); fpassthru($h); fclose($h); echo "\n"; - + unlink($firstFile); unlink($secondFile); - + //should read the file in working dir $h = fopen($filename, $mode, true); fpassthru($h); fclose($h); echo "\n"; - + // create a file in the script directory $h = fopen($scriptFile, "w"); fwrite($h, "in script dir"); fclose($h); - + //should read the file in script dir $h = fopen($filename, $mode, true); fpassthru($h); fclose($h); echo "\n"; - + //cleanup unlink($filename); unlink($scriptFile); diff --git a/ext/standard/tests/file/fopen_variation6.phpt b/ext/standard/tests/file/fopen_variation6.phpt index 258fa7f073..6c354c636d 100644 --- a/ext/standard/tests/file/fopen_variation6.phpt +++ b/ext/standard/tests/file/fopen_variation6.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fopen() : variation ***\n"; diff --git a/ext/standard/tests/file/fopen_variation7.phpt b/ext/standard/tests/file/fopen_variation7.phpt index f5c1048c07..9a4335c410 100644 --- a/ext/standard/tests/file/fopen_variation7.phpt +++ b/ext/standard/tests/file/fopen_variation7.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ require_once('fopen_include_path.inc'); @@ -34,8 +34,8 @@ function runtest() { $h = fopen($tmpfile, "w", true); fwrite($h, "This is the test file"); fclose($h); - - + + $h = @fopen($tmpfile, "r"); if ($h === false) { echo "Not created in working dir\n"; @@ -45,7 +45,7 @@ function runtest() { fclose($h); unlink($tmpfile); } - + $h = @fopen($dir1.'/'.$tmpfile, "r"); if ($h === false) { echo "Not created in dir1\n"; @@ -53,7 +53,7 @@ function runtest() { else { echo "created in dir1\n"; fclose($h); - unlink($dir1.'/'.$tmpfile); + unlink($dir1.'/'.$tmpfile); } } ?> diff --git a/ext/standard/tests/file/fopen_variation8.phpt b/ext/standard/tests/file/fopen_variation8.phpt index 02637c2106..692723dd9b 100644 --- a/ext/standard/tests/file/fopen_variation8.phpt +++ b/ext/standard/tests/file/fopen_variation8.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ @@ -40,7 +40,7 @@ chdir($workingDir); //define the files to go into these directories, create one in dir2 echo "\n--- testing include path ---\n"; -set_include_path($newIncludePath); +set_include_path($newIncludePath); $modes = array("r", "r+", "rt"); foreach($modes as $mode) { test_fopen($mode); @@ -59,7 +59,7 @@ rmdir($thisTestDir); function test_fopen($mode) { global $scriptFile, $secondFile, $firstFile, $filename; - + // create a file in the middle directory $h = fopen($secondFile, "w"); fwrite($h, "in dir2"); @@ -76,44 +76,44 @@ function test_fopen($mode) { $h = fopen($firstFile, "w"); fwrite($h, "in dir1"); fclose($h); - + //should now read dir1 file $h = fopen($filename, $mode, true); fpassthru($h); fclose($h); echo "\n"; - + // create a file in working directory $h = fopen($filename, "w"); fwrite($h, "in working dir"); fclose($h); - + //should read the dir1 file $h = fopen($filename, $mode, true); fpassthru($h); fclose($h); echo "\n"; - + unlink($firstFile); unlink($secondFile); - + //should read the working dir file $h = fopen($filename, $mode, true); fpassthru($h); fclose($h); echo "\n"; - + // create a file in the script directory $h = fopen($scriptFile, "w"); fwrite($h, "in script dir"); fclose($h); - + //should read the file in script dir $h = fopen($filename, $mode, true); fpassthru($h); fclose($h); echo "\n"; - + //cleanup unlink($filename); unlink($scriptFile); diff --git a/ext/standard/tests/file/fopen_variation9.phpt b/ext/standard/tests/file/fopen_variation9.phpt index 5d1ca139f4..db46ce008e 100644 --- a/ext/standard/tests/file/fopen_variation9.phpt +++ b/ext/standard/tests/file/fopen_variation9.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ require_once('fopen_include_path.inc'); @@ -34,8 +34,8 @@ function runtest() { $h = fopen($tmpfile, "w", true); fwrite($h, "This is the test file"); fclose($h); - - + + $h = @fopen($tmpfile, "r"); if ($h === false) { echo "Not created in working dir\n"; @@ -45,7 +45,7 @@ function runtest() { fclose($h); unlink($tmpfile); } - + $h = @fopen('dir1/'.$tmpfile, "r"); if ($h === false) { echo "Not created in dir1\n"; @@ -53,7 +53,7 @@ function runtest() { else { echo "created in dir1\n"; fclose($h); - unlink('dir1/'.$tmpfile); + unlink('dir1/'.$tmpfile); } } ?> diff --git a/ext/standard/tests/file/fopencookie.phpt b/ext/standard/tests/file/fopencookie.phpt index cd6bed89cf..79922e31e1 100644 --- a/ext/standard/tests/file/fopencookie.phpt +++ b/ext/standard/tests/file/fopencookie.phpt @@ -20,12 +20,12 @@ fopencookie detected and working (or cast mechanism works) class userstream { public $position = 0; public $data = "If you can read this, it worked"; - + function stream_open($path, $mode, $options, &$opened_path) { return true; } - + function stream_read($count) { $ret = substr($this->data, $this->position, $count); diff --git a/ext/standard/tests/file/fpassthru_basic.phpt b/ext/standard/tests/file/fpassthru_basic.phpt index 7389bd2105..162c6f77ec 100644 --- a/ext/standard/tests/file/fpassthru_basic.phpt +++ b/ext/standard/tests/file/fpassthru_basic.phpt @@ -2,7 +2,7 @@ Test fpassthru() function: Basic functionality --FILE-- <?php -/* +/* Prototype: int fpassthru ( resource $handle ); Description: Reads to EOF on the given file pointer from the current position and writes the results to the output buffer. diff --git a/ext/standard/tests/file/fpassthru_error.phpt b/ext/standard/tests/file/fpassthru_error.phpt index f761d09482..4ff028de6f 100644 --- a/ext/standard/tests/file/fpassthru_error.phpt +++ b/ext/standard/tests/file/fpassthru_error.phpt @@ -2,7 +2,7 @@ Test fpassthru() function: Error conditions --FILE-- <?php -/* +/* Prototype: int fpassthru ( resource $handle ); Description: Reads to EOF on the given file pointer from the current position and writes the results to the output buffer. diff --git a/ext/standard/tests/file/fpassthru_variation.phpt b/ext/standard/tests/file/fpassthru_variation.phpt index 2c9e6e6cd3..33b7d3ca4f 100644 --- a/ext/standard/tests/file/fpassthru_variation.phpt +++ b/ext/standard/tests/file/fpassthru_variation.phpt @@ -2,7 +2,7 @@ Test fpassthru() function: Variations --FILE-- <?php -/* +/* Prototype: int fpassthru ( resource $handle ); Description: Reads to EOF on the given file pointer from the current position and writes the results to the output buffer. @@ -22,7 +22,7 @@ $file_read = fopen($file_name, "r"); $offset_arr = array( /* Positive offsets */ 0, - 1, + 1, 5, 10, 20, @@ -32,8 +32,8 @@ $offset_arr = array( 70, /* Negative offsets, the file pointer should be at the end of file to get data */ - -1, - -5, + -1, + -5, -10, -20, -35, @@ -48,12 +48,12 @@ for( $i=0; $i<count($offset_arr); $i++ ) { var_dump(fpassthru($file_read) ); rewind( $file_read ); }else - { + { fseek($file_read, $offset_arr[$i], SEEK_END); var_dump( fpassthru($file_read) ); rewind( $file_read ); - } -} + } +} fclose($file_read); // closing the handle diff --git a/ext/standard/tests/file/fputcsv_variation1.phpt b/ext/standard/tests/file/fputcsv_variation1.phpt index 68df33c8ec..7bc9823fe2 100644 --- a/ext/standard/tests/file/fputcsv_variation1.phpt +++ b/ext/standard/tests/file/fputcsv_variation1.phpt @@ -2,7 +2,7 @@ Test fputcsv() : usage variations - with all parameters specified --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); Description: Format line as CSV and write to the file pointer */ @@ -33,13 +33,13 @@ $filename = "$file_path/fputcsv_variation1.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + var_dump( fputcsv($file_handle, $csv_field, $delimiter, $enclosure) ); // check the file pointer position and eof @@ -61,7 +61,7 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - + // print the file contents var_dump( file_get_contents($filename) ); diff --git a/ext/standard/tests/file/fputcsv_variation10.phpt b/ext/standard/tests/file/fputcsv_variation10.phpt index 21d845ffa7..f509a27738 100644 --- a/ext/standard/tests/file/fputcsv_variation10.phpt +++ b/ext/standard/tests/file/fputcsv_variation10.phpt @@ -2,7 +2,7 @@ Test fputcsv() : usage variations - with line without any csv fields --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); Description: Format line as CSV and write to the file pointer */ @@ -28,13 +28,13 @@ $filename = "$file_path/fputcsv_variation10.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($fields as $field) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -46,16 +46,16 @@ foreach ($fields as $field) { exit(); } $csv_field = $field; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field) ); - + // check the file pointer position and eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); //close the file fclose($file_handle); - + // print the file contents var_dump( file_get_contents($filename) ); diff --git a/ext/standard/tests/file/fputcsv_variation11.phpt b/ext/standard/tests/file/fputcsv_variation11.phpt index 770b89b711..5369478971 100644 --- a/ext/standard/tests/file/fputcsv_variation11.phpt +++ b/ext/standard/tests/file/fputcsv_variation11.phpt @@ -2,7 +2,7 @@ Test fputcsv() : usage variations - with default enclosure value --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); Description: Format line as CSV and write to the file pointer */ @@ -33,13 +33,13 @@ $filename = "$file_path/fputcsv_variation11.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, $delimiter) ); // check the file pointer position and eof @@ -61,7 +61,7 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - + // print the file contents var_dump( file_get_contents($filename) ); diff --git a/ext/standard/tests/file/fputcsv_variation12.phpt b/ext/standard/tests/file/fputcsv_variation12.phpt index 24fe5c4658..d0b5c71c1f 100644 --- a/ext/standard/tests/file/fputcsv_variation12.phpt +++ b/ext/standard/tests/file/fputcsv_variation12.phpt @@ -2,7 +2,7 @@ Test fputcsv() : usage variations - with default enclosure and different delimiter --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); Description: Format line as CSV and write to the file pointer */ @@ -34,13 +34,13 @@ $filename = "$file_path/fputcsv_variation12.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -54,7 +54,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, '+') ); // check the file pointer position and eof @@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - + // print the file contents var_dump( file_get_contents($filename) ); diff --git a/ext/standard/tests/file/fputcsv_variation13.phpt b/ext/standard/tests/file/fputcsv_variation13.phpt index a8a350b222..6984614e49 100644 --- a/ext/standard/tests/file/fputcsv_variation13.phpt +++ b/ext/standard/tests/file/fputcsv_variation13.phpt @@ -2,7 +2,7 @@ Test fputcsv() : usage variations - with default enclosure & delimiter of two chars --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); Description: Format line as CSV and write to the file pointer */ @@ -34,13 +34,13 @@ $filename = "$file_path/fputcsv_variation13.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -54,7 +54,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, '++') ); // check the file pointer position and eof @@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - + // print the file contents var_dump( file_get_contents($filename) ); diff --git a/ext/standard/tests/file/fputcsv_variation14.phpt b/ext/standard/tests/file/fputcsv_variation14.phpt index 36a4975c12..9486b2f77f 100644 --- a/ext/standard/tests/file/fputcsv_variation14.phpt +++ b/ext/standard/tests/file/fputcsv_variation14.phpt @@ -2,7 +2,7 @@ Test fputcsv() : usage variations - with enclosure & delimiter of two chars(read only modes) --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); Description: Format line as CSV and write to the file pointer */ @@ -51,8 +51,8 @@ foreach ($csv_lists as $csv_list) { exit(); } fclose($file_handle); - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // add the content with has csv fields $file_handle = fopen($filename, $file_modes[$mode_counter] ); if ( !$file_handle ) { @@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, '++', '%%') ); // check the file pointer position and eof @@ -70,7 +70,7 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - + // print the file contents var_dump( file_get_contents($filename) ); diff --git a/ext/standard/tests/file/fputcsv_variation2.phpt b/ext/standard/tests/file/fputcsv_variation2.phpt index 3ec4e91f2a..60fabcac7e 100644 --- a/ext/standard/tests/file/fputcsv_variation2.phpt +++ b/ext/standard/tests/file/fputcsv_variation2.phpt @@ -2,7 +2,7 @@ Test fputcsv() : usage variations - with delimiter as NULL --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); Description: Format line as CSV and write to the file pointer */ @@ -33,13 +33,13 @@ $filename = "$file_path/fputcsv_variation2.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, NULL, $enclosure) ); // check the file pointer position and eof @@ -61,7 +61,7 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - + // print the file contents var_dump( file_get_contents($filename) ); diff --git a/ext/standard/tests/file/fputcsv_variation3.phpt b/ext/standard/tests/file/fputcsv_variation3.phpt index 14a2503eca..9712e8086c 100644 --- a/ext/standard/tests/file/fputcsv_variation3.phpt +++ b/ext/standard/tests/file/fputcsv_variation3.phpt @@ -2,7 +2,7 @@ Test fputcsv() : usage variations - with enclosure as NULL --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); Description: Format line as CSV and write to the file pointer */ @@ -33,13 +33,13 @@ $filename = "$file_path/fputcsv_variation3.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, $delimiter, NULL) ); // check the file pointer position and eof @@ -61,7 +61,7 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - + // print the file contents var_dump( file_get_contents($filename) ); diff --git a/ext/standard/tests/file/fputcsv_variation4.phpt b/ext/standard/tests/file/fputcsv_variation4.phpt index bc374ad397..7c8b44e93c 100644 --- a/ext/standard/tests/file/fputcsv_variation4.phpt +++ b/ext/standard/tests/file/fputcsv_variation4.phpt @@ -2,7 +2,7 @@ Test fputcsv() : usage variations - with delimiter and enclosure as NULL --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); Description: Format line as CSV and write to the file pointer */ @@ -33,13 +33,13 @@ $filename = "$file_path/fputcsv_variation4.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, NULL, NULL) ); // check the file pointer position and eof @@ -61,7 +61,7 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - + // print the file contents var_dump( file_get_contents($filename) ); diff --git a/ext/standard/tests/file/fputcsv_variation5.phpt b/ext/standard/tests/file/fputcsv_variation5.phpt index 9d78854d71..aa2a764a54 100644 --- a/ext/standard/tests/file/fputcsv_variation5.phpt +++ b/ext/standard/tests/file/fputcsv_variation5.phpt @@ -2,7 +2,7 @@ Test fputcsv() : usage variations - with default arguments value --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); Description: Format line as CSV and write to the file pointer */ @@ -33,13 +33,13 @@ $filename = "$file_path/fputcsv_variation5.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field) ); // check the file pointer position and eof @@ -61,7 +61,7 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - + // print the file contents var_dump( file_get_contents($filename) ); diff --git a/ext/standard/tests/file/fputcsv_variation6.phpt b/ext/standard/tests/file/fputcsv_variation6.phpt index f30ce24f40..326aa08e9d 100644 --- a/ext/standard/tests/file/fputcsv_variation6.phpt +++ b/ext/standard/tests/file/fputcsv_variation6.phpt @@ -2,7 +2,7 @@ Test fputcsv() : usage variations - with different delimiter and enclosure --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); Description: Format line as CSV and write to the file pointer */ @@ -36,13 +36,13 @@ $filename = "$file_path/fputcsv_variation6.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -56,7 +56,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, '+', '%') ); // check the file pointer position and eof @@ -64,7 +64,7 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - + // print the file contents var_dump( file_get_contents($filename) ); diff --git a/ext/standard/tests/file/fputcsv_variation7.phpt b/ext/standard/tests/file/fputcsv_variation7.phpt index 8329251d73..fa85f4f7e5 100644 --- a/ext/standard/tests/file/fputcsv_variation7.phpt +++ b/ext/standard/tests/file/fputcsv_variation7.phpt @@ -2,7 +2,7 @@ Test fputcsv() : usage variations - with different delimiter and same enclosure --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); Description: Format line as CSV and write to the file pointer */ @@ -36,13 +36,13 @@ $filename = "$file_path/fputcsv_variation7.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -56,7 +56,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, '+', $enclosure) ); // check the file pointer position and eof @@ -64,7 +64,7 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - + // print the file contents var_dump( file_get_contents($filename) ); diff --git a/ext/standard/tests/file/fputcsv_variation8.phpt b/ext/standard/tests/file/fputcsv_variation8.phpt index 096f37908a..a2b975a540 100644 --- a/ext/standard/tests/file/fputcsv_variation8.phpt +++ b/ext/standard/tests/file/fputcsv_variation8.phpt @@ -2,7 +2,7 @@ Test fputcsv() : usage variations - with same delimiter and different enclosure --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); Description: Format line as CSV and write to the file pointer */ @@ -36,13 +36,13 @@ $filename = "$file_path/fputcsv_variation8.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -56,7 +56,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, $delimiter, '+') ); // check the file pointer position and eof @@ -64,7 +64,7 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - + // print the file contents var_dump( file_get_contents($filename) ); diff --git a/ext/standard/tests/file/fputcsv_variation9.phpt b/ext/standard/tests/file/fputcsv_variation9.phpt index 386d7bd1e7..7852806a17 100644 --- a/ext/standard/tests/file/fputcsv_variation9.phpt +++ b/ext/standard/tests/file/fputcsv_variation9.phpt @@ -2,7 +2,7 @@ Test fputcsv() : usage variations - two chars as enclosure & delimiter --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); Description: Format line as CSV and write to the file pointer */ @@ -34,13 +34,13 @@ $filename = "$file_path/fputcsv_variation9.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -54,7 +54,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, '++', '%%' ) ); @@ -63,7 +63,7 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - + // print the file contents var_dump( file_get_contents($filename) ); diff --git a/ext/standard/tests/file/fread_basic.phpt b/ext/standard/tests/file/fread_basic.phpt index 4cdeffb5ab..e4ca59b916 100644 --- a/ext/standard/tests/file/fread_basic.phpt +++ b/ext/standard/tests/file/fread_basic.phpt @@ -13,7 +13,7 @@ Test fread() function : basic functionality // include the file.inc for common functions for test include ("file.inc"); -/* Function : function check_size(string $data, int $expect_size) +/* Function : function check_size(string $data, int $expect_size) Description : Check the length of the data, and compare the size with $expect_size $data : Text data. $expect_size : Expected data length @@ -29,7 +29,7 @@ function check_size($data, $expect_size) { echo "*** Testing fread() basic operations ***\n"; -/* +/* test fread with file opened in "r" and "rb" mode only Content with numeric and strings with it */ @@ -38,27 +38,27 @@ $file_content_types = array("numeric","text","text_with_new_line","alphanumeric" foreach($file_content_types as $file_content_type) { echo "\n-- Testing fread) with file having data of type ". $file_content_type ." --\n"; - /* create files with $file_content_type */ + /* create files with $file_content_type */ create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fread_basic"); $filename = dirname(__FILE__)."/fread_basic1.tmp"; // this is name of the file created by create_files() - + /* open the file using $files_modes and perform fread() on it */ - for($inner_loop_counter = 0; - $inner_loop_counter < count($file_modes); + for($inner_loop_counter = 0; + $inner_loop_counter < count($file_modes); $inner_loop_counter++) { - + echo "-- File opened in mode ".$file_modes[$inner_loop_counter]." --\n"; $file_handle = fopen($filename, $file_modes[$inner_loop_counter]); if (!$file_handle) { echo "Error: failed to fopen() file: $filename!"; exit(); } - + /* read file by giving the acutal length, check the length and content by calculating the hash using md5() function */ /* Reading 1024 bytes from file, expecting 1024 bytes */ ; - + var_dump(ftell($file_handle)); var_dump( feof($file_handle) ); echo "Reading 1024 bytes from file, expecting 1024 bytes ... "; @@ -68,7 +68,7 @@ $file_content_types = array("numeric","text","text_with_new_line","alphanumeric" var_dump( feof($file_handle) ); var_dump( md5($data_from_file) ); // calculate the hash and dump it - /* read file by giving size more than its size */ + /* read file by giving size more than its size */ var_dump(rewind($file_handle)); var_dump(ftell($file_handle)); var_dump( feof($file_handle) ); diff --git a/ext/standard/tests/file/fread_error.phpt b/ext/standard/tests/file/fread_error.phpt index d500e6827a..44d2fc993c 100644 --- a/ext/standard/tests/file/fread_error.phpt +++ b/ext/standard/tests/file/fread_error.phpt @@ -11,7 +11,7 @@ Test fread() function : error conditions */ echo "*** Testing error conditions ***\n"; -$filename = __FILE__; +$filename = __FILE__; $file_handle = fopen($filename, "r"); // zero argument @@ -24,7 +24,7 @@ var_dump( fread($file_handle, 10, $file_handle) ); // invalid length argument echo "-- Testing fread() with invalid length arguments --\n"; -$len = 0; +$len = 0; var_dump( fread($file_handle, $len) ); $len = -10; var_dump( fread($file_handle, $len) ); diff --git a/ext/standard/tests/file/fread_fwrite_basic.phpt b/ext/standard/tests/file/fread_fwrite_basic.phpt index 0f5c4ed763..12c66ce928 100644 --- a/ext/standard/tests/file/fread_fwrite_basic.phpt +++ b/ext/standard/tests/file/fread_fwrite_basic.phpt @@ -5,11 +5,11 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php -/* +/* * proto int fwrite(resource fp, string str [, int length]) * Function is implemented in ext/standard/file.c - */ - + */ + /* Prototype: string fread ( resource $handle [, int $length] ); Description: reads up to length bytes from the file pointer referenced by handle. diff --git a/ext/standard/tests/file/fread_variation1.phpt b/ext/standard/tests/file/fread_variation1.phpt index b782536a57..ce5abdb103 100644 --- a/ext/standard/tests/file/fread_variation1.phpt +++ b/ext/standard/tests/file/fread_variation1.phpt @@ -47,7 +47,7 @@ function check_read($file_handle, $read_size, $expect_size) { return $data_from_file; } - + echo "*** Testing fread() : usage variations ***\n"; $file_modes = array("a+","a+b","a+t", @@ -65,7 +65,7 @@ foreach($file_content_types as $file_content_type) { /* create files with $file_content_type */ create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fread_variation"); } - + $filename = dirname(__FILE__)."/fread_variation1.tmp"; // this is name of the file created by create_files() echo "-- File opened in mode ".$file_mode." --\n"; $file_handle = fopen($filename, $file_mode); diff --git a/ext/standard/tests/file/fread_variation2.phpt b/ext/standard/tests/file/fread_variation2.phpt index 9375b7a1db..1109b4813a 100644 --- a/ext/standard/tests/file/fread_variation2.phpt +++ b/ext/standard/tests/file/fread_variation2.phpt @@ -27,7 +27,7 @@ function check_read($file_handle, $read_size, $expect_size) { // print file pointer position before read var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // read the data of size $read_size echo "Reading $read_size bytes from file, expecting $expect_size bytes ... "; $data_from_file = fread($file_handle, $read_size); @@ -46,7 +46,7 @@ function check_read($file_handle, $read_size, $expect_size) { return $data_from_file; } - + echo "*** Testing fread() : usage variations ***\n"; $file_modes = array("a","ab","at", diff --git a/ext/standard/tests/file/fread_variation3-win32-mb.phpt b/ext/standard/tests/file/fread_variation3-win32-mb.phpt index 537b525f76..a176bcd6db 100644 --- a/ext/standard/tests/file/fread_variation3-win32-mb.phpt +++ b/ext/standard/tests/file/fread_variation3-win32-mb.phpt @@ -31,7 +31,7 @@ function check_read($file_handle, $read_size, $expect_size) { // print file pointer position before read var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // read the data of size $read_size echo "Reading $read_size bytes from file, expecting $expect_size bytes ... "; $data_from_file = fread($file_handle, $read_size); @@ -49,7 +49,7 @@ function check_read($file_handle, $read_size, $expect_size) { return $data_from_file; } - + echo "*** Testing fread() : usage variations ***\n"; $file_modes = array("a+","a+b","a+t", @@ -67,7 +67,7 @@ foreach($file_content_types as $file_content_type) { /* create files with $file_content_type */ create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "私はガラスを食べられますfread_variation", 3); } - + $filename = dirname(__FILE__)."/私はガラスを食べられますfread_variation3.tmp"; // this is name of the file created by create_files() echo "-- File opened in mode ".$file_mode." --\n"; $file_handle = fopen($filename, $file_mode); diff --git a/ext/standard/tests/file/fread_variation3-win32.phpt b/ext/standard/tests/file/fread_variation3-win32.phpt index 295663c539..de21a44459 100644 --- a/ext/standard/tests/file/fread_variation3-win32.phpt +++ b/ext/standard/tests/file/fread_variation3-win32.phpt @@ -31,7 +31,7 @@ function check_read($file_handle, $read_size, $expect_size) { // print file pointer position before read var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // read the data of size $read_size echo "Reading $read_size bytes from file, expecting $expect_size bytes ... "; $data_from_file = fread($file_handle, $read_size); @@ -49,7 +49,7 @@ function check_read($file_handle, $read_size, $expect_size) { return $data_from_file; } - + echo "*** Testing fread() : usage variations ***\n"; $file_modes = array("a+","a+b","a+t", @@ -67,7 +67,7 @@ foreach($file_content_types as $file_content_type) { /* create files with $file_content_type */ create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fread_variation", 3); } - + $filename = dirname(__FILE__)."/fread_variation3.tmp"; // this is name of the file created by create_files() echo "-- File opened in mode ".$file_mode." --\n"; $file_handle = fopen($filename, $file_mode); diff --git a/ext/standard/tests/file/fread_variation3.phpt b/ext/standard/tests/file/fread_variation3.phpt index 5d66b54bec..9761af8dce 100644 --- a/ext/standard/tests/file/fread_variation3.phpt +++ b/ext/standard/tests/file/fread_variation3.phpt @@ -31,7 +31,7 @@ function check_read($file_handle, $read_size, $expect_size) { // print file pointer position before read var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // read the data of size $read_size echo "Reading $read_size bytes from file, expecting $expect_size bytes ... "; $data_from_file = fread($file_handle, $read_size); @@ -49,7 +49,7 @@ function check_read($file_handle, $read_size, $expect_size) { return $data_from_file; } - + echo "*** Testing fread() : usage variations ***\n"; $file_modes = array("a+","a+b","a+t", @@ -67,7 +67,7 @@ foreach($file_content_types as $file_content_type) { /* create files with $file_content_type */ create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fread_variation", 3); } - + $filename = dirname(__FILE__)."/fread_variation3.tmp"; // this is name of the file created by create_files() echo "-- File opened in mode ".$file_mode." --\n"; $file_handle = fopen($filename, $file_mode); diff --git a/ext/standard/tests/file/fread_variation4-win32.phpt b/ext/standard/tests/file/fread_variation4-win32.phpt index 6601f5aebc..69ea1574ad 100644 --- a/ext/standard/tests/file/fread_variation4-win32.phpt +++ b/ext/standard/tests/file/fread_variation4-win32.phpt @@ -31,7 +31,7 @@ function check_read($file_handle, $read_size, $expect_size) { // print file pointer position before read var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // read the data of size $read_size echo "Reading $read_size bytes from file, expecting $expect_size bytes ... "; $data_from_file = fread($file_handle, $read_size); @@ -49,7 +49,7 @@ function check_read($file_handle, $read_size, $expect_size) { return $data_from_file; } - + echo "*** Testing fread() : usage variations ***\n"; $file_modes = array("a","ab","at", @@ -67,7 +67,7 @@ foreach($file_content_types as $file_content_type) { /* create files with $file_content_type */ create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fread_variation", 4); } - + $filename = dirname(__FILE__)."/fread_variation4.tmp"; // this is name of the file created by create_files() echo "-- File opened in mode ".$file_mode." --\n"; $file_handle = fopen($filename, $file_mode); diff --git a/ext/standard/tests/file/fread_variation4.phpt b/ext/standard/tests/file/fread_variation4.phpt index fb290b104c..dc893dd509 100644 --- a/ext/standard/tests/file/fread_variation4.phpt +++ b/ext/standard/tests/file/fread_variation4.phpt @@ -31,7 +31,7 @@ function check_read($file_handle, $read_size, $expect_size) { // print file pointer position before read var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // read the data of size $read_size echo "Reading $read_size bytes from file, expecting $expect_size bytes ... "; $data_from_file = fread($file_handle, $read_size); @@ -49,7 +49,7 @@ function check_read($file_handle, $read_size, $expect_size) { return $data_from_file; } - + echo "*** Testing fread() : usage variations ***\n"; $file_modes = array("a","ab","at", @@ -67,7 +67,7 @@ foreach($file_content_types as $file_content_type) { /* create files with $file_content_type */ create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fread_variation", 4); } - + $filename = dirname(__FILE__)."/fread_variation4.tmp"; // this is name of the file created by create_files() echo "-- File opened in mode ".$file_mode." --\n"; $file_handle = fopen($filename, $file_mode); diff --git a/ext/standard/tests/file/fscanf.phpt b/ext/standard/tests/file/fscanf.phpt index 700439fcb5..6d3d0a5b96 100644 --- a/ext/standard/tests/file/fscanf.phpt +++ b/ext/standard/tests/file/fscanf.phpt @@ -63,7 +63,7 @@ echo "Done\n"; $filename = dirname(__FILE__)."/fscanf.dat"; unlink($filename); ?> ---EXPECTF-- +--EXPECTF-- Warning: fscanf() expects at least 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/file/fscanf_error.phpt b/ext/standard/tests/file/fscanf_error.phpt index 1a80d19348..fe351960dd 100644 --- a/ext/standard/tests/file/fscanf_error.phpt +++ b/ext/standard/tests/file/fscanf_error.phpt @@ -13,7 +13,7 @@ $file_path = dirname(__FILE__); $filename = "$file_path/fscanf_error.tmp"; $file_handle = fopen($filename, 'w'); -if ($file_handle == false) +if ($file_handle == false) exit("Error:failed to open file $filename"); fwrite($file_handle, "hello world"); fclose($file_handle); @@ -23,7 +23,7 @@ var_dump( fscanf() ); // single argument $file_handle = fopen($filename, 'r'); -if ($file_handle == false) +if ($file_handle == false) exit("Error:failed to open file $filename"); var_dump( fscanf($file_handle) ); fclose($file_handle); @@ -33,7 +33,7 @@ var_dump( fscanf($file_handle, "%s") ); // number of formats in format strings not matching the no of variables $file_handle = fopen($filename, 'r'); -if ($file_handle == false) +if ($file_handle == false) exit("Error:failed to open file $filename"); var_dump( fscanf($file_handle, "%d%s%f", $int_var, $string_var) ); fclose($file_handle); @@ -47,10 +47,10 @@ $invalid_formats = array( $undefined_var, undefined_constant, // looping to use various invalid formats with fscanf() foreach($invalid_formats as $format) { $file_handle = fopen($filename, 'r'); - if ($file_handle == false) + if ($file_handle == false) exit("Error:failed to open file $filename"); var_dump( fscanf($file_handle, $format) ); - fclose($file_handle); + fclose($file_handle); } echo "\n*** Done ***"; diff --git a/ext/standard/tests/file/fscanf_variation1.phpt b/ext/standard/tests/file/fscanf_variation1.phpt index 64d778916f..eaf720c506 100644 --- a/ext/standard/tests/file/fscanf_variation1.phpt +++ b/ext/standard/tests/file/fscanf_variation1.phpt @@ -36,7 +36,7 @@ echo "\n*** Done ***"; <?php $file_path = dirname(__FILE__); $filename = "$file_path/fscanf_variation1.tmp"; -unlink($filename); +unlink($filename); ?> --EXPECT-- *** Testing fscanf(): for its return type without third argument *** diff --git a/ext/standard/tests/file/fscanf_variation10.phpt b/ext/standard/tests/file/fscanf_variation10.phpt index a46c112879..e31e39688e 100644 --- a/ext/standard/tests/file/fscanf_variation10.phpt +++ b/ext/standard/tests/file/fscanf_variation10.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - float formats with resource $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different float format types with resource ***\n"; +echo "*** Test fscanf(): different float format types with resource ***\n"; // create a file $filename = "$file_path/fscanf_variation10.tmp"; @@ -24,14 +24,14 @@ if($file_handle == false) // resource type variable $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); - + // array of resource types $resource_types = array ( $fp, $dfp ); -$float_formats = array( "%f", +$float_formats = array( "%f", "%hf", "%lf", "%Lf", " %f", "%f ", "% f", "\t%f", "\n%f", "%4f", diff --git a/ext/standard/tests/file/fscanf_variation11.phpt b/ext/standard/tests/file/fscanf_variation11.phpt index 27de2ae5df..2d6debd5c0 100644 --- a/ext/standard/tests/file/fscanf_variation11.phpt +++ b/ext/standard/tests/file/fscanf_variation11.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - float formats with arrays $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different float format types with arrays ***\n"; +echo "*** Test fscanf(): different float format types with arrays ***\n"; // create a file $filename = "$file_path/fscanf_variation11.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation12.phpt b/ext/standard/tests/file/fscanf_variation12.phpt index 33bfb67db0..8968fc3397 100644 --- a/ext/standard/tests/file/fscanf_variation12.phpt +++ b/ext/standard/tests/file/fscanf_variation12.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - float formats with strings $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different float format types with strings ***\n"; +echo "*** Test fscanf(): different float format types with strings ***\n"; // create a file $filename = "$file_path/fscanf_variation12.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation13.phpt b/ext/standard/tests/file/fscanf_variation13.phpt index 49525b484c..d979517a99 100644 --- a/ext/standard/tests/file/fscanf_variation13.phpt +++ b/ext/standard/tests/file/fscanf_variation13.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - float formats with boolean $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different float format types with boolean data ***\n"; +echo "*** Test fscanf(): different float format types with boolean data ***\n"; // create a file $filename = "$file_path/fscanf_variation13.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation14.phpt b/ext/standard/tests/file/fscanf_variation14.phpt index 2b497c9f5b..0c521a2186 100644 --- a/ext/standard/tests/file/fscanf_variation14.phpt +++ b/ext/standard/tests/file/fscanf_variation14.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - string formats with strings $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different string format types with different string ***\n"; +echo "*** Test fscanf(): different string format types with different string ***\n"; // create a file $filename = "$file_path/fscanf_variation14.tmp"; @@ -65,7 +65,7 @@ $valid_strings = array( ); // various string formats -$string_formats = array( "%s", +$string_formats = array( "%s", "%hs", "%ls", "%Ls", " %s", "%s ", "% s", "\t%s", "\n%s", "%4s", diff --git a/ext/standard/tests/file/fscanf_variation15.phpt b/ext/standard/tests/file/fscanf_variation15.phpt index 76422dbc8c..a6dc720b91 100644 --- a/ext/standard/tests/file/fscanf_variation15.phpt +++ b/ext/standard/tests/file/fscanf_variation15.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - string formats with float values $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different string format types with float values ***\n"; +echo "*** Test fscanf(): different string format types with float values ***\n"; // create a file $filename = "$file_path/fscanf_variation15.tmp"; @@ -23,8 +23,8 @@ if($file_handle == false) // array of float type values $float_values = array ( - -2147483649, - 2147483648, + -2147483649, + 2147483648, -0x80000001, // float value, beyond max negative int 0x800000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int diff --git a/ext/standard/tests/file/fscanf_variation16.phpt b/ext/standard/tests/file/fscanf_variation16.phpt index 8025767bc1..8c49c0cace 100644 --- a/ext/standard/tests/file/fscanf_variation16.phpt +++ b/ext/standard/tests/file/fscanf_variation16.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - string formats with resource $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different string format types with resource ***\n"; +echo "*** Test fscanf(): different string format types with resource ***\n"; // create a file $filename = "$file_path/fscanf_variation16.tmp"; @@ -24,7 +24,7 @@ if($file_handle == false) // resource type variable $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); - + // array of resource types $resource_types = array ( $fp, diff --git a/ext/standard/tests/file/fscanf_variation17.phpt b/ext/standard/tests/file/fscanf_variation17.phpt index 2db8871c2b..d7e84f8d8c 100644 --- a/ext/standard/tests/file/fscanf_variation17.phpt +++ b/ext/standard/tests/file/fscanf_variation17.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - string formats with arrays $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different string format types with arrays ***\n"; +echo "*** Test fscanf(): different string format types with arrays ***\n"; // create a file $filename = "$file_path/fscanf_variation17.tmp"; @@ -37,7 +37,7 @@ $array_types = array ( ); $string_formats = array( "%s", - "%hs", "%ls", "%Ls", + "%hs", "%ls", "%Ls", " %s", "%s ", "% s", "\t%s", "\n%s", "%4s", "%30s", "%[a-zA-Z0-9]", "%*s"); diff --git a/ext/standard/tests/file/fscanf_variation18.phpt b/ext/standard/tests/file/fscanf_variation18.phpt index e80606a3fc..5babc5479f 100644 --- a/ext/standard/tests/file/fscanf_variation18.phpt +++ b/ext/standard/tests/file/fscanf_variation18.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - string formats with integer values $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different string format types with integer values ***\n"; +echo "*** Test fscanf(): different string format types with integer values ***\n"; // create a file $filename = "$file_path/fscanf_variation18.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation19.phpt b/ext/standard/tests/file/fscanf_variation19.phpt index 08edc522b4..680c4afb6f 100644 --- a/ext/standard/tests/file/fscanf_variation19.phpt +++ b/ext/standard/tests/file/fscanf_variation19.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - string formats with boolean $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different string format types with boolean data ***\n"; +echo "*** Test fscanf(): different string format types with boolean data ***\n"; // create a file $filename = "$file_path/fscanf_variation19.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation2.phpt b/ext/standard/tests/file/fscanf_variation2.phpt index 6f8b4d9247..b91028af07 100644 --- a/ext/standard/tests/file/fscanf_variation2.phpt +++ b/ext/standard/tests/file/fscanf_variation2.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - integer formats with integer values $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different integer format types with different integer values ***\n"; +echo "*** Test fscanf(): different integer format types with different integer values ***\n"; // create a file $filename = "$file_path/fscanf_variation2.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation20.phpt b/ext/standard/tests/file/fscanf_variation20.phpt index d59bef2ebd..81251c7b81 100644 --- a/ext/standard/tests/file/fscanf_variation20.phpt +++ b/ext/standard/tests/file/fscanf_variation20.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with integer values $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different char format types with different integer values ***\n"; +echo "*** Test fscanf(): different char format types with different integer values ***\n"; // create a file $filename = "$file_path/fscanf_variation20.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation21.phpt b/ext/standard/tests/file/fscanf_variation21.phpt index 51381ce479..42e05aaf04 100644 --- a/ext/standard/tests/file/fscanf_variation21.phpt +++ b/ext/standard/tests/file/fscanf_variation21.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with float values $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different char format types with float values ***\n"; +echo "*** Test fscanf(): different char format types with float values ***\n"; // create a file $filename = "$file_path/fscanf_variation21.tmp"; @@ -23,8 +23,8 @@ if($file_handle == false) // array of float type values $float_values = array ( - -2147483649, - 2147483648, + -2147483649, + 2147483648, -0x80000001, // float value, beyond max negative int 0x800000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int diff --git a/ext/standard/tests/file/fscanf_variation22.phpt b/ext/standard/tests/file/fscanf_variation22.phpt index a3809500a6..bf6d97515f 100644 --- a/ext/standard/tests/file/fscanf_variation22.phpt +++ b/ext/standard/tests/file/fscanf_variation22.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with resource $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different char format types with resource ***\n"; +echo "*** Test fscanf(): different char format types with resource ***\n"; // create a file $filename = "$file_path/fscanf_variation22.tmp"; @@ -24,14 +24,14 @@ if($file_handle == false) // resource type variable $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); - + // array of resource types $resource_types = array ( $fp, $dfp ); -$char_formats = array( "%c", +$char_formats = array( "%c", "%hc", "%lc", "%Lc", " %c", "%c ", "% c", "\t%c", "\n%c", "%4c", diff --git a/ext/standard/tests/file/fscanf_variation23.phpt b/ext/standard/tests/file/fscanf_variation23.phpt index d536c28fde..fc36f5da36 100644 --- a/ext/standard/tests/file/fscanf_variation23.phpt +++ b/ext/standard/tests/file/fscanf_variation23.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with arrays $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different char format types with arrays ***\n"; +echo "*** Test fscanf(): different char format types with arrays ***\n"; // create a file $filename = "$file_path/fscanf_variation23.tmp"; @@ -39,7 +39,7 @@ $array_types = array ( $char_formats = array( "%c", "%hc", "%lc", "%Lc", " %c", "%c ", "% c", - "\t%c", "\n%c", "%4c", + "\t%c", "\n%c", "%4c", "%30c", "%[a-zA-Z@#$&0-9]", "%*c"); $counter = 1; diff --git a/ext/standard/tests/file/fscanf_variation24.phpt b/ext/standard/tests/file/fscanf_variation24.phpt index ddca007ccf..8be8354023 100644 --- a/ext/standard/tests/file/fscanf_variation24.phpt +++ b/ext/standard/tests/file/fscanf_variation24.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with strings $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different char format types with strings ***\n"; +echo "*** Test fscanf(): different char format types with strings ***\n"; // create a file $filename = "$file_path/fscanf_variation24.tmp"; @@ -43,9 +43,9 @@ $strings = array ( ); $char_formats = array( "%c", - "%hc", "%lc", "%Lc", + "%hc", "%lc", "%Lc", " %c", "%c ", "% c", - "\t%c", "\n%c", "%4c", + "\t%c", "\n%c", "%4c", "%30c", "%[a-zA-Z@#$&0-9]", "%*c"); $counter = 1; diff --git a/ext/standard/tests/file/fscanf_variation25.phpt b/ext/standard/tests/file/fscanf_variation25.phpt index d874aba45e..c5f7e9413b 100644 --- a/ext/standard/tests/file/fscanf_variation25.phpt +++ b/ext/standard/tests/file/fscanf_variation25.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with boolean $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different char format types with boolean data ***\n"; +echo "*** Test fscanf(): different char format types with boolean data ***\n"; // create a file $filename = "$file_path/fscanf_variation25.tmp"; @@ -31,7 +31,7 @@ $bool_types = array ( $char_formats = array( "%c", "%hc", "%lc", "%Lc", " %c", "%c ", "% c", - "\t%c", "\n%c", "%4c", + "\t%c", "\n%c", "%4c", "%30c", "%[a-zA-Z@#$&0-9]", "%*c"); $counter = 1; diff --git a/ext/standard/tests/file/fscanf_variation26.phpt b/ext/standard/tests/file/fscanf_variation26.phpt index 1a883f479b..aaa631de81 100644 --- a/ext/standard/tests/file/fscanf_variation26.phpt +++ b/ext/standard/tests/file/fscanf_variation26.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with chars $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different char format types with chars ***\n"; +echo "*** Test fscanf(): different char format types with chars ***\n"; // create a file $filename = "$file_path/fscanf_variation26.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation27.phpt b/ext/standard/tests/file/fscanf_variation27.phpt index bbd201c543..24f34a5d81 100644 --- a/ext/standard/tests/file/fscanf_variation27.phpt +++ b/ext/standard/tests/file/fscanf_variation27.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - octal formats with integer values $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different octal format types with different integer values ***\n"; +echo "*** Test fscanf(): different octal format types with different integer values ***\n"; // create a file $filename = "$file_path/fscanf_variation27.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation28.phpt b/ext/standard/tests/file/fscanf_variation28.phpt index 97f72089fe..c96377b027 100644 --- a/ext/standard/tests/file/fscanf_variation28.phpt +++ b/ext/standard/tests/file/fscanf_variation28.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - octal formats with float values $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different octal format types with float values ***\n"; +echo "*** Test fscanf(): different octal format types with float values ***\n"; // create a file $filename = "$file_path/fscanf_variation28.tmp"; @@ -23,8 +23,8 @@ if($file_handle == false) // array of float type values $float_values = array ( - -2147483649, - 2147483648, + -2147483649, + 2147483648, -0x80000001, // float value, beyond max negative int 0x800000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int @@ -41,7 +41,7 @@ $float_values = array ( ); $octal_formats = array( "%o", - "%ho", "%lo", "%Lo", + "%ho", "%lo", "%Lo", " %o", "%o ", "% o", "\t%o", "\n%o", "%4o", "%30o", "%[0-7]", "%*o" diff --git a/ext/standard/tests/file/fscanf_variation29.phpt b/ext/standard/tests/file/fscanf_variation29.phpt index ce7083bc08..07e569be1b 100644 --- a/ext/standard/tests/file/fscanf_variation29.phpt +++ b/ext/standard/tests/file/fscanf_variation29.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - octal formats with resource $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different octal format types with resource ***\n"; +echo "*** Test fscanf(): different octal format types with resource ***\n"; // create a file $filename = "$file_path/fscanf_variation29.tmp"; @@ -24,7 +24,7 @@ if($file_handle == false) // resource type variable $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); - + // array of resource types $resource_types = array ( $fp, @@ -33,7 +33,7 @@ $resource_types = array ( $octal_formats = array( "%o", "%ho", "%lo", "%Lo", - " %o", "%o ", "% o", + " %o", "%o ", "% o", "\t%o", "\n%o", "%4o", "%30o", "%[0-7]", "%*o" ); diff --git a/ext/standard/tests/file/fscanf_variation3.phpt b/ext/standard/tests/file/fscanf_variation3.phpt index 8faff9d091..8ea8c8674a 100644 --- a/ext/standard/tests/file/fscanf_variation3.phpt +++ b/ext/standard/tests/file/fscanf_variation3.phpt @@ -18,7 +18,7 @@ if (PHP_INT_SIZE != 4) { $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different integer format types with float values ***\n"; +echo "*** Test fscanf(): different integer format types with float values ***\n"; // create a file $filename = "$file_path/fscanf_variation3.tmp"; @@ -29,8 +29,8 @@ if($file_handle == false) // array of float type values $float_values = array ( - -2147483649, - 2147483648, + -2147483649, + 2147483648, -0x80000001, // float value, beyond max negative int 0x800000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int diff --git a/ext/standard/tests/file/fscanf_variation30.phpt b/ext/standard/tests/file/fscanf_variation30.phpt index b4cb350ed6..5457c9b2c6 100644 --- a/ext/standard/tests/file/fscanf_variation30.phpt +++ b/ext/standard/tests/file/fscanf_variation30.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - octal formats with arrays $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different octal format types with arrays ***\n"; +echo "*** Test fscanf(): different octal format types with arrays ***\n"; // create a file $filename = "$file_path/fscanf_variation30.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation31.phpt b/ext/standard/tests/file/fscanf_variation31.phpt index f6bc7465f5..6ba47b6a51 100644 --- a/ext/standard/tests/file/fscanf_variation31.phpt +++ b/ext/standard/tests/file/fscanf_variation31.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - octal formats with strings $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different octal format types with strings ***\n"; +echo "*** Test fscanf(): different octal format types with strings ***\n"; // create a file $filename = "$file_path/fscanf_variation31.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation32.phpt b/ext/standard/tests/file/fscanf_variation32.phpt index 52e45405d0..f7d3cd5236 100644 --- a/ext/standard/tests/file/fscanf_variation32.phpt +++ b/ext/standard/tests/file/fscanf_variation32.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - octal formats with boolean $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different octal format types with boolean data ***\n"; +echo "*** Test fscanf(): different octal format types with boolean data ***\n"; // create a file $filename = "$file_path/fscanf_variation32.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation33.phpt b/ext/standard/tests/file/fscanf_variation33.phpt index 7263ffdf4a..6dfe071418 100644 --- a/ext/standard/tests/file/fscanf_variation33.phpt +++ b/ext/standard/tests/file/fscanf_variation33.phpt @@ -18,7 +18,7 @@ if (PHP_INT_SIZE != 4) { $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different hexa format types with different integer values ***\n"; +echo "*** Test fscanf(): different hexa format types with different integer values ***\n"; // create a file $filename = "$file_path/fscanf_variation33.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation34.phpt b/ext/standard/tests/file/fscanf_variation34.phpt index 2acdc8ba1b..77437efc99 100644 --- a/ext/standard/tests/file/fscanf_variation34.phpt +++ b/ext/standard/tests/file/fscanf_variation34.phpt @@ -18,7 +18,7 @@ if (PHP_INT_SIZE != 4) { $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different hexa format types with float values ***\n"; +echo "*** Test fscanf(): different hexa format types with float values ***\n"; // create a file $filename = "$file_path/fscanf_variation34.tmp"; @@ -29,8 +29,8 @@ if($file_handle == false) // array of float type values $float_values = array ( - -2147483649, - 2147483648, + -2147483649, + 2147483648, -0x80000001, // float value, beyond max negative int 0x800000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int diff --git a/ext/standard/tests/file/fscanf_variation35.phpt b/ext/standard/tests/file/fscanf_variation35.phpt index 1f98bd8f42..88e86b9690 100644 --- a/ext/standard/tests/file/fscanf_variation35.phpt +++ b/ext/standard/tests/file/fscanf_variation35.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - hexa formats with resource $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different hexa format types with resource ***\n"; +echo "*** Test fscanf(): different hexa format types with resource ***\n"; // create a file $filename = "$file_path/fscanf_variation35.tmp"; @@ -24,7 +24,7 @@ if($file_handle == false) // resource type variable $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); - + // array of resource types $resource_types = array ( $fp, diff --git a/ext/standard/tests/file/fscanf_variation36.phpt b/ext/standard/tests/file/fscanf_variation36.phpt index 44ff29536e..864209f499 100644 --- a/ext/standard/tests/file/fscanf_variation36.phpt +++ b/ext/standard/tests/file/fscanf_variation36.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - hexa formats with arrays $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different hexa format types with arrays ***\n"; +echo "*** Test fscanf(): different hexa format types with arrays ***\n"; // create a file $filename = "$file_path/fscanf_variation36.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation37.phpt b/ext/standard/tests/file/fscanf_variation37.phpt index 7ab302dd39..43668fff4f 100644 --- a/ext/standard/tests/file/fscanf_variation37.phpt +++ b/ext/standard/tests/file/fscanf_variation37.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - hexa formats with strings $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different hexa format types with strings ***\n"; +echo "*** Test fscanf(): different hexa format types with strings ***\n"; // create a file $filename = "$file_path/fscanf_variation37.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation38.phpt b/ext/standard/tests/file/fscanf_variation38.phpt index 32a7f77b42..4860ee1b5e 100644 --- a/ext/standard/tests/file/fscanf_variation38.phpt +++ b/ext/standard/tests/file/fscanf_variation38.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - hexa formats with boolean $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different hexa format types with boolean data ***\n"; +echo "*** Test fscanf(): different hexa format types with boolean data ***\n"; // create a file $filename = "$file_path/fscanf_variation38.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation39.phpt b/ext/standard/tests/file/fscanf_variation39.phpt index 1ed250c36c..222d6a2b8c 100644 --- a/ext/standard/tests/file/fscanf_variation39.phpt +++ b/ext/standard/tests/file/fscanf_variation39.phpt @@ -18,7 +18,7 @@ if (PHP_INT_SIZE != 4) { $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different unsigned int format types with different integer values ***\n"; +echo "*** Test fscanf(): different unsigned int format types with different integer values ***\n"; // create a file $filename = "$file_path/fscanf_variation39.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation4.phpt b/ext/standard/tests/file/fscanf_variation4.phpt index 0d9cd9dd43..4b5ae3073b 100644 --- a/ext/standard/tests/file/fscanf_variation4.phpt +++ b/ext/standard/tests/file/fscanf_variation4.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - integer formats with resource $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different integer format types with resource ***\n"; +echo "*** Test fscanf(): different integer format types with resource ***\n"; // create a file $filename = "$file_path/fscanf_variation4.tmp"; @@ -25,7 +25,7 @@ if($file_handle == false) // resource type variable $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); - + // array of resource types $resource_types = array ( $fp, diff --git a/ext/standard/tests/file/fscanf_variation40.phpt b/ext/standard/tests/file/fscanf_variation40.phpt index f3a0c96a71..1324007561 100644 --- a/ext/standard/tests/file/fscanf_variation40.phpt +++ b/ext/standard/tests/file/fscanf_variation40.phpt @@ -18,7 +18,7 @@ if (PHP_INT_SIZE != 4) { $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different unsigned format types with float values ***\n"; +echo "*** Test fscanf(): different unsigned format types with float values ***\n"; // create a file $filename = "$file_path/fscanf_variation40.tmp"; @@ -29,8 +29,8 @@ if($file_handle == false) // array of float type values $float_values = array ( - -2147483649, - 2147483648, + -2147483649, + 2147483648, -0x80000001, // float value, beyond max negative int 0x800000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int diff --git a/ext/standard/tests/file/fscanf_variation41.phpt b/ext/standard/tests/file/fscanf_variation41.phpt index 080ce98054..1d1afa4a56 100644 --- a/ext/standard/tests/file/fscanf_variation41.phpt +++ b/ext/standard/tests/file/fscanf_variation41.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - unsigned formats with resource $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different unsigned format types with resource ***\n"; +echo "*** Test fscanf(): different unsigned format types with resource ***\n"; // create a file $filename = "$file_path/fscanf_variation41.tmp"; @@ -24,7 +24,7 @@ if($file_handle == false) // resource type variable $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); - + // array of resource types $resource_types = array ( $fp, diff --git a/ext/standard/tests/file/fscanf_variation42.phpt b/ext/standard/tests/file/fscanf_variation42.phpt index 978187c733..0bfa59b8b5 100644 --- a/ext/standard/tests/file/fscanf_variation42.phpt +++ b/ext/standard/tests/file/fscanf_variation42.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - unsigned formats with arrays $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different unsigned format types with arrays ***\n"; +echo "*** Test fscanf(): different unsigned format types with arrays ***\n"; // create a file $filename = "$file_path/fscanf_variation42.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation43.phpt b/ext/standard/tests/file/fscanf_variation43.phpt index 8a0052f122..e77ea08cfc 100644 --- a/ext/standard/tests/file/fscanf_variation43.phpt +++ b/ext/standard/tests/file/fscanf_variation43.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - unsigned formats with strings $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different unsigned format types with strings ***\n"; +echo "*** Test fscanf(): different unsigned format types with strings ***\n"; // create a file $filename = "$file_path/fscanf_variation43.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation44.phpt b/ext/standard/tests/file/fscanf_variation44.phpt index 0b30b61f20..0b720472aa 100644 --- a/ext/standard/tests/file/fscanf_variation44.phpt +++ b/ext/standard/tests/file/fscanf_variation44.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - unsigned formats with boolean $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different unsigned format types with boolean data ***\n"; +echo "*** Test fscanf(): different unsigned format types with boolean data ***\n"; // create a file $filename = "$file_path/fscanf_variation44.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation45.phpt b/ext/standard/tests/file/fscanf_variation45.phpt index 2af39cb1c8..703863976b 100644 --- a/ext/standard/tests/file/fscanf_variation45.phpt +++ b/ext/standard/tests/file/fscanf_variation45.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - scientific formats with integer value $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different scientific format types with different integer values ***\n"; +echo "*** Test fscanf(): different scientific format types with different integer values ***\n"; // create a file $filename = "$file_path/fscanf_variation45.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation46.phpt b/ext/standard/tests/file/fscanf_variation46.phpt index 7145c8637a..c3cd8e0b7b 100644 --- a/ext/standard/tests/file/fscanf_variation46.phpt +++ b/ext/standard/tests/file/fscanf_variation46.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - scientific formats with float values $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different scientific format types with float values ***\n"; +echo "*** Test fscanf(): different scientific format types with float values ***\n"; // create a file $filename = "$file_path/fscanf_variation46.tmp"; @@ -23,8 +23,8 @@ if($file_handle == false) // array of float type values $float_values = array ( - -2147483649, - 2147483648, + -2147483649, + 2147483648, -0x80000001, // float value, beyond max negative int 0x800000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int diff --git a/ext/standard/tests/file/fscanf_variation47.phpt b/ext/standard/tests/file/fscanf_variation47.phpt index 7010571a42..fb165ac068 100644 --- a/ext/standard/tests/file/fscanf_variation47.phpt +++ b/ext/standard/tests/file/fscanf_variation47.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - scientific formats with resource $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different scientific format types with resource ***\n"; +echo "*** Test fscanf(): different scientific format types with resource ***\n"; // create a file $filename = "$file_path/fscanf_variation47.tmp"; @@ -24,7 +24,7 @@ if($file_handle == false) // resource type variable $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); - + // array of resource types $resource_types = array ( $fp, diff --git a/ext/standard/tests/file/fscanf_variation48.phpt b/ext/standard/tests/file/fscanf_variation48.phpt index 5b61e5b71e..c668dfd516 100644 --- a/ext/standard/tests/file/fscanf_variation48.phpt +++ b/ext/standard/tests/file/fscanf_variation48.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - scientific formats with arrays $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different scientific format types with arrays ***\n"; +echo "*** Test fscanf(): different scientific format types with arrays ***\n"; // create a file $filename = "$file_path/fscanf_variation48.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation49.phpt b/ext/standard/tests/file/fscanf_variation49.phpt index 4e314fb7ce..a681cc01e3 100644 --- a/ext/standard/tests/file/fscanf_variation49.phpt +++ b/ext/standard/tests/file/fscanf_variation49.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - scientific formats with strings $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different scientific format types with strings ***\n"; +echo "*** Test fscanf(): different scientific format types with strings ***\n"; // create a file $filename = "$file_path/fscanf_variation49.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation5.phpt b/ext/standard/tests/file/fscanf_variation5.phpt index 750e604586..5528c15a68 100644 --- a/ext/standard/tests/file/fscanf_variation5.phpt +++ b/ext/standard/tests/file/fscanf_variation5.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - integer formats with arrays $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different integer format types with arrays ***\n"; +echo "*** Test fscanf(): different integer format types with arrays ***\n"; // create a file $filename = "$file_path/fscanf_variation5.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation50.phpt b/ext/standard/tests/file/fscanf_variation50.phpt index e46dbdb347..f904f61fdb 100644 --- a/ext/standard/tests/file/fscanf_variation50.phpt +++ b/ext/standard/tests/file/fscanf_variation50.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - scientific formats with boolean $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different scientific format types with boolean data ***\n"; +echo "*** Test fscanf(): different scientific format types with boolean data ***\n"; // create a file $filename = "$file_path/fscanf_variation50.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation51.phpt b/ext/standard/tests/file/fscanf_variation51.phpt index 0f5ab5a612..68747729aa 100644 --- a/ext/standard/tests/file/fscanf_variation51.phpt +++ b/ext/standard/tests/file/fscanf_variation51.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - file opened in write only mode $file_path = dirname(__FILE__); -echo "*** Test fscanf(): to read from a file opened in write only mode ***\n"; +echo "*** Test fscanf(): to read from a file opened in write only mode ***\n"; // create a file $filename = "$file_path/fscanf_variation51.tmp"; @@ -39,7 +39,7 @@ $modes = array("w", "wb", "wt", $counter = 1; // reading the values from file using different integer formats foreach($modes as $mode) { - + $file_handle = fopen($filename, $mode); if($file_handle == false) { exit("Error:failed to open file $filename"); diff --git a/ext/standard/tests/file/fscanf_variation52.phpt b/ext/standard/tests/file/fscanf_variation52.phpt index bf82ab8e43..3fcb8f5d18 100644 --- a/ext/standard/tests/file/fscanf_variation52.phpt +++ b/ext/standard/tests/file/fscanf_variation52.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - empty file $file_path = dirname(__FILE__); -echo "*** Test fscanf(): to read an empty file ***\n"; +echo "*** Test fscanf(): to read an empty file ***\n"; // various formats $formats = array( "%d", "%f", "%e", "%u", " %s", "%x", "%o"); @@ -28,7 +28,7 @@ $modes = array("r", "rb", "rt", "r+", "r+b", "r+t", $counter = 1; // reading the values from file using different integer formats foreach($modes as $mode) { - + // create an empty file $filename = "$file_path/fscanf_variation52.tmp"; $file_handle = fopen($filename, "w"); diff --git a/ext/standard/tests/file/fscanf_variation53.phpt b/ext/standard/tests/file/fscanf_variation53.phpt index a553a96693..aa50a8140a 100644 --- a/ext/standard/tests/file/fscanf_variation53.phpt +++ b/ext/standard/tests/file/fscanf_variation53.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - file pointer pointing to EOF $file_path = dirname(__FILE__); -echo "*** Test fscanf(): to read a file when file pointer is pointing to EOF ***\n"; +echo "*** Test fscanf(): to read a file when file pointer is pointing to EOF ***\n"; // various formats $formats = array( "%d", "%f", "%e", "%u", " %s", "%x", "%o"); @@ -28,16 +28,16 @@ $modes = array("r", "rb", "rt", "r+", "r+b", "r+t", $counter = 1; // reading the values from file using different integer formats foreach($modes as $mode) { - + // create an empty file $filename = "$file_path/fscanf_variation53.tmp"; $file_handle = fopen($filename, "w"); if($file_handle == false) exit("Error:failed to open file $filename"); - + //writing data to the file @fwrite($file_handle, "Sample text\n"); - + // writing a blank line @fwrite($file_handle, "\n"); @@ -50,13 +50,13 @@ foreach($modes as $mode) { exit("Error:failed to open file $filename"); } echo "\n-- iteration $counter --\n"; - + // current location var_dump( ftell($file_handle) ); - + // set the file pointer to eof var_dump( fseek($file_handle, 0, SEEK_END) ); - + // current location var_dump( ftell($file_handle) ); diff --git a/ext/standard/tests/file/fscanf_variation54.phpt b/ext/standard/tests/file/fscanf_variation54.phpt index 0937e5b556..ae13100617 100644 --- a/ext/standard/tests/file/fscanf_variation54.phpt +++ b/ext/standard/tests/file/fscanf_variation54.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - objects $file_path = dirname(__FILE__); -echo "*** Test fscanf(): to read objects from a file ***\n"; +echo "*** Test fscanf(): to read objects from a file ***\n"; // declare a class class foo diff --git a/ext/standard/tests/file/fscanf_variation55.phpt b/ext/standard/tests/file/fscanf_variation55.phpt index a0f9b709e8..1e02356c6b 100644 --- a/ext/standard/tests/file/fscanf_variation55.phpt +++ b/ext/standard/tests/file/fscanf_variation55.phpt @@ -21,7 +21,7 @@ if (PHP_INT_SIZE != 4) { $file_path = dirname(__FILE__); -echo "*** Test fscanf(): tracking file pointer along with reading data from file ***\n"; +echo "*** Test fscanf(): tracking file pointer along with reading data from file ***\n"; // create a file $filename = "$file_path/fscanf_variation55.tmp"; @@ -32,13 +32,13 @@ if($file_handle == false) // different valid data $valid_data = array( 12345, // integer value - -12345, + -12345, 123.45, // float value -123.45, 0x123B, // hexadecimal value 0x12ab, 0123, // octal value - -0123, + -0123, "abcde", // string 'abcde', 10e3, // exponential value @@ -72,14 +72,14 @@ foreach($modes as $mode) { // reading different data from file using different formats foreach($int_formats as $int_format) { // current file pointer position - var_dump( ftell($file_handle) ); + var_dump( ftell($file_handle) ); // rewind the file so that for every foreach iteration the file pointer starts from bof rewind($file_handle); // current file pointer position after rewind operation - var_dump( ftell($file_handle) ); + var_dump( ftell($file_handle) ); echo "\n-- iteration $counter --\n"; while( !feof($file_handle) ) { - var_dump( ftell($file_handle) ); + var_dump( ftell($file_handle) ); var_dump( fscanf($file_handle,$int_format) ); } $counter++; diff --git a/ext/standard/tests/file/fscanf_variation6.phpt b/ext/standard/tests/file/fscanf_variation6.phpt index 74446f0851..0a6c908b2d 100644 --- a/ext/standard/tests/file/fscanf_variation6.phpt +++ b/ext/standard/tests/file/fscanf_variation6.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - integer formats with strings $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different integer format types with strings ***\n"; +echo "*** Test fscanf(): different integer format types with strings ***\n"; // create a file $filename = "$file_path/fscanf_variation6.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation7.phpt b/ext/standard/tests/file/fscanf_variation7.phpt index 33354e7faa..bf6afea277 100644 --- a/ext/standard/tests/file/fscanf_variation7.phpt +++ b/ext/standard/tests/file/fscanf_variation7.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - integer formats with boolean $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different integer format types with boolean data ***\n"; +echo "*** Test fscanf(): different integer format types with boolean data ***\n"; // create a file $filename = "$file_path/fscanf_variation7.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation8.phpt b/ext/standard/tests/file/fscanf_variation8.phpt index 97241015e6..e81b713351 100644 --- a/ext/standard/tests/file/fscanf_variation8.phpt +++ b/ext/standard/tests/file/fscanf_variation8.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - float formats with float values $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different float format types with different float values ***\n"; +echo "*** Test fscanf(): different float format types with different float values ***\n"; // create a file $filename = "$file_path/fscanf_variation8.tmp"; @@ -55,7 +55,7 @@ $valid_floats = array( ); // various float formats -$float_formats = array( "%f", +$float_formats = array( "%f", "%hf", "%lf", "%Lf", " %f", "%f ", "% f", "\t%f", "\n%f", "%4f", diff --git a/ext/standard/tests/file/fscanf_variation9.phpt b/ext/standard/tests/file/fscanf_variation9.phpt index e4cc6fa3b3..331d8f9c2f 100644 --- a/ext/standard/tests/file/fscanf_variation9.phpt +++ b/ext/standard/tests/file/fscanf_variation9.phpt @@ -18,7 +18,7 @@ if (PHP_INT_SIZE != 4) { $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different float format types with integer values ***\n"; +echo "*** Test fscanf(): different float format types with integer values ***\n"; // create a file $filename = "$file_path/fscanf_variation9.tmp"; diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt index 4a14b334b6..41ce37ccf7 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt @@ -42,7 +42,7 @@ foreach($file_content_types as $file_content_type){ // set the file pointer to 0 var_dump( rewind($file_handle) ); // Confirm file pointer moves correctly var_dump( ftell($file_handle) ); // confirm the file pointer position - + foreach($whence_set as $whence){ echo "-- Testing fseek() with whence = $whence_string[$whence] --\n"; var_dump( fseek($file_handle,10,$whence) ); //expecting int(0) diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt index fda4de5f40..ded2f648f9 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt @@ -24,7 +24,7 @@ include ("file.inc"); /* Testing fseek(),ftell(),rewind() functions on all write and create with write modes */ echo "*** Testing fseek(), ftell(), rewind() : basic operations ***\n"; -$file_modes = array( "w","wb","wt","w+","w+b","w+t", +$file_modes = array( "w","wb","wt","w+","w+b","w+t", "x","xb","xt","x+","x+b","x+t"); $file_content_types = array("text_with_new_line","alphanumeric"); diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt index 58bb65ef86..c9b46bfbb4 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt @@ -24,7 +24,7 @@ include ("file.inc"); /* Testing fseek(),ftell(),rewind() functions on all write and create with write modes */ echo "*** Testing fseek(), ftell(), rewind() : basic operations ***\n"; -$file_modes = array( "w","wb","wt","w+","w+b","w+t", +$file_modes = array( "w","wb","wt","w+","w+b","w+t", "x","xb","xt","x+","x+b","x+t"); $file_content_types = array("text_with_new_line","alphanumeric"); diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt index 6974b5262e..9788b02041 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt @@ -23,7 +23,7 @@ include ("file.inc"); /* Testing fseek(),ftell(),rewind() functions on all write and create with write modes */ echo "*** Testing fseek(), ftell(), rewind() : basic operations ***\n"; -$file_modes = array( "w","wb","wt","w+","w+b","w+t", +$file_modes = array( "w","wb","wt","w+","w+b","w+t", "x","xb","xt","x+","x+b","x+t"); $file_content_types = array("text_with_new_line","alphanumeric"); diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt index 8e01b8408b..9c1b3a822d 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fseek(), ftell() & rewind() functions : error conditions - fseek() +Test fseek(), ftell() & rewind() functions : error conditions - fseek() --FILE-- <?php diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt index 5c96fa0275..c33e28118b 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type){ } echo "-- Testing fseek() without using argument whence --\n"; foreach($offset as $count){ - var_dump( fseek($file_handle, $count) ); + var_dump( fseek($file_handle, $count) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt index e30a6bba06..4212751e62 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt @@ -26,7 +26,7 @@ include ("file.inc"); */ echo "*** Testing fseek(), ftell(), rewind() : default whence & all w and x modes ***\n"; -$file_modes = array( "w","wb","wt","w+","w+b","w+t", +$file_modes = array( "w","wb","wt","w+","w+b","w+t", "x","xb","xt","x+","x+b","x+t"); $file_content_types = array( "text_with_new_line","alphanumeric"); @@ -53,7 +53,7 @@ foreach($file_content_types as $file_content_type){ echo "-- Testing fseek() without using argument whence --\n"; foreach($offset as $count){ - var_dump( fseek($file_handle,$count) ); + var_dump( fseek($file_handle,$count) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt index 4957868723..fa6c14965f 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt @@ -26,7 +26,7 @@ include ("file.inc"); */ echo "*** Testing fseek(), ftell(), rewind() : default whence & all w and x modes ***\n"; -$file_modes = array( "w","wb","wt","w+","w+b","w+t", +$file_modes = array( "w","wb","wt","w+","w+b","w+t", "x","xb","xt","x+","x+b","x+t"); $file_content_types = array( "text_with_new_line","alphanumeric"); @@ -53,7 +53,7 @@ foreach($file_content_types as $file_content_type){ echo "-- Testing fseek() without using argument whence --\n"; foreach($offset as $count){ - var_dump( fseek($file_handle,$count) ); + var_dump( fseek($file_handle,$count) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt index 7dc9256340..b1eebf9f7e 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt @@ -45,7 +45,7 @@ foreach($file_content_types as $file_content_type){ exit(); } foreach($offset as $count){ - var_dump( fseek($file_handle,$count,SEEK_SET) ); + var_dump( fseek($file_handle,$count,SEEK_SET) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt index aa6e5f4104..44afc314ea 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type){ rewind($file_handle); foreach($offset as $count){ - var_dump( fseek($file_handle,$count,SEEK_SET) ); + var_dump( fseek($file_handle,$count,SEEK_SET) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt index 71573087ee..890b126118 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type){ rewind($file_handle); foreach($offset as $count){ - var_dump( fseek($file_handle,$count,SEEK_SET) ); + var_dump( fseek($file_handle,$count,SEEK_SET) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt index ff1d8c8710..b9fda93f1b 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt @@ -32,7 +32,7 @@ $filename = dirname(__FILE__)."/fseek_ftell_rewind_variation5.tmp"; // this is n /* open the file using $files_modes and perform fseek(),ftell() and rewind() on it */ foreach($file_content_types as $file_content_type){ echo "-- File having data of type ". $file_content_type ." --\n"; - + foreach($file_modes as $file_mode) { echo "-- File opened in mode ".$file_mode." --\n"; create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 512, "w", "fseek_ftell_rewind_variation" @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type){ } rewind($file_handle); foreach($offset as $count){ - var_dump( fseek($file_handle,$count,SEEK_CUR) ); + var_dump( fseek($file_handle,$count,SEEK_CUR) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt index 02c230f819..9451c07f5f 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type){ rewind($file_handle); foreach($offset as $count){ - var_dump( fseek($file_handle,$count,SEEK_CUR) ); + var_dump( fseek($file_handle,$count,SEEK_CUR) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt index 18821c86f2..d53a43816b 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type){ rewind($file_handle); foreach($offset as $count){ - var_dump( fseek($file_handle,$count,SEEK_CUR) ); + var_dump( fseek($file_handle,$count,SEEK_CUR) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt index 49deec5a15..8c3f53393c 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt @@ -44,11 +44,11 @@ foreach($file_content_types as $file_content_type){ } rewind($file_handle); foreach($offset as $count){ - var_dump( fseek($file_handle,$count,SEEK_END) ); + var_dump( fseek($file_handle,$count,SEEK_END) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop - + //close the file and check the size, the size will have increased // by 10 bytes because of holes fclose($file_handle); diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt index 2503422195..9ac2c128c5 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt @@ -52,11 +52,11 @@ foreach($file_content_types as $file_content_type){ rewind($file_handle); foreach($offset as $count){ - var_dump( fseek($file_handle,$count,SEEK_END) ); + var_dump( fseek($file_handle,$count,SEEK_END) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop - + //close the file and check the size fclose($file_handle); var_dump( filesize($filename) ); diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt index 144d9f6d1b..87a1703981 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt @@ -52,11 +52,11 @@ foreach($file_content_types as $file_content_type){ rewind($file_handle); foreach($offset as $count){ - var_dump( fseek($file_handle,$count,SEEK_END) ); + var_dump( fseek($file_handle,$count,SEEK_END) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop - + //close the file and check the size fclose($file_handle); var_dump( filesize($filename) ); diff --git a/ext/standard/tests/file/fseek_variation1.phpt b/ext/standard/tests/file/fseek_variation1.phpt index dda12bc704..56b2d128e8 100644 --- a/ext/standard/tests/file/fseek_variation1.phpt +++ b/ext/standard/tests/file/fseek_variation1.phpt @@ -62,7 +62,7 @@ $values = array( // string data "string", 'string', - + // object data new testClass(), diff --git a/ext/standard/tests/file/fstat.phpt b/ext/standard/tests/file/fstat.phpt index 96924af077..94ba9c5abf 100644 --- a/ext/standard/tests/file/fstat.phpt +++ b/ext/standard/tests/file/fstat.phpt @@ -13,7 +13,7 @@ var_dump(fstat($fp)); @unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(26) { [0]=> int(%i) diff --git a/ext/standard/tests/file/fstat_error.phpt b/ext/standard/tests/file/fstat_error.phpt index d75ddb9a76..c3c15295dd 100644 --- a/ext/standard/tests/file/fstat_error.phpt +++ b/ext/standard/tests/file/fstat_error.phpt @@ -3,7 +3,7 @@ Test function fstat() by calling it more than or less than its expected argument --FILE-- <?php $fp = fopen (__FILE__, 'r'); -$extra_arg = 'nothing'; +$extra_arg = 'nothing'; var_dump(fstat( $fp, $extra_arg ) ); var_dump(fstat()); diff --git a/ext/standard/tests/file/ftruncate_error.phpt b/ext/standard/tests/file/ftruncate_error.phpt index 31fc60fd17..cb4c6e2468 100644 --- a/ext/standard/tests/file/ftruncate_error.phpt +++ b/ext/standard/tests/file/ftruncate_error.phpt @@ -64,7 +64,7 @@ var_dump( ftruncate(@$fp,10)); var_dump( filesize($filename) ); echo "Done\n"; -?> +?> --CLEAN-- <?php $filename = dirname(__FILE__)."/ftruncate_error.tmp"; diff --git a/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt b/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt index e097b342f4..7460492cce 100644 --- a/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } diff --git a/ext/standard/tests/file/ftruncate_variation1-win32.phpt b/ext/standard/tests/file/ftruncate_variation1-win32.phpt index 58dfd296ed..317e13fe73 100644 --- a/ext/standard/tests/file/ftruncate_variation1-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation1-win32.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } diff --git a/ext/standard/tests/file/ftruncate_variation1.phpt b/ext/standard/tests/file/ftruncate_variation1.phpt index c6d28d7e6d..5a84b168de 100644 --- a/ext/standard/tests/file/ftruncate_variation1.phpt +++ b/ext/standard/tests/file/ftruncate_variation1.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } diff --git a/ext/standard/tests/file/ftruncate_variation2-win32.phpt b/ext/standard/tests/file/ftruncate_variation2-win32.phpt index 6d62f75f1a..de7b088320 100644 --- a/ext/standard/tests/file/ftruncate_variation2-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation2-win32.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -31,7 +31,7 @@ foreach($file_content_types as $file_content_type) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "-- Testing ftruncate() with file opening using $file_modes[$mode_counter] mode --\n"; - + // create 1 file with some contents $filename = dirname(__FILE__)."/ftruncate_variation2.tmp"; if( strstr($file_modes[$mode_counter], "x") || strstr($file_modes[$mode_counter], "w") ) { @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } diff --git a/ext/standard/tests/file/ftruncate_variation2.phpt b/ext/standard/tests/file/ftruncate_variation2.phpt index 2b907f595b..ac5a2316cd 100644 --- a/ext/standard/tests/file/ftruncate_variation2.phpt +++ b/ext/standard/tests/file/ftruncate_variation2.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -31,7 +31,7 @@ foreach($file_content_types as $file_content_type) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "-- Testing ftruncate() with file opening using $file_modes[$mode_counter] mode --\n"; - + // create 1 file with some contents $filename = dirname(__FILE__)."/ftruncate_variation2.tmp"; if( strstr($file_modes[$mode_counter], "x") || strstr($file_modes[$mode_counter], "w") ) { @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } diff --git a/ext/standard/tests/file/ftruncate_variation3-win32.phpt b/ext/standard/tests/file/ftruncate_variation3-win32.phpt index 4eba4a7a08..b275d5f462 100644 --- a/ext/standard/tests/file/ftruncate_variation3-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation3-win32.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -44,14 +44,14 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } rewind($file_handle); // file pointer to 0 echo "-- Testing ftruncate(): truncate file to half of its current size --\n"; - /* truncate it to half of its current size */ + /* truncate it to half of its current size */ $new_size = filesize($filename)/2; var_dump( filesize($filename) ); // current filesize var_dump( ftell($file_handle) ); diff --git a/ext/standard/tests/file/ftruncate_variation3.phpt b/ext/standard/tests/file/ftruncate_variation3.phpt index 27fbe33bbc..70ea90d18a 100644 --- a/ext/standard/tests/file/ftruncate_variation3.phpt +++ b/ext/standard/tests/file/ftruncate_variation3.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -44,14 +44,14 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } rewind($file_handle); // file pointer to 0 echo "-- Testing ftruncate(): truncate file to half of its current size --\n"; - /* truncate it to half of its current size */ + /* truncate it to half of its current size */ $new_size = filesize($filename)/2; var_dump( filesize($filename) ); // current filesize var_dump( ftell($file_handle) ); diff --git a/ext/standard/tests/file/ftruncate_variation4-win32.phpt b/ext/standard/tests/file/ftruncate_variation4-win32.phpt index 5bf5f679b6..18d5138baf 100644 --- a/ext/standard/tests/file/ftruncate_variation4-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation4-win32.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } @@ -53,7 +53,7 @@ foreach($file_content_types as $file_content_type) { echo "-- Testing ftruncate(): try truncating file to a negative size --\n"; /* try to truncate it to a negative size, size should not change*/ - $new_size = -1000; + $new_size = -1000; var_dump( filesize($filename) ); // current filesize var_dump( ftell($file_handle) ); var_dump( ftruncate($file_handle, $new_size) ); // truncate it diff --git a/ext/standard/tests/file/ftruncate_variation4.phpt b/ext/standard/tests/file/ftruncate_variation4.phpt index ef0ee21996..077b46fd05 100644 --- a/ext/standard/tests/file/ftruncate_variation4.phpt +++ b/ext/standard/tests/file/ftruncate_variation4.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } @@ -53,7 +53,7 @@ foreach($file_content_types as $file_content_type) { echo "-- Testing ftruncate(): try truncating file to a negative size --\n"; /* try to truncate it to a negative size, size should not change*/ - $new_size = -1000; + $new_size = -1000; var_dump( filesize($filename) ); // current filesize var_dump( ftell($file_handle) ); var_dump( ftruncate($file_handle, $new_size) ); // truncate it diff --git a/ext/standard/tests/file/ftruncate_variation5-win32.phpt b/ext/standard/tests/file/ftruncate_variation5-win32.phpt index 64bed969c9..9bec15dca3 100644 --- a/ext/standard/tests/file/ftruncate_variation5-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation5-win32.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -31,7 +31,7 @@ foreach($file_content_types as $file_content_type) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "-- Testing ftruncate() with file opening using $file_modes[$mode_counter] mode --\n"; - + // create 1 file with some contents $filename = dirname(__FILE__)."/ftruncate_variation5.tmp"; if( strstr($file_modes[$mode_counter], "x") || strstr($file_modes[$mode_counter], "w") ) { @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } @@ -62,7 +62,7 @@ foreach($file_content_types as $file_content_type) { fclose($file_handle); clearstatcache(); // clear previous size value in cache var_dump( filesize($filename) ); // new file size = actual size, no change - + //delete all files created delete_file($filename); }//end of inner for loop diff --git a/ext/standard/tests/file/ftruncate_variation5.phpt b/ext/standard/tests/file/ftruncate_variation5.phpt index 0716693cd1..7df84c9b17 100644 --- a/ext/standard/tests/file/ftruncate_variation5.phpt +++ b/ext/standard/tests/file/ftruncate_variation5.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -31,7 +31,7 @@ foreach($file_content_types as $file_content_type) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "-- Testing ftruncate() with file opening using $file_modes[$mode_counter] mode --\n"; - + // create 1 file with some contents $filename = dirname(__FILE__)."/ftruncate_variation5.tmp"; if( strstr($file_modes[$mode_counter], "x") || strstr($file_modes[$mode_counter], "w") ) { @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } @@ -62,7 +62,7 @@ foreach($file_content_types as $file_content_type) { fclose($file_handle); clearstatcache(); // clear previous size value in cache var_dump( filesize($filename) ); // new file size = actual size, no change - + //delete all files created delete_file($filename); }//end of inner for loop diff --git a/ext/standard/tests/file/ftruncate_variation6-win32.phpt b/ext/standard/tests/file/ftruncate_variation6-win32.phpt index 4b88ee8dd6..6686c80944 100644 --- a/ext/standard/tests/file/ftruncate_variation6-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation6-win32.phpt @@ -21,7 +21,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -46,15 +46,15 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } rewind($file_handle); // file pointer to 0 - + echo "-- Testing ftruncate(): truncate to smaller size and display the file content --\n"; /* try to truncate it and display the file content */ - + $new_size = 15; var_dump( filesize($filename) ); // current filesize var_dump( ftell($file_handle) ); @@ -66,8 +66,8 @@ foreach($file_content_types as $file_content_type) { var_dump( feof($file_handle) ); fclose($file_handle); clearstatcache(); // clear previous size value in cache - var_dump( filesize($filename) ); - + var_dump( filesize($filename) ); + //delete all files created delete_file( $filename ); }//end of inner for loop diff --git a/ext/standard/tests/file/ftruncate_variation6.phpt b/ext/standard/tests/file/ftruncate_variation6.phpt index 69dee82b70..a8bce476e0 100644 --- a/ext/standard/tests/file/ftruncate_variation6.phpt +++ b/ext/standard/tests/file/ftruncate_variation6.phpt @@ -21,7 +21,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -46,15 +46,15 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } rewind($file_handle); // file pointer to 0 - + echo "-- Testing ftruncate(): truncate to smaller size and display the file content --\n"; /* try to truncate it and display the file content */ - + $new_size = 15; var_dump( filesize($filename) ); // current filesize var_dump( ftell($file_handle) ); @@ -66,8 +66,8 @@ foreach($file_content_types as $file_content_type) { var_dump( feof($file_handle) ); fclose($file_handle); clearstatcache(); // clear previous size value in cache - var_dump( filesize($filename) ); - + var_dump( filesize($filename) ); + //delete all files created delete_file( $filename ); }//end of inner for loop diff --git a/ext/standard/tests/file/ftruncate_variation7-win32.phpt b/ext/standard/tests/file/ftruncate_variation7-win32.phpt index 09158ca490..376f775dcf 100644 --- a/ext/standard/tests/file/ftruncate_variation7-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation7-win32.phpt @@ -20,7 +20,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -45,15 +45,15 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } rewind($file_handle); // file pointer to 0 - + echo "-- Testing ftruncate(): File pointer at the end --\n"; /* try to truncate it to while file pointer at the end */ - fseek($file_handle, 0, SEEK_END); + fseek($file_handle, 0, SEEK_END); $new_size = 200; var_dump( filesize($filename) ); // current filesize var_dump( ftell($file_handle) ); @@ -62,8 +62,8 @@ foreach($file_content_types as $file_content_type) { var_dump( feof($file_handle) ); fclose($file_handle); clearstatcache(); // clear previous size value in cache - var_dump( filesize($filename) ); - + var_dump( filesize($filename) ); + //delete all files created delete_file($filename); }//end of inner for loop diff --git a/ext/standard/tests/file/ftruncate_variation7.phpt b/ext/standard/tests/file/ftruncate_variation7.phpt index 0ee558f0f9..5288344b20 100644 --- a/ext/standard/tests/file/ftruncate_variation7.phpt +++ b/ext/standard/tests/file/ftruncate_variation7.phpt @@ -20,7 +20,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -45,15 +45,15 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } rewind($file_handle); // file pointer to 0 - + echo "-- Testing ftruncate(): File pointer at the end --\n"; /* try to truncate it to while file pointer at the end */ - fseek($file_handle, 0, SEEK_END); + fseek($file_handle, 0, SEEK_END); $new_size = 200; var_dump( filesize($filename) ); // current filesize var_dump( ftell($file_handle) ); @@ -62,8 +62,8 @@ foreach($file_content_types as $file_content_type) { var_dump( feof($file_handle) ); fclose($file_handle); clearstatcache(); // clear previous size value in cache - var_dump( filesize($filename) ); - + var_dump( filesize($filename) ); + //delete all files created delete_file($filename); }//end of inner for loop diff --git a/ext/standard/tests/file/fwrite.phpt b/ext/standard/tests/file/fwrite.phpt index 7f12ebb1ee..443710b99d 100644 --- a/ext/standard/tests/file/fwrite.phpt +++ b/ext/standard/tests/file/fwrite.phpt @@ -29,7 +29,7 @@ var_dump(file_get_contents($filename)); @unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: fwrite() expects at least 2 parameters, 1 given in %s on line %d bool(false) diff --git a/ext/standard/tests/file/fwrite_basic-win32-mb.phpt b/ext/standard/tests/file/fwrite_basic-win32-mb.phpt index cdc5d86ff9..03ecfee483 100644 --- a/ext/standard/tests/file/fwrite_basic-win32-mb.phpt +++ b/ext/standard/tests/file/fwrite_basic-win32-mb.phpt @@ -31,8 +31,8 @@ foreach($file_content_types as $file_content_type) { echo "\n-- Testing fwrite() with file having data of type ". $file_content_type ." --\n"; $filename = dirname(__FILE__)."/fwrite_basic-win32私はガラスを食べられます.tmp"; // this is name of the file - for($inner_loop_counter = 0; - $inner_loop_counter < count($file_modes); + for($inner_loop_counter = 0; + $inner_loop_counter < count($file_modes); $inner_loop_counter++) { echo "-- File opened in mode : " . $file_modes[$inner_loop_counter]. " --\n"; /* open the file using $files_modes and perform fwrite() on it */ @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type) { var_dump( fwrite($file_handle, $data_to_be_written, 100)); //int(100) var_dump( feof($file_handle) ); // expected : false var_dump( ftell($file_handle) ); //expected: 100 - + // trying to write more than the available data, available 1024 bytes but trying 2048 var_dump( fwrite($file_handle, $data_to_be_written, 2048)); //int(1024) var_dump( feof($file_handle) ); // expected : false diff --git a/ext/standard/tests/file/fwrite_basic-win32.phpt b/ext/standard/tests/file/fwrite_basic-win32.phpt index d21887873e..d1655a7b6d 100644 --- a/ext/standard/tests/file/fwrite_basic-win32.phpt +++ b/ext/standard/tests/file/fwrite_basic-win32.phpt @@ -31,8 +31,8 @@ foreach($file_content_types as $file_content_type) { echo "\n-- Testing fwrite() with file having data of type ". $file_content_type ." --\n"; $filename = dirname(__FILE__)."/fwrite_basic-win32.tmp"; // this is name of the file - for($inner_loop_counter = 0; - $inner_loop_counter < count($file_modes); + for($inner_loop_counter = 0; + $inner_loop_counter < count($file_modes); $inner_loop_counter++) { echo "-- File opened in mode : " . $file_modes[$inner_loop_counter]. " --\n"; /* open the file using $files_modes and perform fwrite() on it */ @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type) { var_dump( fwrite($file_handle, $data_to_be_written, 100)); //int(100) var_dump( feof($file_handle) ); // expected : false var_dump( ftell($file_handle) ); //expected: 100 - + // trying to write more than the available data, available 1024 bytes but trying 2048 var_dump( fwrite($file_handle, $data_to_be_written, 2048)); //int(1024) var_dump( feof($file_handle) ); // expected : false diff --git a/ext/standard/tests/file/fwrite_basic.phpt b/ext/standard/tests/file/fwrite_basic.phpt index b0cb93212b..3670edd281 100644 --- a/ext/standard/tests/file/fwrite_basic.phpt +++ b/ext/standard/tests/file/fwrite_basic.phpt @@ -31,8 +31,8 @@ foreach($file_content_types as $file_content_type) { echo "\n-- Testing fwrite() with file having data of type ". $file_content_type ." --\n"; $filename = dirname(__FILE__)."/fwrite_basic.tmp"; // this is name of the file - for($inner_loop_counter = 0; - $inner_loop_counter < count($file_modes); + for($inner_loop_counter = 0; + $inner_loop_counter < count($file_modes); $inner_loop_counter++) { echo "-- File opened in mode : " . $file_modes[$inner_loop_counter]. " --\n"; /* open the file using $files_modes and perform fwrite() on it */ @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type) { var_dump( fwrite($file_handle, $data_to_be_written, 100)); //int(100) var_dump( feof($file_handle) ); // expected : false var_dump( ftell($file_handle) ); //expected: 100 - + // trying to write more than the available data, available 1024 bytes but trying 2048 var_dump( fwrite($file_handle, $data_to_be_written, 2048)); //int(1024) var_dump( feof($file_handle) ); // expected : false diff --git a/ext/standard/tests/file/fwrite_error.phpt b/ext/standard/tests/file/fwrite_error.phpt index 1e17b5d117..ec2305a6b1 100644 --- a/ext/standard/tests/file/fwrite_error.phpt +++ b/ext/standard/tests/file/fwrite_error.phpt @@ -19,7 +19,7 @@ $filename = dirname(__FILE__)."/fwrite_error.tmp"; echo "-- Testing fwrite() with less than expected number of arguments --\n"; // zero argument -var_dump( fwrite() ); +var_dump( fwrite() ); // less than expected, 1 arg $file_handle = fopen ( $filename, "w"); var_dump( fwrite($file_handle) ); diff --git a/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt b/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt index 79a5cf1d9c..f368513d10 100644 --- a/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt @@ -50,7 +50,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ diff --git a/ext/standard/tests/file/fwrite_variation1-win32.phpt b/ext/standard/tests/file/fwrite_variation1-win32.phpt index 644e71c44b..28559af0c9 100644 --- a/ext/standard/tests/file/fwrite_variation1-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation1-win32.phpt @@ -50,7 +50,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ diff --git a/ext/standard/tests/file/fwrite_variation1.phpt b/ext/standard/tests/file/fwrite_variation1.phpt index f6cf927621..dd3f5eddb9 100644 --- a/ext/standard/tests/file/fwrite_variation1.phpt +++ b/ext/standard/tests/file/fwrite_variation1.phpt @@ -36,7 +36,7 @@ foreach($file_content_types as $file_content_type) { /* open the file using $files_modes and perform fwrite() on it */ foreach($file_modes as $file_mode) { echo "-- Opening file in $file_mode --\n"; - + // create the temp file with content of type $file_content_type $filename = dirname(__FILE__)."/fwrite_variation1.tmp"; // this is name of the file create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fwrite_variation"); @@ -54,10 +54,10 @@ foreach($file_content_types as $file_content_type) { filesize & by displaying the content */ var_dump( ftell($file_handle) ); // expected: 0 - var_dump( fwrite($file_handle, $data_to_be_written )); + var_dump( fwrite($file_handle, $data_to_be_written )); var_dump( ftell($file_handle) ); // expected: 0 var_dump( feof($file_handle) ); // expected: false - + // move the file pointer to end of the file and try fwrite() fseek($file_handle, SEEK_END, 0); var_dump( ftell($file_handle) ); // expecting 1024 diff --git a/ext/standard/tests/file/fwrite_variation2.phpt b/ext/standard/tests/file/fwrite_variation2.phpt index 47a352e28a..6f16deb2d7 100644 --- a/ext/standard/tests/file/fwrite_variation2.phpt +++ b/ext/standard/tests/file/fwrite_variation2.phpt @@ -61,14 +61,14 @@ foreach($file_content_types as $file_content_type) { var_dump( feof($file_handle) ); //Expecting bool(false) /*overwrite data in middle of the file*/ - fseek($file_handle, SEEK_SET, 1024/2 ); + fseek($file_handle, SEEK_SET, 1024/2 ); var_dump( ftell($file_handle)); // expected: 1024/2 var_dump( fwrite($file_handle, $data_to_be_written, 200) ); var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); //Expecting bool(false) /* write at the end of the file */ - fseek($file_handle, SEEK_END, 0); + fseek($file_handle, SEEK_END, 0); var_dump( ftell($file_handle) ); // expected: 1024 var_dump( feof($file_handle) ); var_dump( fwrite($file_handle, $data_to_be_written, 200) ); diff --git a/ext/standard/tests/file/fwrite_variation3.phpt b/ext/standard/tests/file/fwrite_variation3.phpt index ca60ef438e..c7e148efd1 100644 --- a/ext/standard/tests/file/fwrite_variation3.phpt +++ b/ext/standard/tests/file/fwrite_variation3.phpt @@ -64,9 +64,9 @@ foreach($file_content_types as $file_content_type) { fseek($file_handle, SEEK_SET, (1024 + 400)/2 ); var_dump( ftell($file_handle)); // expected: (1024 + 400)/2 var_dump( fwrite($file_handle, $data_to_be_written, 200) ); - var_dump( ftell($file_handle) ); + var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); //Expecting bool(false) - + /* check the filesize and display file content */ // close the file, get the size and content of the file. var_dump( fclose($file_handle) ); diff --git a/ext/standard/tests/file/get_current_user.phpt b/ext/standard/tests/file/get_current_user.phpt index b67195b629..f23d2fabef 100644 --- a/ext/standard/tests/file/get_current_user.phpt +++ b/ext/standard/tests/file/get_current_user.phpt @@ -8,7 +8,7 @@ var_dump(get_current_user()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: get_current_user() expects exactly 0 parameters, 1 given in %s on line %d NULL string(%d) %s diff --git a/ext/standard/tests/file/include_streams.phpt b/ext/standard/tests/file/include_streams.phpt index 05b16238cd..d7b4aa57f5 100644 --- a/ext/standard/tests/file/include_streams.phpt +++ b/ext/standard/tests/file/include_streams.phpt @@ -20,7 +20,7 @@ class mystream function url_stat($path, $flags) { return array(); } - + function stream_stat() { return array(); } @@ -43,7 +43,7 @@ class mystream $this->position = strlen($GLOBALS[$this->varname]); else $this->position = 0; - + return true; } diff --git a/ext/standard/tests/file/include_userstream_001.phpt b/ext/standard/tests/file/include_userstream_001.phpt index d805afd204..d769a4f3b2 100644 --- a/ext/standard/tests/file/include_userstream_001.phpt +++ b/ext/standard/tests/file/include_userstream_001.phpt @@ -15,7 +15,7 @@ class test { $this->pos = strlen($this->data); else $this->po = 0; - + return true; } diff --git a/ext/standard/tests/file/include_userstream_002.phpt b/ext/standard/tests/file/include_userstream_002.phpt index 4841d39c51..cc1887c446 100644 --- a/ext/standard/tests/file/include_userstream_002.phpt +++ b/ext/standard/tests/file/include_userstream_002.phpt @@ -20,7 +20,7 @@ class test { $this->pos = strlen($this->data); else $this->po = 0; - + return true; } diff --git a/ext/standard/tests/file/include_userstream_003.phpt b/ext/standard/tests/file/include_userstream_003.phpt index 2b439cfa25..470982d9b8 100644 --- a/ext/standard/tests/file/include_userstream_003.phpt +++ b/ext/standard/tests/file/include_userstream_003.phpt @@ -20,7 +20,7 @@ class test { $this->pos = strlen($this->data); else $this->po = 0; - + return true; } diff --git a/ext/standard/tests/file/is_dir_variation2.phpt b/ext/standard/tests/file/is_dir_variation2.phpt index 65efeab9a1..cfa140ad52 100644 --- a/ext/standard/tests/file/is_dir_variation2.phpt +++ b/ext/standard/tests/file/is_dir_variation2.phpt @@ -24,14 +24,14 @@ mkdir($dirname); var_dump( is_dir($dirname) ); clearstatcache(); -echo "-- With symlink --\n"; +echo "-- With symlink --\n"; symlink($file_path."/is_dir_variation2", $file_path."/is_dir_variation2_symlink"); var_dump( is_dir($file_path."/is_dir_variation2_symlink") ); //is_dir() resolves symlinks clearstatcache(); echo "-- With hardlink --"; link($file_path."/is_dir_variation2", $file_path."/is_dir_variation2_link"); //Not permitted to create hard-link to a dir -var_dump( is_dir($file_path."/is_dir_variation2_link") ); +var_dump( is_dir($file_path."/is_dir_variation2_link") ); clearstatcache(); echo "\n*** Testing is_dir() with file and links to a file ***\n"; @@ -41,7 +41,7 @@ fclose( fopen($filename, "w") ); var_dump( is_dir($filename) ); clearstatcache(); -echo "-- With symlink --\n"; +echo "-- With symlink --\n"; symlink($file_path."/is_dir_variation2.tmp", $file_path."/is_dir_variation2_symlink.tmp"); var_dump( is_dir($file_path."/is_dir_variation2_symlink.tmp") ); clearstatcache(); diff --git a/ext/standard/tests/file/is_executable_variation1.phpt b/ext/standard/tests/file/is_executable_variation1.phpt index 231f1bff3f..9f49437311 100644 --- a/ext/standard/tests/file/is_executable_variation1.phpt +++ b/ext/standard/tests/file/is_executable_variation1.phpt @@ -35,13 +35,13 @@ $files_arr = array( /* Testing file with double slashes */ "$file_path/is_executable_variation1//bar.tmp", "$file_path/is_executable_variation1/*.tmp", - "$file_path/is_executable_variation1/b*.tmp", + "$file_path/is_executable_variation1/b*.tmp", /* Testing Binary safe */ "$file_path/is_executable_variation1".chr(0)."bar.temp", "$file_path".chr(0)."is_executable_variation1/bar.temp", "$file_path/is_executable_variation1x000/", - + /* Testing directories */ ".", // current directory, exp: bool(true) "$file_path/is_executable_variation1" // temp directory, exp: bool(true) diff --git a/ext/standard/tests/file/is_file_variation2.phpt b/ext/standard/tests/file/is_file_variation2.phpt index 7ab44da7ff..6a871468d3 100644 --- a/ext/standard/tests/file/is_file_variation2.phpt +++ b/ext/standard/tests/file/is_file_variation2.phpt @@ -12,7 +12,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { Returns TRUE if the filename exists and is a regular file */ -/* Creating soft and hard links to a file and applying is_file() on links */ +/* Creating soft and hard links to a file and applying is_file() on links */ $file_path = dirname(__FILE__); fclose( fopen($file_path."/is_file_variation2.tmp", "w") ); diff --git a/ext/standard/tests/file/is_file_variation3.phpt b/ext/standard/tests/file/is_file_variation3.phpt index 2a13e46779..6a6d76f793 100644 --- a/ext/standard/tests/file/is_file_variation3.phpt +++ b/ext/standard/tests/file/is_file_variation3.phpt @@ -22,12 +22,12 @@ $filenames = array( FALSE, NULL, $file_handle, - + /* scalars */ 1234, 0 ); - + /* loop through to test each element the above array */ foreach( $filenames as $filename ) { var_dump( is_file($filename) ); diff --git a/ext/standard/tests/file/is_file_variation4.phpt b/ext/standard/tests/file/is_file_variation4.phpt index b927446b7c..505331d2c9 100644 --- a/ext/standard/tests/file/is_file_variation4.phpt +++ b/ext/standard/tests/file/is_file_variation4.phpt @@ -27,7 +27,7 @@ $files_arr = array( "/is_file_variation4//is_file_variation4.tmp", "//is_file_variation4//is_file_variation4.tmp", "/is_file_variation4/*.tmp", - "is_file_variation4/is_file*.tmp", + "is_file_variation4/is_file*.tmp", /* Testing Binary safe */ "/is_file_variation4/is_file_variation4.tmp".chr(0), diff --git a/ext/standard/tests/file/is_readable_variation1.phpt b/ext/standard/tests/file/is_readable_variation1.phpt index 5becac00a2..f1b8af55d6 100644 --- a/ext/standard/tests/file/is_readable_variation1.phpt +++ b/ext/standard/tests/file/is_readable_variation1.phpt @@ -44,13 +44,13 @@ $files_arr = array( "$file_path/is_readable_variation1//bar.tmp", "$file_path//is_readable_variation1//bar.tmp", "$file_path/is_readable_variation1/*.tmp", - "$file_path/is_readable_variation1/b*.tmp", + "$file_path/is_readable_variation1/b*.tmp", /* Testing Binary safe */ "$file_path/is_readable_variation1".chr(0)."bar.tmp", "$file_path".chr(0)."is_readable_variation1/bar.tmp", "$file_path".chr(0)."is_readable_variation1/bar.tmp", - + /* Testing directories */ ".", // current directory, exp: bool(true) "$file_path/is_readable_variation1" // temp directory, exp: bool(true) diff --git a/ext/standard/tests/file/is_writable_variation1.phpt b/ext/standard/tests/file/is_writable_variation1.phpt index 718c7fb8e9..ff717a5c2f 100644 --- a/ext/standard/tests/file/is_writable_variation1.phpt +++ b/ext/standard/tests/file/is_writable_variation1.phpt @@ -46,13 +46,13 @@ $files_arr = array( "$file_path/is_writable_variation1//bar.tmp", "$file_path//is_writable_variation1//bar.tmp", "$file_path/is_writable_variation1/*.tmp", - "$file_path/is_writable_variation1/b*.tmp", + "$file_path/is_writable_variation1/b*.tmp", /* Testing Binary safe */ "$file_path/is_writable_variation1".chr(0)."bar.tmp", "$file_path".chr(0)."is_writable_variation1/bar.tmp", "$file_path".chr(0)."is_writable_variation1/bar.tmp", - + /* Testing directories */ ".", // current directory, exp: bool(true) "$file_path/is_writable_variation1" // temp directory, exp: bool(true) diff --git a/ext/standard/tests/file/lchown_basic.phpt b/ext/standard/tests/file/lchown_basic.phpt index 57476131c7..1d3604e329 100644 --- a/ext/standard/tests/file/lchown_basic.phpt +++ b/ext/standard/tests/file/lchown_basic.phpt @@ -10,7 +10,7 @@ if (!function_exists("posix_getuid")) die("skip no posix_getuid()"); /* Prototype : bool lchown (string filename, mixed user) * Description: Change file owner of a symlink * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing lchown() : basic functionality ***\n"; diff --git a/ext/standard/tests/file/lchown_error.phpt b/ext/standard/tests/file/lchown_error.phpt index 8632495b39..1e1ebf3e94 100644 --- a/ext/standard/tests/file/lchown_error.phpt +++ b/ext/standard/tests/file/lchown_error.phpt @@ -19,7 +19,7 @@ unlink($filename); /* Prototype : bool lchown (string filename, mixed user) * Description: Change file owner of a symlink * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing lchown() : error functionality ***\n"; diff --git a/ext/standard/tests/file/lstat_stat_error.phpt b/ext/standard/tests/file/lstat_stat_error.phpt index 385167fe32..8f290a32e3 100644 --- a/ext/standard/tests/file/lstat_stat_error.phpt +++ b/ext/standard/tests/file/lstat_stat_error.phpt @@ -16,7 +16,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { */ echo "*** Testing lstat() for error conditions ***\n"; -$file_path = dirname(__FILE__); +$file_path = dirname(__FILE__); var_dump( lstat() ); // args < expected var_dump( lstat(__FILE__, 2) ); // args > expected var_dump( lstat("$file_path/temp.tmp") ); // non existing file diff --git a/ext/standard/tests/file/lstat_stat_variation12.phpt b/ext/standard/tests/file/lstat_stat_variation12.phpt index 3051210001..26c0e578b1 100644 --- a/ext/standard/tests/file/lstat_stat_variation12.phpt +++ b/ext/standard/tests/file/lstat_stat_variation12.phpt @@ -1,5 +1,5 @@ --TEST-- -Test lstat() and stat() functions: usage variations - effects of is_link() +Test lstat() and stat() functions: usage variations - effects of is_link() --SKIPIF-- <?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); diff --git a/ext/standard/tests/file/lstat_stat_variation19.phpt b/ext/standard/tests/file/lstat_stat_variation19.phpt index c481575ce9..fedf0bd154 100644 --- a/ext/standard/tests/file/lstat_stat_variation19.phpt +++ b/ext/standard/tests/file/lstat_stat_variation19.phpt @@ -32,7 +32,7 @@ echo "*** Testing stat() with filename & directory name stored inside an array * // array with default numeric index $names = array( - "$file_path/lstat_stat_variation19.tmp", + "$file_path/lstat_stat_variation19.tmp", "$file_path/lstat_stat_variation19" ); diff --git a/ext/standard/tests/file/lstat_stat_variation2.phpt b/ext/standard/tests/file/lstat_stat_variation2.phpt index 9f9e75ba2b..8c4a499510 100644 --- a/ext/standard/tests/file/lstat_stat_variation2.phpt +++ b/ext/standard/tests/file/lstat_stat_variation2.phpt @@ -37,7 +37,7 @@ var_dump( compare_self_stat($old_stat) ); var_dump( compare_self_stat($new_stat) ); // compare the two stats - all except ctime -$keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, +$keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, "dev", "ino", "mode", "nlink", "uid", "gid", "rdev", "size", "atime", "mtime", "blksize", "blocks"); var_dump( compare_stats($old_stat, $new_stat, $keys_to_compare) ); diff --git a/ext/standard/tests/file/lstat_stat_variation3.phpt b/ext/standard/tests/file/lstat_stat_variation3.phpt index e7bae3abb4..43f8bf6187 100644 --- a/ext/standard/tests/file/lstat_stat_variation3.phpt +++ b/ext/standard/tests/file/lstat_stat_variation3.phpt @@ -41,7 +41,7 @@ var_dump( compare_self_stat($old_stat) ); var_dump( compare_self_stat($new_stat) ); // compare the two stats - all except ctime -$keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, +$keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, "dev", "ino", "mode", "nlink", "uid", "gid", "rdev", "size", "atime", "mtime", "blksize", "blocks"); var_dump( compare_stats($old_stat, $new_stat, $keys_to_compare) ); diff --git a/ext/standard/tests/file/mkdir-001.phpt b/ext/standard/tests/file/mkdir-001.phpt index 23823b2ae7..bad32c37ab 100644 --- a/ext/standard/tests/file/mkdir-001.phpt +++ b/ext/standard/tests/file/mkdir-001.phpt @@ -20,7 +20,7 @@ var_dump(rmdir(dirname(__FILE__)."/mkdir-001")); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir-002.phpt b/ext/standard/tests/file/mkdir-002.phpt index d149098df0..92c05e941d 100644 --- a/ext/standard/tests/file/mkdir-002.phpt +++ b/ext/standard/tests/file/mkdir-002.phpt @@ -30,7 +30,7 @@ var_dump(rmdir(dirname(__FILE__)."/mkdir-002")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) string(%d) "%s diff --git a/ext/standard/tests/file/mkdir-003.phpt b/ext/standard/tests/file/mkdir-003.phpt index fe14bef23d..b3141c5970 100644 --- a/ext/standard/tests/file/mkdir-003.phpt +++ b/ext/standard/tests/file/mkdir-003.phpt @@ -17,7 +17,7 @@ var_dump(rmdir(dirname(__FILE__)."/mkdir-003")); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir-004.phpt b/ext/standard/tests/file/mkdir-004.phpt index 51e4e55617..46db531082 100644 --- a/ext/standard/tests/file/mkdir-004.phpt +++ b/ext/standard/tests/file/mkdir-004.phpt @@ -17,7 +17,7 @@ var_dump(rmdir("/testdir")); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir-005.phpt b/ext/standard/tests/file/mkdir-005.phpt index 161f8d0630..621c9922e5 100644 --- a/ext/standard/tests/file/mkdir-005.phpt +++ b/ext/standard/tests/file/mkdir-005.phpt @@ -18,7 +18,7 @@ var_dump(rmdir("./testdir")); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir_variation1-win32.phpt b/ext/standard/tests/file/mkdir_variation1-win32.phpt index 17f54926cb..ea02b62fab 100644 --- a/ext/standard/tests/file/mkdir_variation1-win32.phpt +++ b/ext/standard/tests/file/mkdir_variation1-win32.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) * Description: Create a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mkdir() : usage variation ***\n"; @@ -71,7 +71,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // other // php.net bug outputs message File Exists 'single space' => ' ', diff --git a/ext/standard/tests/file/mkdir_variation1.phpt b/ext/standard/tests/file/mkdir_variation1.phpt index b5254034be..93e7f28d32 100644 --- a/ext/standard/tests/file/mkdir_variation1.phpt +++ b/ext/standard/tests/file/mkdir_variation1.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) * Description: Create a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mkdir() : usage variation ***\n"; @@ -71,7 +71,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // other 'single space' => ' ', ); diff --git a/ext/standard/tests/file/mkdir_variation2.phpt b/ext/standard/tests/file/mkdir_variation2.phpt index 0b461d2635..220820532f 100644 --- a/ext/standard/tests/file/mkdir_variation2.phpt +++ b/ext/standard/tests/file/mkdir_variation2.phpt @@ -9,7 +9,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) * Description: Create a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mkdir() : usage variation ***\n"; diff --git a/ext/standard/tests/file/mkdir_variation3.phpt b/ext/standard/tests/file/mkdir_variation3.phpt index 1c0baa09f7..cf2911273a 100644 --- a/ext/standard/tests/file/mkdir_variation3.phpt +++ b/ext/standard/tests/file/mkdir_variation3.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) * Description: Create a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mkdir() : usage variation ***\n"; diff --git a/ext/standard/tests/file/mkdir_variation4.phpt b/ext/standard/tests/file/mkdir_variation4.phpt index 862dec8c4e..acf7e27eac 100644 --- a/ext/standard/tests/file/mkdir_variation4.phpt +++ b/ext/standard/tests/file/mkdir_variation4.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) * Description: Create a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mkdir() : usage variation ***\n"; @@ -104,7 +104,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // non stream context resource 'file resource' => $fileRes, ); diff --git a/ext/standard/tests/file/mkdir_variation5-win32.phpt b/ext/standard/tests/file/mkdir_variation5-win32.phpt index c7ebd518da..c6bdc1575a 100644 --- a/ext/standard/tests/file/mkdir_variation5-win32.phpt +++ b/ext/standard/tests/file/mkdir_variation5-win32.phpt @@ -6,13 +6,13 @@ Dave Kelsey <d_kelsey@uk.ibm.com> <?php if(substr(PHP_OS, 0, 3) != "WIN") die("skip Only valid for Windows"); -?> +?> --FILE-- <?php /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) * Description: Create a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mkdir() : variation ***\n"; @@ -29,11 +29,11 @@ $dirs = array( $workDir.'\\'.$subDir, '.\\'.$workDir.'\\'.$subDir, $workDir.'\\..\\'.$workDir.'\\'.$subDir, - + // relative bad path $workDir.'\\..\\BADDIR\\'.$subDir, 'BADDIR\\'.$subDir, - + //absolute $cwd.'\\'.$workDir.'\\'.$subDir, $cwd.'\\.\\'.$workDir.'\\'.$subDir, @@ -41,23 +41,23 @@ $dirs = array( //absolute bad path $cwd.'\\BADDIR\\'.$subDir, - + //trailing separators $workDir.'\\'.$subDir.'\\', $cwd.'\\'.$workDir.'\\'.$subDir.'\\', - + // multiple separators $workDir.'\\\\'.$subDir, $cwd.'\\\\'.$workDir.'\\\\'.$subDir, - + // Unixified Dir $unixifiedDir, - + ); - + foreach($dirs as $dir) { - echo "-- creating $dir --\n"; + echo "-- creating $dir --\n"; $res = mkdir($dir); if ($res === true) { echo "Directory created\n"; diff --git a/ext/standard/tests/file/mkdir_variation5.phpt b/ext/standard/tests/file/mkdir_variation5.phpt index 8a02fe1d67..d7646a2a4f 100644 --- a/ext/standard/tests/file/mkdir_variation5.phpt +++ b/ext/standard/tests/file/mkdir_variation5.phpt @@ -6,13 +6,13 @@ Dave Kelsey <d_kelsey@uk.ibm.com> <?php if(substr(PHP_OS, 0, 3) == "WIN") die("skip Not valid for Windows"); -?> +?> --FILE-- <?php /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) * Description: Create a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mkdir() : variation ***\n"; @@ -27,11 +27,11 @@ $dirs = array( $workDir.'/'.$subDir, './'.$workDir.'/'.$subDir, $workDir.'/../'.$workDir.'/'.$subDir, - + // relative bad path $workDir.'/../BADDIR/'.$subDir, 'BADDIR/'.$subDir, - + //absolute $cwd.'/'.$workDir.'/'.$subDir, $cwd.'/./'.$workDir.'/'.$subDir, @@ -39,20 +39,20 @@ $dirs = array( //absolute bad path $cwd.'/BADDIR/'.$subDir, - + //trailing separators $workDir.'/'.$subDir.'/', $cwd.'/'.$workDir.'/'.$subDir.'/', - + // multiple separators $workDir.'//'.$subDir, $cwd.'//'.$workDir.'//'.$subDir, - + ); - + foreach($dirs as $dir) { - echo "-- creating $dir --\n"; + echo "-- creating $dir --\n"; $res = mkdir($dir); if ($res === true) { echo "Directory created\n"; diff --git a/ext/standard/tests/file/parse_ini_file.phpt b/ext/standard/tests/file/parse_ini_file.phpt index 439fcaf301..88633bd451 100644 --- a/ext/standard/tests/file/parse_ini_file.phpt +++ b/ext/standard/tests/file/parse_ini_file.phpt @@ -71,7 +71,7 @@ Non_alpha12 = \ ;Non_alpha17 = ~ ;Non_alpha18 = ! ;Non_alpha19 = $ -;Non_alpha20 = () +;Non_alpha20 = () Non_alpha1_quotes = ";" Non_alpha2_quotes = "+" diff --git a/ext/standard/tests/file/parse_ini_file_error.phpt b/ext/standard/tests/file/parse_ini_file_error.phpt index 14990b2606..49636b1bb1 100644 --- a/ext/standard/tests/file/parse_ini_file_error.phpt +++ b/ext/standard/tests/file/parse_ini_file_error.phpt @@ -5,7 +5,7 @@ Test parse_ini_file() function : error conditions /* Prototype : proto array parse_ini_file(string filename [, bool process_sections]) * Description: Parse configuration file * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_ini_file() : error conditions ***\n"; @@ -23,7 +23,7 @@ var_dump( parse_ini_file($filename, $process_sections, $extra_arg) ); echo "\n-- Testing parse_ini_file() function with a non-existent file --\n"; $filename = __FILE__ . 'invalidfilename'; -var_dump( parse_ini_file($filename, $process_sections) ); +var_dump( parse_ini_file($filename, $process_sections) ); echo "Done"; ?> diff --git a/ext/standard/tests/file/parse_ini_file_variation1.phpt b/ext/standard/tests/file/parse_ini_file_variation1.phpt index a24bc1c051..4e76d5133d 100644 --- a/ext/standard/tests/file/parse_ini_file_variation1.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation1.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : array parse_ini_file(string filename [, bool process_sections]) * Description: Parse configuration file * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_ini_file() : variation ***\n"; diff --git a/ext/standard/tests/file/parse_ini_file_variation2.phpt b/ext/standard/tests/file/parse_ini_file_variation2.phpt index 20ad6bb067..09e18d8c0c 100644 --- a/ext/standard/tests/file/parse_ini_file_variation2.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation2.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : array parse_ini_file(string filename [, bool process_sections]) * Description: Parse configuration file * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_ini_file() : variation ***\n"; diff --git a/ext/standard/tests/file/parse_ini_file_variation3.phpt b/ext/standard/tests/file/parse_ini_file_variation3.phpt index 43b0274ea9..c0a3bd777d 100644 --- a/ext/standard/tests/file/parse_ini_file_variation3.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation3.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : array parse_ini_file(string filename [, bool process_sections]) * Description: Parse configuration file * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_ini_file() : variation ***\n"; @@ -32,7 +32,7 @@ foreach($newdirs as $newdir) { set_include_path($newIncludePath); $path = get_include_path(); echo "New include path is : " . $path . "\n"; - + $output_file = $dir2."/".$iniFile; $iniContent = <<<FILE error_reporting = E_ALL diff --git a/ext/standard/tests/file/parse_ini_file_variation4.phpt b/ext/standard/tests/file/parse_ini_file_variation4.phpt index 66cab3bedc..5af6631804 100644 --- a/ext/standard/tests/file/parse_ini_file_variation4.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation4.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : array parse_ini_file(string filename [, bool process_sections]) * Description: Parse configuration file * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_ini_file() : usage variation ***\n"; diff --git a/ext/standard/tests/file/parse_ini_file_variation5.phpt b/ext/standard/tests/file/parse_ini_file_variation5.phpt index 52b5d02764..2dbff79701 100644 --- a/ext/standard/tests/file/parse_ini_file_variation5.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation5.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : array parse_ini_file(string filename [, bool process_sections]) * Description: Parse configuration file * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_ini_file() : usage variation ***\n"; diff --git a/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt b/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt index 4e5d4347e4..b7833fa2e8 100644 --- a/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") /* Prototype : array parse_ini_file(string filename [, bool process_sections]) * Description: Parse configuration file * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_ini_file() : variation ***\n"; @@ -35,14 +35,14 @@ $allDirs = array( "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir, "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir, "$absSubDir\\BADDIR", - + // relative paths $mainDir."\\".$subDir, $mainDir."\\\\".$subDir, $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, - "BADDIR", - + "BADDIR", + // unixifed path $unixifiedDir, ); diff --git a/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt b/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt index 6dfbee990a..8b5f1a5b6e 100644 --- a/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") /* Prototype : array parse_ini_file(string filename [, bool process_sections]) * Description: Parse configuration file * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_ini_file() : variation ***\n"; @@ -35,14 +35,14 @@ $allDirs = array( "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir, "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir, "$absSubDir\\BADDIR", - + // relative paths $mainDir."\\".$subDir, $mainDir."\\\\".$subDir, $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, - "BADDIR", - + "BADDIR", + // unixifed path $unixifiedDir, ); diff --git a/ext/standard/tests/file/parse_ini_file_variation6.phpt b/ext/standard/tests/file/parse_ini_file_variation6.phpt index e9844e905a..4726ddafb5 100644 --- a/ext/standard/tests/file/parse_ini_file_variation6.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation6.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : array parse_ini_file(string filename [, bool process_sections]) * Description: Parse configuration file * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_ini_file() : variation ***\n"; @@ -29,14 +29,14 @@ $allDirs = array( "$absSubDir/../../".$mainDir."/./".$subDir, "$absSubDir/..///".$subDir."//..//../".$subDir, "$absSubDir/BADDIR", - + // relative paths $mainDir."/".$subDir, $mainDir."//".$subDir, $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, - "BADDIR", - + "BADDIR", + ); $filename = 'ParseIniFileVar6.ini'; diff --git a/ext/standard/tests/file/pathinfo_basic.phpt b/ext/standard/tests/file/pathinfo_basic.phpt index 0ab4776e02..48d01dd66c 100644 --- a/ext/standard/tests/file/pathinfo_basic.phpt +++ b/ext/standard/tests/file/pathinfo_basic.phpt @@ -45,7 +45,7 @@ $paths = array ( /* Testing with homedir notation */ "~/PHP/php5.2.0/", - + /* Testing normal directory notation */ "/home/example/test/", "http://httpd.apache.org/core.html#acceptpathinfo" diff --git a/ext/standard/tests/file/pathinfo_basic2-win32.phpt b/ext/standard/tests/file/pathinfo_basic2-win32.phpt index 4c2fd2cacf..5a88b648d3 100644 --- a/ext/standard/tests/file/pathinfo_basic2-win32.phpt +++ b/ext/standard/tests/file/pathinfo_basic2-win32.phpt @@ -31,7 +31,7 @@ $paths = array ( '..', '...', '/usr/lib/.../afile' - + ); $counter = 1; diff --git a/ext/standard/tests/file/pathinfo_basic2.phpt b/ext/standard/tests/file/pathinfo_basic2.phpt index 4087c6d445..0df852eb18 100644 --- a/ext/standard/tests/file/pathinfo_basic2.phpt +++ b/ext/standard/tests/file/pathinfo_basic2.phpt @@ -31,7 +31,7 @@ $paths = array ( '..', '...', '/usr/lib/.../afile' - + ); $counter = 1; diff --git a/ext/standard/tests/file/pathinfo_variation1.phpt b/ext/standard/tests/file/pathinfo_variation1.phpt index ff4c1eb818..75ad224de8 100644 --- a/ext/standard/tests/file/pathinfo_variation1.phpt +++ b/ext/standard/tests/file/pathinfo_variation1.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : array pathinfo(string path[, int options]) * Description: Returns information about a certain string * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing pathinfo() : usage variation ***\n"; diff --git a/ext/standard/tests/file/pathinfo_variation2.phpt b/ext/standard/tests/file/pathinfo_variation2.phpt index 84c8243369..38d05b50b6 100644 --- a/ext/standard/tests/file/pathinfo_variation2.phpt +++ b/ext/standard/tests/file/pathinfo_variation2.phpt @@ -9,7 +9,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : array pathinfo(string path[, int options]) * Description: Returns information about a certain string * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing pathinfo() : usage variation ***\n"; diff --git a/ext/standard/tests/file/pathinfo_variation3.phpt b/ext/standard/tests/file/pathinfo_variation3.phpt index 333aa56838..01fb0a7377 100644 --- a/ext/standard/tests/file/pathinfo_variation3.phpt +++ b/ext/standard/tests/file/pathinfo_variation3.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : array pathinfo(string path[, int options]) * Description: Returns information about a certain string * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing pathinfo() : usage variation ***\n"; diff --git a/ext/standard/tests/file/pathinfo_variaton.phpt b/ext/standard/tests/file/pathinfo_variaton.phpt index d6c6c774b4..421f378e01 100644 --- a/ext/standard/tests/file/pathinfo_variaton.phpt +++ b/ext/standard/tests/file/pathinfo_variaton.phpt @@ -57,7 +57,7 @@ $paths = array ( /* pathname as NULL */ NULL, null, - + /* filename as resource */ $fp, diff --git a/ext/standard/tests/file/pclose_variation1.phpt b/ext/standard/tests/file/pclose_variation1.phpt index 2a3251bd36..3fdba4cf12 100644 --- a/ext/standard/tests/file/pclose_variation1.phpt +++ b/ext/standard/tests/file/pclose_variation1.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int pclose(resource fp) - * Description: Close a file pointer opened by popen() + * Description: Close a file pointer opened by popen() * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing pclose() : usage variation ***\n"; diff --git a/ext/standard/tests/file/php_fd_wrapper_04.phpt b/ext/standard/tests/file/php_fd_wrapper_04.phpt index 51f4d9f171..1c5defdaef 100644 --- a/ext/standard/tests/file/php_fd_wrapper_04.phpt +++ b/ext/standard/tests/file/php_fd_wrapper_04.phpt @@ -1,7 +1,7 @@ --TEST-- php://fd wrapper: invalid file descriptor --SKIPIF-- -<?php include('skipif.inc'); +<?php include('skipif.inc'); if(substr(PHP_OS, 0, 3) == "WIN") die("skip Not for Windows"); diff --git a/ext/standard/tests/file/proc_open01.phpt b/ext/standard/tests/file/proc_open01.phpt index 28e68a2477..66c601fb91 100644 --- a/ext/standard/tests/file/proc_open01.phpt +++ b/ext/standard/tests/file/proc_open01.phpt @@ -4,10 +4,10 @@ proc_open() regression test 1 (proc_open() leak) <?php $pipes = array(1, 2, 3); $orig_pipes = $pipes; -$php = getenv('TEST_PHP_EXECUTABLE'); +$php = getenv('TEST_PHP_EXECUTABLE'); if ($php === false) { die("no php executable defined"); -} +} $proc = proc_open( "$php -n", array(0 => array('pipe', 'r'), 1 => array('pipe', 'w')), @@ -24,7 +24,7 @@ fflush($pipes[0]); fclose($pipes[0]); $cnt = ''; $n=0; -for ($left = strlen($test_string); $left > 0;) { +for ($left = strlen($test_string); $left > 0;) { if (++$n >1000) { print "terminated after 1000 iterations\n"; break; diff --git a/ext/standard/tests/file/readfile_variation10-win32.phpt b/ext/standard/tests/file/readfile_variation10-win32.phpt index 61f6aba7a5..24a5af8ad8 100644 --- a/ext/standard/tests/file/readfile_variation10-win32.phpt +++ b/ext/standard/tests/file/readfile_variation10-win32.phpt @@ -12,14 +12,14 @@ if(substr(PHP_OS, 0, 3) != "WIN") /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) * Description: Output a file or a URL * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing readfile() : variation ***\n"; -/* An array of files */ +/* An array of files */ $names_arr = array( - /* Invalid args */ + /* Invalid args */ "-1" => -1, "TRUE" => TRUE, "FALSE" => FALSE, @@ -30,7 +30,7 @@ $names_arr = array( "array()" => array(), /* prefix with path separator of a non existing directory*/ - "/no/such/file/dir" => "/no/such/file/dir", + "/no/such/file/dir" => "/no/such/file/dir", "php/php"=> "php/php" ); diff --git a/ext/standard/tests/file/readfile_variation4.phpt b/ext/standard/tests/file/readfile_variation4.phpt index 798a065073..48a3c3084e 100644 --- a/ext/standard/tests/file/readfile_variation4.phpt +++ b/ext/standard/tests/file/readfile_variation4.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) * Description: Output a file or a URL * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing readfile() : usage variation ***\n"; @@ -107,7 +107,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // file resource 'file resource' => $fileRes, ); diff --git a/ext/standard/tests/file/readfile_variation5.phpt b/ext/standard/tests/file/readfile_variation5.phpt index 8c95ce8486..7afe9ba71b 100644 --- a/ext/standard/tests/file/readfile_variation5.phpt +++ b/ext/standard/tests/file/readfile_variation5.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) * Description: Output a file or a URL * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing readfile() : usage variation ***\n"; diff --git a/ext/standard/tests/file/readfile_variation6.phpt b/ext/standard/tests/file/readfile_variation6.phpt index 02e708220c..1a87ac785c 100644 --- a/ext/standard/tests/file/readfile_variation6.phpt +++ b/ext/standard/tests/file/readfile_variation6.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) * Description: Output a file or a URL * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ require_once('fopen_include_path.inc'); @@ -39,7 +39,7 @@ function runtest() { fclose($h); readfile($filename, true); echo "\n"; - unlink($secondFile); + unlink($secondFile); } ?> diff --git a/ext/standard/tests/file/readfile_variation7.phpt b/ext/standard/tests/file/readfile_variation7.phpt index d26f52f492..9f6b145ad0 100644 --- a/ext/standard/tests/file/readfile_variation7.phpt +++ b/ext/standard/tests/file/readfile_variation7.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) * Description: Output a file or a URL * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ require_once('fopen_include_path.inc'); @@ -39,7 +39,7 @@ function runtest() { fclose($h); readfile($filename, true); echo "\n"; - unlink($scriptLocFile); + unlink($scriptLocFile); } ?> diff --git a/ext/standard/tests/file/readfile_variation8-win32-mb.phpt b/ext/standard/tests/file/readfile_variation8-win32-mb.phpt index e53f362367..1eecda4619 100644 --- a/ext/standard/tests/file/readfile_variation8-win32-mb.phpt +++ b/ext/standard/tests/file/readfile_variation8-win32-mb.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) * Description: Output a file or a URL * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing readfile() : variation ***\n"; @@ -44,14 +44,14 @@ $allDirs = array( "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir, "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir, "$absSubDir\\BADDIR", - + // relative paths $mainDir."\\".$subDir, $mainDir."\\\\".$subDir, $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, - "BADDIR", - + "BADDIR", + // unixifed path $unixifiedDir, ); diff --git a/ext/standard/tests/file/readfile_variation8-win32.phpt b/ext/standard/tests/file/readfile_variation8-win32.phpt index a66af5d25b..c4672041b9 100644 --- a/ext/standard/tests/file/readfile_variation8-win32.phpt +++ b/ext/standard/tests/file/readfile_variation8-win32.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) * Description: Output a file or a URL * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing readfile() : variation ***\n"; @@ -44,14 +44,14 @@ $allDirs = array( "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir, "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir, "$absSubDir\\BADDIR", - + // relative paths $mainDir."\\".$subDir, $mainDir."\\\\".$subDir, $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, - "BADDIR", - + "BADDIR", + // unixifed path $unixifiedDir, ); diff --git a/ext/standard/tests/file/readfile_variation9.phpt b/ext/standard/tests/file/readfile_variation9.phpt index c802f4018a..dca4d4a794 100644 --- a/ext/standard/tests/file/readfile_variation9.phpt +++ b/ext/standard/tests/file/readfile_variation9.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) * Description: Output a file or a URL * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing readfile() : variation ***\n"; @@ -38,14 +38,14 @@ $allDirs = array( "$absSubDir/../../".$mainDir."/./".$subDir, "$absSubDir/..///".$subDir."//..//../".$subDir, "$absSubDir/BADDIR", - - + + // relative paths $mainDir."/".$subDir, $mainDir."//".$subDir, $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, - "BADDIR", + "BADDIR", ); for($i = 0; $i<count($allDirs); $i++) { diff --git a/ext/standard/tests/file/readlink_realpath_basic1.phpt b/ext/standard/tests/file/readlink_realpath_basic1.phpt index 99195e2b24..6efe7f2d49 100644 --- a/ext/standard/tests/file/readlink_realpath_basic1.phpt +++ b/ext/standard/tests/file/readlink_realpath_basic1.phpt @@ -26,7 +26,7 @@ fclose($file_handle1); fclose($file_handle2); fclose($file_handle3); -symlink("$file_path/readlink_realpath_basic1/home/test/readlink_realpath_basic1.tmp", +symlink("$file_path/readlink_realpath_basic1/home/test/readlink_realpath_basic1.tmp", "$file_path/readlink_realpath_basic1/home/test/readlink_realpath_basic1_link.tmp"); symlink("$file_path/readlink_realpath_basic1/home/readlink_realpath_basic1.tmp", "$file_path/readlink_realpath_basic1/home/readlink_realpath_basic1_link.tmp"); @@ -38,7 +38,7 @@ $linknames = array ( "$file_path/readlink_realpath_basic1/home/readlink_realpath_basic1_link.tmp", "$file_path/readlink_realpath_basic1/home/test/readlink_realpath_basic1_link.tmp", "$file_path/readlink_realpath_basic1//home/test//../test/./readlink_realpath_basic1_link.tmp", - + /* linknames with invalid linkpath */ "$file_path///readlink_realpath_basic1/home//..//././test//readlink_realpath_basic1_link.tmp", "$file_path/readlink_realpath_basic1/home/../home/../test/../readlink_realpath_basic1_link.tmp", diff --git a/ext/standard/tests/file/readlink_realpath_variation1.phpt b/ext/standard/tests/file/readlink_realpath_variation1.phpt index 341e39a9de..ccf0ded7f5 100644 --- a/ext/standard/tests/file/readlink_realpath_variation1.phpt +++ b/ext/standard/tests/file/readlink_realpath_variation1.phpt @@ -37,29 +37,29 @@ $obj2 = new object_temp("$name_prefix/readlink_realpath_variation1/home/../../// echo "\n-- Testing readlink() and realpath() with softlink, linkname stored inside an object --\n"; // creating the links -var_dump( symlink($filename, $obj1->linkname) ); -var_dump( readlink($obj1->linkname) ); +var_dump( symlink($filename, $obj1->linkname) ); +var_dump( readlink($obj1->linkname) ); var_dump( realpath($obj1->linkname) ); -var_dump( symlink($filename, $obj2->linkname) ); +var_dump( symlink($filename, $obj2->linkname) ); var_dump( readlink($obj2->linkname) ); var_dump( realpath($obj2->linkname) ); // deleting the link unlink($obj1->linkname); -unlink($obj2->linkname); +unlink($obj2->linkname); echo "\n-- Testing readlink() and realpath() with hardlink, linkname stored inside an object --\n"; // creating hard links -var_dump( link($filename, $obj1->linkname) ); +var_dump( link($filename, $obj1->linkname) ); var_dump( readlink($obj1->linkname) ); // invalid because readlink doesn't work with hardlink var_dump( realpath($obj1->linkname) ); -var_dump( link($filename, $obj2->linkname) ); +var_dump( link($filename, $obj2->linkname) ); var_dump( readlink($obj2->linkname) ); // invalid because readlink doesn't work with hardlink var_dump( realpath($obj2->linkname) ); // delete the links unlink($obj1->linkname); -unlink($obj2->linkname); +unlink($obj2->linkname); echo "Done\n"; ?> diff --git a/ext/standard/tests/file/readlink_realpath_variation2.phpt b/ext/standard/tests/file/readlink_realpath_variation2.phpt index 0e748576ae..f4a9c554ad 100644 --- a/ext/standard/tests/file/readlink_realpath_variation2.phpt +++ b/ext/standard/tests/file/readlink_realpath_variation2.phpt @@ -32,30 +32,30 @@ $link_arr = array ( echo "\n-- Testing readlink() and realpath() with softlink, linkname stored inside an array --\n"; // creating the links -var_dump( symlink($filename, $link_arr[0]) ); -var_dump( readlink($link_arr[0]) ); -var_dump( realpath($link_arr[0]) ); -var_dump( symlink($filename, $link_arr[1]) ); +var_dump( symlink($filename, $link_arr[0]) ); +var_dump( readlink($link_arr[0]) ); +var_dump( realpath($link_arr[0]) ); +var_dump( symlink($filename, $link_arr[1]) ); var_dump( readlink($link_arr[1]) ); var_dump( realpath($link_arr[1]) ); // deleting the link unlink($link_arr[0]); -unlink($link_arr[1]); +unlink($link_arr[1]); echo "\n-- Testing readlink() and realpath() with hardlink, linkname stored inside an array --\n"; // creating hard links -var_dump( link($filename, $link_arr[0]) ); +var_dump( link($filename, $link_arr[0]) ); var_dump( readlink($link_arr[0]) ); // invalid because readlink doesn't work with hardlink var_dump( realpath($link_arr[0]) ); -var_dump( link($filename, $link_arr[1]) ); +var_dump( link($filename, $link_arr[1]) ); var_dump( readlink($link_arr[1]) ); // invalid because readlink doesn't work with hardlink var_dump( realpath($link_arr[1]) ); // delete the links unlink($link_arr[0]); -unlink($link_arr[1]); - +unlink($link_arr[1]); + echo "Done\n"; ?> --CLEAN-- diff --git a/ext/standard/tests/file/readlink_realpath_variation3.phpt b/ext/standard/tests/file/readlink_realpath_variation3.phpt index 3766a5b43a..58e58237ef 100644 --- a/ext/standard/tests/file/readlink_realpath_variation3.phpt +++ b/ext/standard/tests/file/readlink_realpath_variation3.phpt @@ -16,7 +16,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { */ echo "*** Testing readlink() and realpath() : usage variations ***\n"; - + echo "\n*** Testing readlink() and realpath() with linkname as empty string, NULL and single space ***\n"; $link_string = array ( /* linkname as spaces */ @@ -34,8 +34,8 @@ for($loop_counter = 0; $loop_counter < count($link_string); $loop_counter++) { echo $loop_counter + 1; echo " --\n"; - var_dump( readlink($link_string[$loop_counter]) ); - var_dump( realpath($link_string[$loop_counter]) ); + var_dump( readlink($link_string[$loop_counter]) ); + var_dump( realpath($link_string[$loop_counter]) ); } echo "Done\n"; diff --git a/ext/standard/tests/file/readlink_variation1.phpt b/ext/standard/tests/file/readlink_variation1.phpt index d4f1a5ff02..c66e2a4265 100644 --- a/ext/standard/tests/file/readlink_variation1.phpt +++ b/ext/standard/tests/file/readlink_variation1.phpt @@ -27,12 +27,12 @@ $filenames = array( FALSE, NULL, $file_handle, - + /* scalars */ 1234, 0 ); - + /* loop through to test each element the above array */ foreach( $filenames as $filename ) { var_dump( readlink($filename) ); diff --git a/ext/standard/tests/file/realpath_cache.phpt b/ext/standard/tests/file/realpath_cache.phpt index 0eb9dc519a..f16995eaa2 100644 --- a/ext/standard/tests/file/realpath_cache.phpt +++ b/ext/standard/tests/file/realpath_cache.phpt @@ -15,7 +15,7 @@ var_dump($data[__DIR__]); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(%d) array(4) { ["key"]=> diff --git a/ext/standard/tests/file/realpath_cache_win32.phpt b/ext/standard/tests/file/realpath_cache_win32.phpt index fa5f22c3b5..a5103b20ef 100644 --- a/ext/standard/tests/file/realpath_cache_win32.phpt +++ b/ext/standard/tests/file/realpath_cache_win32.phpt @@ -15,7 +15,7 @@ var_dump($data[__FILE__]); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(%d) array(8) { ["key"]=> diff --git a/ext/standard/tests/file/realpath_variation-win32-mb.phpt b/ext/standard/tests/file/realpath_variation-win32-mb.phpt index 66d7c8b0c7..25ea530894 100644 --- a/ext/standard/tests/file/realpath_variation-win32-mb.phpt +++ b/ext/standard/tests/file/realpath_variation-win32-mb.phpt @@ -43,7 +43,7 @@ $file_arr = array ( "$name_prefix/./realpath_variation_私はガラスを食べられます/home/../home//tests//..//..//..//home//realpath_variation_私はガラスを食べられます.tmp/" ); -var_dump( realpath($file_arr[0]) ); +var_dump( realpath($file_arr[0]) ); var_dump( realpath($file_arr[1]) ); echo "\n*** Testing realpath() with filename as empty string, NULL and single space ***\n"; @@ -62,7 +62,7 @@ for($loop_counter = 0; $loop_counter < count($file_string); $loop_counter++) { echo "-- Iteration"; echo $loop_counter + 1; echo " --\n"; - var_dump( realpath($file_string[$loop_counter]) ); + var_dump( realpath($file_string[$loop_counter]) ); } echo "Done\n"; diff --git a/ext/standard/tests/file/realpath_variation-win32.phpt b/ext/standard/tests/file/realpath_variation-win32.phpt index f58f618993..8049d4c69a 100644 --- a/ext/standard/tests/file/realpath_variation-win32.phpt +++ b/ext/standard/tests/file/realpath_variation-win32.phpt @@ -43,7 +43,7 @@ $file_arr = array ( "$name_prefix/./realpath_variation/home/../home//tests//..//..//..//home//realpath_variation.tmp/" ); -var_dump( realpath($file_arr[0]) ); +var_dump( realpath($file_arr[0]) ); var_dump( realpath($file_arr[1]) ); echo "\n*** Testing realpath() with filename as empty string, NULL and single space ***\n"; @@ -62,7 +62,7 @@ for($loop_counter = 0; $loop_counter < count($file_string); $loop_counter++) { echo "-- Iteration"; echo $loop_counter + 1; echo " --\n"; - var_dump( realpath($file_string[$loop_counter]) ); + var_dump( realpath($file_string[$loop_counter]) ); } echo "Done\n"; diff --git a/ext/standard/tests/file/realpath_variation2.phpt b/ext/standard/tests/file/realpath_variation2.phpt index a5031aa7b5..fe3057ad19 100644 --- a/ext/standard/tests/file/realpath_variation2.phpt +++ b/ext/standard/tests/file/realpath_variation2.phpt @@ -12,21 +12,21 @@ if(substr(PHP_OS, 0, 3) == 'WIN' ) /* Prototype : string realpath(string path) * Description: Return the resolved path * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing realpath() : variation ***\n"; -$paths = array('c:\\', - 'c:', +$paths = array('c:\\', + 'c:', 'c' , '\\' , - '/', - 'c:temp', - 'c:\\/', + '/', + 'c:temp', + 'c:\\/', '/tmp/', - '/tmp/\\', - '\\tmp', + '/tmp/\\', + '\\tmp', '\\tmp\\'); foreach($paths as $path) { diff --git a/ext/standard/tests/file/rename_basic.phpt b/ext/standard/tests/file/rename_basic.phpt index c589c514e4..238333e776 100644 --- a/ext/standard/tests/file/rename_basic.phpt +++ b/ext/standard/tests/file/rename_basic.phpt @@ -25,7 +25,7 @@ var_dump( file_exists($dest_name) ); // expecting true $new_stat = stat("$file_path/rename_basic_new.tmp"); // checking statistics of old and renamed file - both should be same except ctime -$keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, +$keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, "dev", "ino", "mode", "nlink", "uid", "gid", "rdev", "size", "atime", "mtime", "blksize", "blocks"); var_dump( compare_stats($old_stat, $new_stat, $keys_to_compare) ); diff --git a/ext/standard/tests/file/rename_error.phpt b/ext/standard/tests/file/rename_error.phpt index fae2b4f373..e0ea2043c9 100644 --- a/ext/standard/tests/file/rename_error.phpt +++ b/ext/standard/tests/file/rename_error.phpt @@ -8,7 +8,7 @@ Test rename() function: error conditions echo "*** Testing rename() for error conditions ***\n"; //Zero argument -var_dump( rename() ); +var_dump( rename() ); // less than expected,1 argument var_dump( rename(__FILE__) ); @@ -17,7 +17,7 @@ var_dump( rename(__FILE__) ); $context = stream_context_create(); $filename = __FILE__; $new_filename = __FILE__.".tmp"; -var_dump( rename($filename, $new_filename, $context, "extra_args") ); +var_dump( rename($filename, $new_filename, $context, "extra_args") ); echo "Done\n"; ?> diff --git a/ext/standard/tests/file/rename_variation-win32.phpt b/ext/standard/tests/file/rename_variation-win32.phpt index a10c6dfbe7..bc3ff2123f 100644 --- a/ext/standard/tests/file/rename_variation-win32.phpt +++ b/ext/standard/tests/file/rename_variation-win32.phpt @@ -45,12 +45,12 @@ foreach($src_filenames as $src_filename) { var_dump( file_exists($src_filename) ); // expecting false var_dump( file_exists($dest_filename) ); // expecting true $counter++; - + // unlink the file unlink($dest_filename); } -rmdir("$file_path/rename_variation"); +rmdir("$file_path/rename_variation"); echo "Done\n"; ?> diff --git a/ext/standard/tests/file/rename_variation.phpt b/ext/standard/tests/file/rename_variation.phpt index 00dc309982..c19aeee343 100644 --- a/ext/standard/tests/file/rename_variation.phpt +++ b/ext/standard/tests/file/rename_variation.phpt @@ -37,13 +37,13 @@ foreach($src_filenames as $src_filename) { var_dump( file_exists($src_filename) ); // expecting false var_dump( file_exists($dest_filename) ); // expecting true $counter++; - + // unlink the file unlink($dest_filename); } // clean the temp dir and file -rmdir("$file_path/rename_variation"); +rmdir("$file_path/rename_variation"); echo "Done\n"; ?> diff --git a/ext/standard/tests/file/rename_variation10.phpt b/ext/standard/tests/file/rename_variation10.phpt index f84adc890a..1ba349899b 100644 --- a/ext/standard/tests/file/rename_variation10.phpt +++ b/ext/standard/tests/file/rename_variation10.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : bool rename(string old_name, string new_name[, resource context]) * Description: Rename a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing rename() : usage variation ***\n"; @@ -104,7 +104,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // file resource 'file resource' => $fileRes, ); diff --git a/ext/standard/tests/file/rename_variation11-win32.phpt b/ext/standard/tests/file/rename_variation11-win32.phpt index c13a09a951..f46504d8fb 100644 --- a/ext/standard/tests/file/rename_variation11-win32.phpt +++ b/ext/standard/tests/file/rename_variation11-win32.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") /* Prototype : bool rename(string old_name, string new_name[, resource context]) * Description: Rename a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing rename() with absolute and relative paths ***\n"; @@ -39,14 +39,14 @@ $allDirs = array( "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir, "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir, "$absSubDir\\BADDIR", - + // relative paths $mainDir."\\".$subDir, $mainDir."\\\\".$subDir, $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, - "BADDIR", - + "BADDIR", + // unixifed path $unixifiedDir, ); diff --git a/ext/standard/tests/file/rename_variation12-win32.phpt b/ext/standard/tests/file/rename_variation12-win32.phpt index de5fc14004..9a1367cc6a 100644 --- a/ext/standard/tests/file/rename_variation12-win32.phpt +++ b/ext/standard/tests/file/rename_variation12-win32.phpt @@ -11,7 +11,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') die('skip.. for Windows'); /* Prototype : bool rename(string old_name, string new_name[, resource context]) * Description: Rename a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ /* Creating unique files in various dirs by passing relative paths to $dir arg */ @@ -38,14 +38,14 @@ $allDirs = array( "$absSubDir/../../".$mainDir."/./".$subDir, "$absSubDir/..///".$subDir."//..//../".$subDir, "$absSubDir/BADDIR", - - + + // relative paths $mainDir."/".$subDir, $mainDir."//".$subDir, $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, - "BADDIR", + "BADDIR", ); for($i = 0; $i<count($allDirs); $i++) { diff --git a/ext/standard/tests/file/rename_variation12.phpt b/ext/standard/tests/file/rename_variation12.phpt index 168beeffc9..8f3a65acad 100644 --- a/ext/standard/tests/file/rename_variation12.phpt +++ b/ext/standard/tests/file/rename_variation12.phpt @@ -11,7 +11,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') die('skip.. not for Windows'); /* Prototype : bool rename(string old_name, string new_name[, resource context]) * Description: Rename a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ /* Creating unique files in various dirs by passing relative paths to $dir arg */ @@ -38,14 +38,14 @@ $allDirs = array( "$absSubDir/../../".$mainDir."/./".$subDir, "$absSubDir/..///".$subDir."//..//../".$subDir, "$absSubDir/BADDIR", - - + + // relative paths $mainDir."/".$subDir, $mainDir."//".$subDir, $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, - "BADDIR", + "BADDIR", ); for($i = 0; $i<count($allDirs); $i++) { diff --git a/ext/standard/tests/file/rename_variation13.phpt b/ext/standard/tests/file/rename_variation13.phpt index ec1ee7c78d..29e13efbb8 100644 --- a/ext/standard/tests/file/rename_variation13.phpt +++ b/ext/standard/tests/file/rename_variation13.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") /* Prototype : bool rename(string old_name, string new_name[, resource context]) * Description: Rename a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing rename() with obscure files ***\n"; @@ -21,9 +21,9 @@ $aFile = $file_path.'/afile.tmp'; mkdir($file_path); -/* An array of files */ +/* An array of files */ $names_arr = array( - /* Invalid args */ + /* Invalid args */ -1, TRUE, FALSE, @@ -34,7 +34,7 @@ $names_arr = array( array(), /* prefix with path separator of a non existing directory*/ - "/no/such/file/dir", + "/no/such/file/dir", "php/php" ); diff --git a/ext/standard/tests/file/rename_variation3-win32.phpt b/ext/standard/tests/file/rename_variation3-win32.phpt index b5da587811..5f071fb5b9 100644 --- a/ext/standard/tests/file/rename_variation3-win32.phpt +++ b/ext/standard/tests/file/rename_variation3-win32.phpt @@ -16,13 +16,13 @@ require dirname(__FILE__).'/file.inc'; /* creating directory */ $file_path = dirname(__FILE__); -$dirname = "$file_path/rename_variation3_dir"; +$dirname = "$file_path/rename_variation3_dir"; mkdir($dirname); /* test rename() by trying to rename an existing file/dir to the same name and one another */ -$filename = "$file_path/rename_variation3.tmp"; +$filename = "$file_path/rename_variation3.tmp"; $fp = fopen($filename, "w"); if (!$fp) { die("Cannot create $filename\n"); diff --git a/ext/standard/tests/file/rename_variation5.phpt b/ext/standard/tests/file/rename_variation5.phpt index 2518cf48ea..e352b7cf0d 100644 --- a/ext/standard/tests/file/rename_variation5.phpt +++ b/ext/standard/tests/file/rename_variation5.phpt @@ -13,10 +13,10 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { and one another */ // create a dir $file_path = dirname(__FILE__); -$dirname = "$file_path/rename_variation5_dir"; +$dirname = "$file_path/rename_variation5_dir"; mkdir($dirname); //create a file -$filename = "$file_path/rename_variation5.tmp"; +$filename = "$file_path/rename_variation5.tmp"; $fp = fopen($filename, "w"); fclose($fp); // create a link diff --git a/ext/standard/tests/file/rename_variation6-win32.phpt b/ext/standard/tests/file/rename_variation6-win32.phpt index dfb57f2e19..9129bd871e 100644 --- a/ext/standard/tests/file/rename_variation6-win32.phpt +++ b/ext/standard/tests/file/rename_variation6-win32.phpt @@ -34,7 +34,7 @@ var_dump(file_exists($tmp_file)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: readlink(): %s in %s on line %d bool(false) string(%d) "%srename_variation6-win32.php.tmp" diff --git a/ext/standard/tests/file/rename_variation6.phpt b/ext/standard/tests/file/rename_variation6.phpt index 413dc6e045..3385d14134 100644 --- a/ext/standard/tests/file/rename_variation6.phpt +++ b/ext/standard/tests/file/rename_variation6.phpt @@ -28,7 +28,7 @@ var_dump(file_exists($tmp_file)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: readlink(): No such file or directory in %s on line %d bool(false) string(%d) "%srename_variation6.php.tmp" diff --git a/ext/standard/tests/file/rename_variation7-win32.phpt b/ext/standard/tests/file/rename_variation7-win32.phpt index b1a04b38c6..845728627b 100644 --- a/ext/standard/tests/file/rename_variation7-win32.phpt +++ b/ext/standard/tests/file/rename_variation7-win32.phpt @@ -25,7 +25,7 @@ var_dump(readlink($tmp_link2)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: symlink(): No such file or directory in %srename_variation7-win32.php on line %d Warning: readlink(): readlink failed to read the symbolic link (%srename_variation7-win32.php.tmp.link), error 2) in %srename_variation7-win32.php on line %d diff --git a/ext/standard/tests/file/rename_variation7.phpt b/ext/standard/tests/file/rename_variation7.phpt index 5b937728f8..dc5ce429b6 100644 --- a/ext/standard/tests/file/rename_variation7.phpt +++ b/ext/standard/tests/file/rename_variation7.phpt @@ -24,7 +24,7 @@ var_dump(readlink($tmp_link2)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: readlink(): No such file or directory in %s on line %d bool(false) string(%d) "%sthere_is_no_such_file" diff --git a/ext/standard/tests/file/rmdir_variation1-win32.phpt b/ext/standard/tests/file/rmdir_variation1-win32.phpt index 2516e6162e..9e55ab43c3 100644 --- a/ext/standard/tests/file/rmdir_variation1-win32.phpt +++ b/ext/standard/tests/file/rmdir_variation1-win32.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") /* Prototype : bool rmdir(string dirname[, resource context]) * Description: Remove a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing rmdir() : usage variation ***\n"; @@ -71,7 +71,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // other // php outputs Permission Denied, p8 outputs no suck file or dir 'single space' => ' ', diff --git a/ext/standard/tests/file/rmdir_variation1.phpt b/ext/standard/tests/file/rmdir_variation1.phpt index 04fee0ee2a..090d52e534 100644 --- a/ext/standard/tests/file/rmdir_variation1.phpt +++ b/ext/standard/tests/file/rmdir_variation1.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") /* Prototype : bool rmdir(string dirname[, resource context]) * Description: Remove a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing rmdir() : usage variation ***\n"; @@ -72,7 +72,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // other 'single space' => ' ', ); diff --git a/ext/standard/tests/file/rmdir_variation2.phpt b/ext/standard/tests/file/rmdir_variation2.phpt index 8c5af1a351..6dd30f58e7 100644 --- a/ext/standard/tests/file/rmdir_variation2.phpt +++ b/ext/standard/tests/file/rmdir_variation2.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : bool rmdir(string dirname[, resource context]) * Description: Remove a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing rmdir() : usage variation ***\n"; @@ -102,7 +102,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // non stream context resource $fileres, ); diff --git a/ext/standard/tests/file/rmdir_variation3-win32.phpt b/ext/standard/tests/file/rmdir_variation3-win32.phpt index e6b3eaabb6..da9afbb918 100644 --- a/ext/standard/tests/file/rmdir_variation3-win32.phpt +++ b/ext/standard/tests/file/rmdir_variation3-win32.phpt @@ -6,13 +6,13 @@ Dave Kelsey <d_kelsey@uk.ibm.com> <?php if(substr(PHP_OS, 0, 3) != "WIN") die("skip Only valid for Windows"); -?> +?> --FILE-- <?php /* Prototype : bool rmdir(string dirname[, resource context]) * Description: Remove a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing rmdir() : variation ***\n"; @@ -29,11 +29,11 @@ $dirs = array( $workDir.'\\'.$subDir, '.\\'.$workDir.'\\'.$subDir, $workDir.'\\..\\'.$workDir.'\\'.$subDir, - + // relative bad path $workDir.'\\..\\BADDIR\\'.$subDir, 'BADDIR\\'.$subDir, - + //absolute $cwd.'\\'.$workDir.'\\'.$subDir, $cwd.'\\.\\'.$workDir.'\\'.$subDir, @@ -41,24 +41,24 @@ $dirs = array( //absolute bad path $cwd.'\\BADDIR\\'.$subDir, - + //trailing separators $workDir.'\\'.$subDir.'\\', $cwd.'\\'.$workDir.'\\'.$subDir.'\\', - + // multiple separators $workDir.'\\\\'.$subDir, $cwd.'\\\\'.$workDir.'\\\\'.$subDir, - + // Unixified Dir $unixifiedDir, - + ); - + foreach($dirs as $dir) { mkdir($workDir.'/'.$subDir); - echo "-- removing $dir --\n"; + echo "-- removing $dir --\n"; $res = rmdir($dir); if ($res === true) { echo "Directory removed\n"; diff --git a/ext/standard/tests/file/rmdir_variation3.phpt b/ext/standard/tests/file/rmdir_variation3.phpt index 5848007395..13dfbd3f99 100644 --- a/ext/standard/tests/file/rmdir_variation3.phpt +++ b/ext/standard/tests/file/rmdir_variation3.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : bool rmdir(string dirname[, resource context]) * Description: Remove a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing rmdir() : variation ***\n"; @@ -22,11 +22,11 @@ $dirs = array( $workDir.'/'.$subDir, './'.$workDir.'/'.$subDir, $workDir.'/../'.$workDir.'/'.$subDir, - + // relative bad path $workDir.'/../BADDIR/'.$subDir, 'BADDIR/'.$subDir, - + //absolute $cwd.'/'.$workDir.'/'.$subDir, $cwd.'/./'.$workDir.'/'.$subDir, @@ -34,21 +34,21 @@ $dirs = array( //absolute bad path $cwd.'/BADDIR/'.$subDir, - + //trailing separators $workDir.'/'.$subDir.'/', $cwd.'/'.$workDir.'/'.$subDir.'/', - + // multiple separators $workDir.'//'.$subDir, $cwd.'//'.$workDir.'//'.$subDir, - + ); - + foreach($dirs as $dir) { mkdir($workDir.'/'.$subDir); - echo "-- removing $dir --\n"; + echo "-- removing $dir --\n"; $res = rmdir($dir); if ($res === true) { echo "Directory removed\n"; diff --git a/ext/standard/tests/file/stat_error-win32.phpt b/ext/standard/tests/file/stat_error-win32.phpt index 1b69da8bf5..3614ba5f7e 100644 --- a/ext/standard/tests/file/stat_error-win32.phpt +++ b/ext/standard/tests/file/stat_error-win32.phpt @@ -13,7 +13,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { Description: Gives information about a file */ -$file_path = dirname(__FILE__); +$file_path = dirname(__FILE__); $arr = array(__FILE__); echo "\n*** Testing stat() for error conditions ***\n"; diff --git a/ext/standard/tests/file/statpage.phpt b/ext/standard/tests/file/statpage.phpt index f11be9734c..5bd4183c21 100644 --- a/ext/standard/tests/file/statpage.phpt +++ b/ext/standard/tests/file/statpage.phpt @@ -11,7 +11,7 @@ var_dump(getmygid()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(%d) int(%d) int(%d) diff --git a/ext/standard/tests/file/stream_001.phpt b/ext/standard/tests/file/stream_001.phpt index eece30a2f5..6e692c554a 100644 --- a/ext/standard/tests/file/stream_001.phpt +++ b/ext/standard/tests/file/stream_001.phpt @@ -10,7 +10,7 @@ var_dump(fopen("file://".__FILE__, "r")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) Warning: fopen(): Unable to find the wrapper "file" - did you forget to enable it when you configured PHP? in %s on line %d diff --git a/ext/standard/tests/file/stream_002.phpt b/ext/standard/tests/file/stream_002.phpt index e982f704c4..b18dd85b31 100644 --- a/ext/standard/tests/file/stream_002.phpt +++ b/ext/standard/tests/file/stream_002.phpt @@ -20,7 +20,7 @@ var_dump($a, $b); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: stream_socket_client(): unable to connect to (Failed to parse address "") in %s on line %d bool(false) int(0) diff --git a/ext/standard/tests/file/stream_copy_to_stream.phpt b/ext/standard/tests/file/stream_copy_to_stream.phpt index 716ae1f462..1cc57b7f6d 100644 --- a/ext/standard/tests/file/stream_copy_to_stream.phpt +++ b/ext/standard/tests/file/stream_copy_to_stream.phpt @@ -111,7 +111,7 @@ unlink($new_file); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(0) string(0) "" int(%d) diff --git a/ext/standard/tests/file/stream_rfc2397_007.phpt b/ext/standard/tests/file/stream_rfc2397_007.phpt index 48c7cdb3f1..447b0246ae 100644 --- a/ext/standard/tests/file/stream_rfc2397_007.phpt +++ b/ext/standard/tests/file/stream_rfc2397_007.phpt @@ -14,7 +14,7 @@ foreach($streams as $stream) echo "===$stream===\n"; $fp = fopen($stream, 'rb'); - + var_dump(ftell($fp)); var_dump(feof($fp)); echo "===S:4,S===\n"; diff --git a/ext/standard/tests/file/stream_supports_lock.phpt b/ext/standard/tests/file/stream_supports_lock.phpt index bbf3993b6b..38a84dd7c2 100644 --- a/ext/standard/tests/file/stream_supports_lock.phpt +++ b/ext/standard/tests/file/stream_supports_lock.phpt @@ -30,7 +30,7 @@ var_dump(stream_supports_lock($sock)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) bool(true) resource(%d) of type (stream) diff --git a/ext/standard/tests/file/symlink.phpt b/ext/standard/tests/file/symlink.phpt index 489c26644f..228e459297 100644 --- a/ext/standard/tests/file/symlink.phpt +++ b/ext/standard/tests/file/symlink.phpt @@ -44,7 +44,7 @@ var_dump(linkinfo(".")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) string(%d) "%ssymlink.dat" int(%d) diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt index b1b1afc740..837bc5b961 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt @@ -58,11 +58,11 @@ clearstatcache(); /* Testing on hard links */ echo "\n-- Working with hard links --\n"; // creating hard link -var_dump( link($filename, $obj->linkname) ); +var_dump( link($filename, $obj->linkname) ); // check if the link exists var_dump( linkinfo($obj->linkname) ); // check if link is soft link; expected: false as the link is a hardlink -var_dump( is_link($obj->linkname) ); +var_dump( is_link($obj->linkname) ); // delete the link created unlink($obj->linkname); // clear the cache diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt index 74f03e2097..9c0c8ab8d0 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt @@ -45,7 +45,7 @@ $data_from_link = file_get_contents($linkname); // data read from $filename var_dump( $data_from_link ); echo "\n-- Check size of hard link and file --\n"; -if( filesize($filename) == filesize($linkname) ) +if( filesize($filename) == filesize($linkname) ) echo "\nSize of file and hard link are same\n"; else echo "\nWarning: Size of file and hard link differ\n"; @@ -61,7 +61,7 @@ $data_from_file = file_get_contents($filename); var_dump( $data_from_file ); echo "\n-- Check size of hard link and file --\n"; -if( filesize($filename) == filesize($linkname) ) +if( filesize($filename) == filesize($linkname) ) echo "\nSize of file and hard link are same\n"; else echo "\nWarning: Size of file and hard link differ\n"; @@ -79,7 +79,7 @@ var_dump( $data_from_link ); echo "\n-- Check size of hard link and file --\n"; var_dump( filesize($filename) ); var_dump( filesize($linkname) ); -if( filesize($filename) == filesize($linkname) ) +if( filesize($filename) == filesize($linkname) ) echo "\nSize of file and hard link are same\n"; else echo "\nWarning: Size of file and hard link differ\n"; diff --git a/ext/standard/tests/file/tempnam_variation1-win32-mb.phpt b/ext/standard/tests/file/tempnam_variation1-win32-mb.phpt index 4d985410da..339ac7c0a9 100644 --- a/ext/standard/tests/file/tempnam_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/tempnam_variation1-win32-mb.phpt @@ -21,24 +21,24 @@ for($i=1; $i<=10; $i++) { echo "-- Iteration $i --\n"; $files[$i] = tempnam("$file_path", "tempnam_variation1.tmp"); - if( file_exists($files[$i]) ) { + if( file_exists($files[$i]) ) { - echo "File name is => "; + echo "File name is => "; print($files[$i]); echo "\n"; - + echo "File permissions are => "; printf("%o", fileperms($files[$i]) ); echo "\n"; clearstatcache(); echo "File created in => "; - $file_dir = dirname($files[$i]); - + $file_dir = dirname($files[$i]); + if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) { echo "temp dir\n"; } - else if (realpath($file_dir) == realpath($file_path) || realpath($file_dir."\\") == realpath($file_path)) { + else if (realpath($file_dir) == realpath($file_path) || realpath($file_dir."\\") == realpath($file_path)) { echo "directory specified\n"; } else { diff --git a/ext/standard/tests/file/tempnam_variation1-win32.phpt b/ext/standard/tests/file/tempnam_variation1-win32.phpt index a3dd7e9d62..e57b677a2b 100644 --- a/ext/standard/tests/file/tempnam_variation1-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation1-win32.phpt @@ -21,24 +21,24 @@ for($i=1; $i<=10; $i++) { echo "-- Iteration $i --\n"; $files[$i] = tempnam("$file_path", "tempnam_variation1.tmp"); - if( file_exists($files[$i]) ) { + if( file_exists($files[$i]) ) { - echo "File name is => "; + echo "File name is => "; print($files[$i]); echo "\n"; - + echo "File permissions are => "; printf("%o", fileperms($files[$i]) ); echo "\n"; clearstatcache(); echo "File created in => "; - $file_dir = dirname($files[$i]); - + $file_dir = dirname($files[$i]); + if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) { echo "temp dir\n"; } - else if (realpath($file_dir) == realpath($file_path) || realpath($file_dir."\\") == realpath($file_path)) { + else if (realpath($file_dir) == realpath($file_path) || realpath($file_dir."\\") == realpath($file_path)) { echo "directory specified\n"; } else { diff --git a/ext/standard/tests/file/tempnam_variation1.phpt b/ext/standard/tests/file/tempnam_variation1.phpt index 0745f5397c..8d62aef2ea 100644 --- a/ext/standard/tests/file/tempnam_variation1.phpt +++ b/ext/standard/tests/file/tempnam_variation1.phpt @@ -21,12 +21,12 @@ for($i=1; $i<=10; $i++) { echo "-- Iteration $i --\n"; $files[$i] = tempnam("$file_path", "tempnam_variation1.tmp"); - if( file_exists($files[$i]) ) { + if( file_exists($files[$i]) ) { - echo "File name is => "; + echo "File name is => "; print($files[$i]); echo "\n"; - + echo "File permissions are => "; printf("%o", fileperms($files[$i]) ); echo "\n"; @@ -35,10 +35,10 @@ for($i=1; $i<=10; $i++) { echo "File inode is => "; print_r( fileinode($files[$i]) ); //checking inodes echo "\n"; - + echo "File created in => "; - $file_dir = dirname($files[$i]); - + $file_dir = dirname($files[$i]); + if ($file_dir == sys_get_temp_dir()) { echo "temp dir\n"; } diff --git a/ext/standard/tests/file/tempnam_variation2-win32.phpt b/ext/standard/tests/file/tempnam_variation2-win32.phpt index 15d59614ff..60fe951353 100644 --- a/ext/standard/tests/file/tempnam_variation2-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation2-win32.phpt @@ -31,23 +31,23 @@ $dir_paths = array( "$dir_path/../.././tempnam_variation2", "$dir_path/..///tempnam_variation2_sub//..//../tempnam_variation2", "$dir_path/BADDIR", - - + + // relative paths ".", "tempname_variation2", "tempname_variation2/", "tempnam_variation2/tempnam_variation2_sub", - "tempnam_variation2//tempnam_variation2_sub", + "tempnam_variation2//tempnam_variation2_sub", "./tempnam_variation2/../tempnam_variation2/tempnam_variation2_sub", - "BADDIR", + "BADDIR", ); for($i = 0; $i<count($dir_paths); $i++) { $j = $i+1; echo "\n-- Iteration $j --\n"; $file_name = tempnam($dir_paths[$i], "tempnam_variation2.tmp"); - + if( file_exists($file_name) ){ echo "File name is => "; @@ -57,27 +57,27 @@ for($i = 0; $i<count($dir_paths); $i++) { echo "File permissions are => "; printf("%o", fileperms($file_name) ); echo "\n"; - + echo "File created in => "; $file_dir = dirname($file_name); $dir_req = $dir_paths[$i]; - + if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) { echo "temp dir\n"; } - else if (realpath($file_dir) == realpath($dir_req) || realpath($file_dir."\\") == realpath($dir_req)) { + else if (realpath($file_dir) == realpath($dir_req) || realpath($file_dir."\\") == realpath($dir_req)) { echo "directory specified\n"; } else { echo "unknown location\n"; - } - + } + } else { echo "-- File is not created --"; } - + unlink($file_name); } diff --git a/ext/standard/tests/file/tempnam_variation2.phpt b/ext/standard/tests/file/tempnam_variation2.phpt index 1a2de1885b..dd98b40e8b 100644 --- a/ext/standard/tests/file/tempnam_variation2.phpt +++ b/ext/standard/tests/file/tempnam_variation2.phpt @@ -31,23 +31,23 @@ $dir_paths = array( "$dir_path/../.././tempnam_variation2", "$dir_path/..///tempnam_variation2_sub//..//../tempnam_variation2", "$dir_path/BADDIR", - - + + // relative paths ".", "tempname_variation2", "tempname_variation2/", "tempnam_variation2/tempnam_variation2_sub", - "tempnam_variation2//tempnam_variation2_sub", + "tempnam_variation2//tempnam_variation2_sub", "./tempnam_variation2/../tempnam_variation2/tempnam_variation2_sub", - "BADDIR", + "BADDIR", ); for($i = 0; $i<count($dir_paths); $i++) { $j = $i+1; echo "\n-- Iteration $j --\n"; $file_name = tempnam($dir_paths[$i], "tempnam_variation2.tmp"); - + if( file_exists($file_name) ){ echo "File name is => "; @@ -57,11 +57,11 @@ for($i = 0; $i<count($dir_paths); $i++) { echo "File permissions are => "; printf("%o", fileperms($file_name) ); echo "\n"; - + echo "File created in => "; $file_dir = dirname($file_name); $dir_req = $dir_paths[$i]; - + if (realpath($file_dir) == realpath(sys_get_temp_dir())) { echo "temp dir\n"; } @@ -70,14 +70,14 @@ for($i = 0; $i<count($dir_paths); $i++) { } else { echo "unknown location\n"; - } - + } + } else { echo "-- File is not created --"; } - + unlink($file_name); } diff --git a/ext/standard/tests/file/tempnam_variation4-0.phpt b/ext/standard/tests/file/tempnam_variation4-0.phpt index e96846ff2c..b7837b68d4 100644 --- a/ext/standard/tests/file/tempnam_variation4-0.phpt +++ b/ext/standard/tests/file/tempnam_variation4-0.phpt @@ -44,9 +44,9 @@ for($mode = 0000; $mode <= 0350; $mode++) { if (realpath(dirname($file_name)) != realpath(sys_get_temp_dir())) { echo " created in unexpected dir\n"; - } + } } - unlink($file_name); + unlink($file_name); } else { print("FAILED: File is not created\n"); diff --git a/ext/standard/tests/file/tempnam_variation4-1.phpt b/ext/standard/tests/file/tempnam_variation4-1.phpt index 667d3ecda6..fda6beda6b 100644 --- a/ext/standard/tests/file/tempnam_variation4-1.phpt +++ b/ext/standard/tests/file/tempnam_variation4-1.phpt @@ -44,9 +44,9 @@ for($mode = 0351; $mode <= 0777; $mode++) { if (realpath(dirname($file_name)) != realpath(sys_get_temp_dir())) { echo " created in unexpected dir\n"; - } + } } - unlink($file_name); + unlink($file_name); } else { print("FAILED: File is not created\n"); diff --git a/ext/standard/tests/file/tempnam_variation5-win32.phpt b/ext/standard/tests/file/tempnam_variation5-win32.phpt index 3e39352fe1..d2e708bc30 100644 --- a/ext/standard/tests/file/tempnam_variation5-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation5-win32.phpt @@ -25,7 +25,7 @@ $h = fopen($dir_name."/tempnam_variation6.tmp", "w"); for($i=1; $i<=3; $i++) { echo "-- Iteration $i --\n"; $created_file = tempnam("$dir_name", "tempnam_variation6.tmp"); - + if( file_exists($created_file) ) { echo "File name is => "; print($created_file); diff --git a/ext/standard/tests/file/tempnam_variation5.phpt b/ext/standard/tests/file/tempnam_variation5.phpt index cf2eff8bec..fdfcee9bed 100644 --- a/ext/standard/tests/file/tempnam_variation5.phpt +++ b/ext/standard/tests/file/tempnam_variation5.phpt @@ -23,7 +23,7 @@ $h = fopen($dir_name."/tempnam_variation5.tmp", "w"); for($i=1; $i<=3; $i++) { echo "-- Iteration $i --\n"; $created_file = tempnam("$dir_name", "tempnam_variation5.tmp"); - + if( file_exists($created_file) ) { echo "File name is => "; print($created_file); diff --git a/ext/standard/tests/file/tempnam_variation6-win32.phpt b/ext/standard/tests/file/tempnam_variation6-win32.phpt index efe7e86e85..acaa1abf50 100644 --- a/ext/standard/tests/file/tempnam_variation6-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation6-win32.phpt @@ -6,7 +6,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> <?php if(substr(PHP_OS, 0, 3) != "WIN") die("skip Windows Only"); -?> +?> --FILE-- <?php /* Prototype: string tempnam ( string $dir, string $prefix ); @@ -27,10 +27,10 @@ for($i=1; $i<=3; $i++) { echo "File name is => "; print($file_name); echo "\n"; - + echo "File created in => "; $file_dir = dirname($file_name); - + if ($file_dir == sys_get_temp_dir()) { echo "temp dir\n"; } @@ -39,7 +39,7 @@ for($i=1; $i<=3; $i++) { } else { echo "unknown location\n"; - } + } } unlink($file_name); diff --git a/ext/standard/tests/file/tempnam_variation6.phpt b/ext/standard/tests/file/tempnam_variation6.phpt index 5eb6e6fc86..08a9fce4de 100644 --- a/ext/standard/tests/file/tempnam_variation6.phpt +++ b/ext/standard/tests/file/tempnam_variation6.phpt @@ -4,7 +4,7 @@ Test tempnam() function: usage variations - Using previous unique filename <?php if(substr(PHP_OS, 0, 3) == "WIN") die("skip Do not run on Windows"); -?> +?> --FILE-- <?php /* Prototype: string tempnam ( string $dir, string $prefix ); @@ -25,10 +25,10 @@ for($i=1; $i<=3; $i++) { echo "File name is => "; print($file_name); echo "\n"; - + echo "File created in => "; $file_dir = dirname($file_name); - + if ($file_dir == sys_get_temp_dir()) { echo "temp dir\n"; } @@ -37,7 +37,7 @@ for($i=1; $i<=3; $i++) { } else { echo "unknown location\n"; - } + } } unlink($file_name); diff --git a/ext/standard/tests/file/tempnam_variation7-win32.phpt b/ext/standard/tests/file/tempnam_variation7-win32.phpt index 918ef36588..285faa46a5 100644 --- a/ext/standard/tests/file/tempnam_variation7-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation7-win32.phpt @@ -13,11 +13,11 @@ if(substr(PHP_OS, 0, 3) != "WIN") /* Passing invalid/non-existing args for $dir, hence the unique files will be created in temporary dir */ - + echo "*** Testing tempnam() with invalid/non-existing directory names ***\n"; -/* An array of names, which will be passed as a dir name */ +/* An array of names, which will be passed as a dir name */ $names_arr = array( - /* Invalid args */ + /* Invalid args */ -1, TRUE, FALSE, @@ -28,7 +28,7 @@ $names_arr = array( array(), /* Non-existing dirs */ - "/no/such/file/dir", + "/no/such/file/dir", "php" ); diff --git a/ext/standard/tests/file/tempnam_variation7.phpt b/ext/standard/tests/file/tempnam_variation7.phpt index d24c1d8974..230a9a7212 100644 --- a/ext/standard/tests/file/tempnam_variation7.phpt +++ b/ext/standard/tests/file/tempnam_variation7.phpt @@ -15,9 +15,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") hence the unique files will be created in temporary dir */ echo "*** Testing tempnam() with invalid/non-existing directory names ***\n"; -/* An array of names, which will be passed as a dir name */ +/* An array of names, which will be passed as a dir name */ $names_arr = array( - /* Invalid args */ + /* Invalid args */ -1, TRUE, FALSE, @@ -28,7 +28,7 @@ $names_arr = array( array(), /* Non-existing dirs */ - "/no/such/file/dir", + "/no/such/file/dir", "php" ); @@ -46,22 +46,22 @@ for( $i=0; $i<count($names_arr); $i++ ) { echo "File permissions are => "; printf("%o", fileperms($file_name) ); echo "\n"; - + echo "File created in => "; $file_dir = dirname($file_name); - + if (realpath($file_dir) == realpath(sys_get_temp_dir())) { echo "temp dir\n"; } else { echo "unknown location\n"; - } - + } + } - else { + else { echo "-- File is not created --\n"; } - + unlink($file_name); } diff --git a/ext/standard/tests/file/tempnam_variation8-win32.phpt b/ext/standard/tests/file/tempnam_variation8-win32.phpt index 52ff7b9daa..cceda6438f 100644 --- a/ext/standard/tests/file/tempnam_variation8-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation8-win32.phpt @@ -32,21 +32,21 @@ $dir_paths = array( "$dir_path\\..\\..\\.\\tempnam_variation2", "$dir_path\\..\\\\\\tempnam_variation2_sub\\\\..\\\\..\\tempnam_variation2", "$dir_path\\BADDIR", - - + + // relative paths "tempname_variation2\\", "tempnam_variation2\\tempnam_variation2_sub", - "tempnam_variation2\\\\tempnam_variation2_sub", + "tempnam_variation2\\\\tempnam_variation2_sub", ".\\tempnam_variation2\\..\\tempnam_variation2\\tempnam_variation2_sub", - "BADDIR", + "BADDIR", ); for($i = 0; $i<count($dir_paths); $i++) { $j = $i+1; echo "\n-- Iteration $j --\n"; $file_name = tempnam($dir_paths[$i], "tempnam_variation2.tmp"); - + if( file_exists($file_name) ){ echo "File name is => "; @@ -56,27 +56,27 @@ for($i = 0; $i<count($dir_paths); $i++) { echo "File permissions are => "; printf("%o", fileperms($file_name) ); echo "\n"; - + echo "File created in => "; $file_dir = dirname($file_name); $dir_req = $dir_paths[$i]; - + if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) { echo "temp dir\n"; } - else if (realpath($file_dir) == realpath($dir_req) || realpath($file_dir."\\") == realpath($dir_req)) { + else if (realpath($file_dir) == realpath($dir_req) || realpath($file_dir."\\") == realpath($dir_req)) { echo "directory specified\n"; } else { echo "unknown location\n"; - } - + } + } else { echo "-- File is not created --"; } - + unlink($file_name); } diff --git a/ext/standard/tests/file/touch.phpt b/ext/standard/tests/file/touch.phpt index c6c270d065..fa000db008 100644 --- a/ext/standard/tests/file/touch.phpt +++ b/ext/standard/tests/file/touch.phpt @@ -38,7 +38,7 @@ var_dump(touch("/no/such/file/or/directory")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: touch() expects at least 1 parameter, 0 given in %s on line %d NULL bool(true) diff --git a/ext/standard/tests/file/touch_basic-win32-mb.phpt b/ext/standard/tests/file/touch_basic-win32-mb.phpt index d721edc84c..eea2a50c68 100644 --- a/ext/standard/tests/file/touch_basic-win32-mb.phpt +++ b/ext/standard/tests/file/touch_basic-win32-mb.phpt @@ -13,7 +13,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { /* Prototype : proto bool touch(string filename [, int time [, int atime]]) * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing touch() : basic functionality ***\n"; diff --git a/ext/standard/tests/file/touch_basic-win32.phpt b/ext/standard/tests/file/touch_basic-win32.phpt index b4ad29f037..7af7d535a5 100644 --- a/ext/standard/tests/file/touch_basic-win32.phpt +++ b/ext/standard/tests/file/touch_basic-win32.phpt @@ -13,7 +13,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { /* Prototype : proto bool touch(string filename [, int time [, int atime]]) * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing touch() : basic functionality ***\n"; diff --git a/ext/standard/tests/file/touch_basic.phpt b/ext/standard/tests/file/touch_basic.phpt index b39c84b7e0..b7832c9fbb 100644 --- a/ext/standard/tests/file/touch_basic.phpt +++ b/ext/standard/tests/file/touch_basic.phpt @@ -14,7 +14,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { /* Prototype : proto bool touch(string filename [, int time [, int atime]]) * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing touch() : basic functionality ***\n"; diff --git a/ext/standard/tests/file/touch_error.phpt b/ext/standard/tests/file/touch_error.phpt index ec58fee511..9fa8a81739 100644 --- a/ext/standard/tests/file/touch_error.phpt +++ b/ext/standard/tests/file/touch_error.phpt @@ -10,7 +10,7 @@ var_dump(touch(1, 2, 3, 4)); var_dump(touch("/no/such/file/or/directory")); ?> ---EXPECTF-- +--EXPECTF-- Warning: touch() expects at least 1 parameter, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/file/touch_variation1.phpt b/ext/standard/tests/file/touch_variation1.phpt index 18f9d033b8..3c9e429c77 100644 --- a/ext/standard/tests/file/touch_variation1.phpt +++ b/ext/standard/tests/file/touch_variation1.phpt @@ -29,7 +29,7 @@ var_dump(fileatime($filename)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- bool(true) int(101) int(101) diff --git a/ext/standard/tests/file/touch_variation2.phpt b/ext/standard/tests/file/touch_variation2.phpt index 9477a3494e..a3596adc6b 100644 --- a/ext/standard/tests/file/touch_variation2.phpt +++ b/ext/standard/tests/file/touch_variation2.phpt @@ -18,7 +18,7 @@ var_dump(file_get_contents($filename)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- bool(true) string(6) "mydata" Done diff --git a/ext/standard/tests/file/touch_variation3-win32-mb.phpt b/ext/standard/tests/file/touch_variation3-win32-mb.phpt index b3f8817656..e7b8d1b2ac 100644 --- a/ext/standard/tests/file/touch_variation3-win32-mb.phpt +++ b/ext/standard/tests/file/touch_variation3-win32-mb.phpt @@ -14,7 +14,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { /* Prototype : bool touch(string filename [, int time [, int atime]]) * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing touch() : usage variation ***\n"; diff --git a/ext/standard/tests/file/touch_variation3-win32.phpt b/ext/standard/tests/file/touch_variation3-win32.phpt index 8c7db0905b..a4735275d8 100644 --- a/ext/standard/tests/file/touch_variation3-win32.phpt +++ b/ext/standard/tests/file/touch_variation3-win32.phpt @@ -14,7 +14,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { /* Prototype : bool touch(string filename [, int time [, int atime]]) * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing touch() : usage variation ***\n"; diff --git a/ext/standard/tests/file/touch_variation3.phpt b/ext/standard/tests/file/touch_variation3.phpt index 00203c8f36..56f82192d4 100644 --- a/ext/standard/tests/file/touch_variation3.phpt +++ b/ext/standard/tests/file/touch_variation3.phpt @@ -14,7 +14,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { /* Prototype : bool touch(string filename [, int time [, int atime]]) * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing touch() : usage variation ***\n"; diff --git a/ext/standard/tests/file/touch_variation4-win32.phpt b/ext/standard/tests/file/touch_variation4-win32.phpt index 2f1eda71c6..ae9e32d7c7 100644 --- a/ext/standard/tests/file/touch_variation4-win32.phpt +++ b/ext/standard/tests/file/touch_variation4-win32.phpt @@ -14,7 +14,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { /* Prototype : bool touch(string filename [, int time [, int atime]]) * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing touch() : usage variation ***\n"; diff --git a/ext/standard/tests/file/touch_variation4.phpt b/ext/standard/tests/file/touch_variation4.phpt index 6467f5dcdf..687e01e513 100644 --- a/ext/standard/tests/file/touch_variation4.phpt +++ b/ext/standard/tests/file/touch_variation4.phpt @@ -14,7 +14,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { /* Prototype : bool touch(string filename [, int time [, int atime]]) * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing touch() : usage variation ***\n"; diff --git a/ext/standard/tests/file/touch_variation5-win32.phpt b/ext/standard/tests/file/touch_variation5-win32.phpt index 92b67c24a6..48467ade8c 100644 --- a/ext/standard/tests/file/touch_variation5-win32.phpt +++ b/ext/standard/tests/file/touch_variation5-win32.phpt @@ -12,7 +12,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { /* Prototype : bool touch(string filename [, int time [, int atime]]) * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ $workDir = "touchVar5.tmp"; @@ -26,38 +26,38 @@ $paths = array( $workDir.'/'.$subDirOrFile, './'.$workDir.'/'.$subDirOrFile, $workDir.'/../'.$workDir.'/'.$subDirOrFile, - + // relative bad path (note p8 msgs differ) $workDir.'/../BADDIR/'.$subDirOrFile, 'BADDIR/'.$subDirOrFile, - + //absolute $cwd.'/'.$workDir.'/'.$subDirOrFile, $cwd.'/./'.$workDir.'/'.$subDirOrFile, $cwd.'/'.$workDir.'/../'.$workDir.'/'.$subDirOrFile, - //absolute bad path (note p8 msgs differ) + //absolute bad path (note p8 msgs differ) $cwd.'/BADDIR/'.$subDirOrFile, - + //trailing separators $workDir.'/'.$subDirOrFile.'/', $cwd.'/'.$workDir.'/'.$subDirOrFile.'/', - + // multiple separators $workDir.'//'.$subDirOrFile, $cwd.'//'.$workDir.'//'.$subDirOrFile, - + ); - + echo "*** Testing touch() : variation ***\n"; -echo "\n*** testing nonexisting paths ***\n"; +echo "\n*** testing nonexisting paths ***\n"; test_nonexisting($paths); -echo "\n*** testing existing files ***\n"; +echo "\n*** testing existing files ***\n"; test_existing($paths, false); -echo "\n*** testing existing directories ***\n"; +echo "\n*** testing existing directories ***\n"; test_existing($paths, true); @@ -68,7 +68,7 @@ rmdir($workDir); function test_nonexisting($paths) { foreach($paths as $path) { echo "--- testing $path ---\n"; - + if (is_dir($path) || is_file($path)) { echo "FAILED: $path - exists\n"; } @@ -115,7 +115,7 @@ function test_existing($paths, $are_dirs) { if ($res == true) { test_path($path); rmdir($path); - } + } } else { $h = @fopen($path,"w"); @@ -123,12 +123,12 @@ function test_existing($paths, $are_dirs) { fclose($h); test_path($path); unlink($path); - } + } } } } - - + + function test_path($path) { echo "--- testing $path ---\n"; $org_atime = get_atime($path); diff --git a/ext/standard/tests/file/touch_variation5.phpt b/ext/standard/tests/file/touch_variation5.phpt index a448db3ea4..46993afc7e 100644 --- a/ext/standard/tests/file/touch_variation5.phpt +++ b/ext/standard/tests/file/touch_variation5.phpt @@ -13,7 +13,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { /* Prototype : bool touch(string filename [, int time [, int atime]]) * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ $workDir = "touchVar5.tmp"; @@ -26,11 +26,11 @@ $paths = array( $workDir.'/'.$subDirOrFile, './'.$workDir.'/'.$subDirOrFile, $workDir.'/../'.$workDir.'/'.$subDirOrFile, - + // relative bad path $workDir.'/../BADDIR/'.$subDirOrFile, 'BADDIR/'.$subDirOrFile, - + //absolute $cwd.'/'.$workDir.'/'.$subDirOrFile, $cwd.'/./'.$workDir.'/'.$subDirOrFile, @@ -38,26 +38,26 @@ $paths = array( //absolute bad path $cwd.'/BADDIR/'.$subDirOrFile, - + //trailing separators $workDir.'/'.$subDirOrFile.'/', $cwd.'/'.$workDir.'/'.$subDirOrFile.'/', - + // multiple separators $workDir.'//'.$subDirOrFile, $cwd.'//'.$workDir.'//'.$subDirOrFile, - + ); - + echo "*** Testing touch() : variation ***\n"; -echo "\n*** testing nonexisting paths ***\n"; +echo "\n*** testing nonexisting paths ***\n"; test_nonexisting($paths); -echo "\n*** testing existing files ***\n"; +echo "\n*** testing existing files ***\n"; test_existing($paths, false); -echo "\n*** testing existing directories ***\n"; +echo "\n*** testing existing directories ***\n"; test_existing($paths, true); @@ -68,7 +68,7 @@ rmdir($workDir); function test_nonexisting($paths) { foreach($paths as $path) { echo "--- testing $path ---\n"; - + if (is_dir($path) || is_file($path)) { echo "FAILED: $path - exists\n"; } @@ -115,7 +115,7 @@ function test_existing($paths, $are_dirs) { if ($res == true) { test_path($path); rmdir($path); - } + } } else { $h = @fopen($path,"w"); @@ -123,12 +123,12 @@ function test_existing($paths, $are_dirs) { fclose($h); test_path($path); unlink($path); - } + } } } } - - + + function test_path($path) { echo "--- testing $path ---\n"; $org_atime = get_atime($path); diff --git a/ext/standard/tests/file/touch_variation6-win32.phpt b/ext/standard/tests/file/touch_variation6-win32.phpt index 177de94e48..7366420332 100644 --- a/ext/standard/tests/file/touch_variation6-win32.phpt +++ b/ext/standard/tests/file/touch_variation6-win32.phpt @@ -13,7 +13,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { /* Prototype : bool touch(string filename [, int time [, int atime]]) * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ $workDir = "touchVar5.tmp"; @@ -29,41 +29,41 @@ $paths = array( $workDir.'\\'.$subDirOrFile, '.\\'.$workDir.'\\'.$subDirOrFile, $workDir.'\\..\\'.$workDir.'\\'.$subDirOrFile, - + // relative bad path (note p8 msgs differ) $workDir.'\\..\\BADDIR\\'.$subDirOrFile, 'BADDIR\\'.$subDirOrFile, - + //absolute $cwd.'\\'.$workDir.'\\'.$subDirOrFile, $cwd.'\\.\\'.$workDir.'\\'.$subDirOrFile, $cwd.'\\'.$workDir.'\\..\\'.$workDir.'\\'.$subDirOrFile, - //absolute bad path (note p8 msgs differ) + //absolute bad path (note p8 msgs differ) $cwd.'\\BADDIR\\'.$subDirOrFile, - + //trailing separators $workDir.'\\'.$subDirOrFile.'\\', $cwd.'\\'.$workDir.'\\'.$subDirOrFile.'\\', - + // multiple separators $workDir.'\\\\'.$subDirOrFile, $cwd.'\\\\'.$workDir.'\\\\'.$subDirOrFile, - + // Unixified Dir Or File $unixifiedDirOrFile, - + ); - + echo "*** Testing touch() : variation ***\n"; -echo "\n*** testing nonexisting paths ***\n"; +echo "\n*** testing nonexisting paths ***\n"; test_nonexisting($paths); -echo "\n*** testing existing files ***\n"; +echo "\n*** testing existing files ***\n"; test_existing($paths, false); -echo "\n*** testing existing directories ***\n"; +echo "\n*** testing existing directories ***\n"; test_existing($paths, true); @@ -74,7 +74,7 @@ rmdir($workDir); function test_nonexisting($paths) { foreach($paths as $path) { echo "--- testing $path ---\n"; - + if (is_dir($path) || is_file($path)) { echo "FAILED: $path - exists\n"; } @@ -121,7 +121,7 @@ function test_existing($paths, $are_dirs) { if ($res == true) { test_path($path); rmdir($path); - } + } } else { $h = @fopen($path,"w"); @@ -129,12 +129,12 @@ function test_existing($paths, $are_dirs) { fclose($h); test_path($path); unlink($path); - } + } } } } - - + + function test_path($path) { echo "--- testing $path ---\n"; $org_atime = get_atime($path); diff --git a/ext/standard/tests/file/umask_variation1.phpt b/ext/standard/tests/file/umask_variation1.phpt index b44e1ef3c9..6f5bdc4480 100644 --- a/ext/standard/tests/file/umask_variation1.phpt +++ b/ext/standard/tests/file/umask_variation1.phpt @@ -28,7 +28,7 @@ for($mask = 0000; $mask <= 0350; $mask++) { echo " --\n"; // setting umask umask($mask); - + /* umasking file */ // creating temp file $fp = fopen($filename, "w"); diff --git a/ext/standard/tests/file/umask_variation2.phpt b/ext/standard/tests/file/umask_variation2.phpt index bb2dbb3255..b302bea969 100644 --- a/ext/standard/tests/file/umask_variation2.phpt +++ b/ext/standard/tests/file/umask_variation2.phpt @@ -28,7 +28,7 @@ for($mask = 0351; $mask <= 0777; $mask++) { echo " --\n"; // setting umask umask($mask); - + /* umasking file */ // creating temp file $fp = fopen($filename, "w"); diff --git a/ext/standard/tests/file/unlink_variation10.phpt b/ext/standard/tests/file/unlink_variation10.phpt index e0c92caeba..e0139571fe 100644 --- a/ext/standard/tests/file/unlink_variation10.phpt +++ b/ext/standard/tests/file/unlink_variation10.phpt @@ -7,13 +7,13 @@ Dave Kelsey <d_kelsey@uk.ibm.com> if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip.. Not for Windows'); } -?> +?> --FILE-- <?php /* Prototype : bool unlink(string filename[, context context]) * Description: Delete a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing unlink() : variation ***\n"; @@ -31,18 +31,18 @@ $dirs = array( $workDir.'/'.$tmpDir, './'.$workDir.'/'.$tmpDir, $workDir.'/../'.$workDir.'/'.$tmpDir, - + //absolute $cwd.'/'.$workDir.'/'.$tmpDir, $cwd.'/./'.$workDir.'/'.$tmpDir, $cwd.'/'.$workDir.'/../'.$workDir.'/'.$tmpDir, - + // multiple separators $workDir.'//'.$tmpDir, $cwd.'//'.$workDir.'//'.$tmpDir, - + ); - + foreach($dirs as $dirToUnlink) { test_link($workDir.'/'.$tmpDir, $dirToLinkTo, $dirToUnlink, true); //soft link @@ -61,9 +61,9 @@ function test_link($linkedDir, $toLinkTo, $tounlink, $softlink) { } else { link($toLinkTo, $linkedDir); - $msg = "hard link"; - } - echo "-- unlinking $msg $tounlink --\n"; + $msg = "hard link"; + } + echo "-- unlinking $msg $tounlink --\n"; $res = unlink($tounlink); if ($res === true) { if (is_link($tounlink) === false) { diff --git a/ext/standard/tests/file/unlink_variation6.phpt b/ext/standard/tests/file/unlink_variation6.phpt index 558d32a483..9c495f2c86 100644 --- a/ext/standard/tests/file/unlink_variation6.phpt +++ b/ext/standard/tests/file/unlink_variation6.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : bool unlink(string filename[, context context]) * Description: Delete a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing unlink() : variation: contexts and relative files ***\n"; @@ -30,7 +30,7 @@ function f_exists($file) { else { echo "$file doesn't exist\n"; } -} +} ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/file/unlink_variation7.phpt b/ext/standard/tests/file/unlink_variation7.phpt index 1860018102..cc8b722413 100644 --- a/ext/standard/tests/file/unlink_variation7.phpt +++ b/ext/standard/tests/file/unlink_variation7.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype : bool unlink(string filename[, context context]) * Description: Delete a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing unlink() : usage variation different types for context ***\n"; @@ -101,7 +101,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // file resource 'file resource' => $fileRes ); diff --git a/ext/standard/tests/file/unlink_variation8-win32.phpt b/ext/standard/tests/file/unlink_variation8-win32.phpt index 8c9fbd895c..27b63bdf2a 100644 --- a/ext/standard/tests/file/unlink_variation8-win32.phpt +++ b/ext/standard/tests/file/unlink_variation8-win32.phpt @@ -7,13 +7,13 @@ Dave Kelsey <d_kelsey@uk.ibm.com> if (substr(PHP_OS, 0, 3) != 'WIN') { die('skip.. only for Windows'); } -?> +?> --FILE-- <?php /* Prototype : bool unlink(string filename[, context context]) * Description: Delete a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing unlink() : variation ***\n"; @@ -29,11 +29,11 @@ $files = array( $workDir.'/'.$tmpFile, './'.$workDir.'/'.$tmpFile, $workDir.'/../'.$workDir.'/'.$tmpFile, - + // relative bad path $workDir.'/../BADDIR/'.$tmpFile, 'BADDIR/'.$tmpFile, - + //absolute $cwd.'/'.$workDir.'/'.$tmpFile, $cwd.'/./'.$workDir.'/'.$tmpFile, @@ -41,17 +41,17 @@ $files = array( //absolute bad path $cwd.'/BADDIR/'.$tmpFile, - + //trailing separators $workDir.'/'.$tmpFile.'/', $cwd.'/'.$workDir.'/'.$tmpFile.'/', - + // multiple separators $workDir.'//'.$tmpFile, $cwd.'//'.$workDir.'//'.$tmpFile, - + ); - + foreach($files as $fileToUnlink) { test_realfile($workDir.'/'.$tmpFile, $fileToUnlink); @@ -61,7 +61,7 @@ rmdir($workDir); function test_realfile($file, $tounlink) { touch($file); - echo "-- removing $tounlink --\n"; + echo "-- removing $tounlink --\n"; $res = unlink($tounlink); if ($res === true) { if (file_exists($tounlink) === false) { diff --git a/ext/standard/tests/file/unlink_variation8.phpt b/ext/standard/tests/file/unlink_variation8.phpt index e142763cef..3940191f57 100644 --- a/ext/standard/tests/file/unlink_variation8.phpt +++ b/ext/standard/tests/file/unlink_variation8.phpt @@ -7,13 +7,13 @@ Dave Kelsey <d_kelsey@uk.ibm.com> if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip.. Not for Windows'); } -?> +?> --FILE-- <?php /* Prototype : bool unlink(string filename[, context context]) * Description: Delete a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing unlink() : variation ***\n"; @@ -31,11 +31,11 @@ $files = array( $workDir.'/'.$tmpFile, './'.$workDir.'/'.$tmpFile, $workDir.'/../'.$workDir.'/'.$tmpFile, - + // relative bad path $workDir.'/../BADDIR/'.$tmpFile, 'BADDIR/'.$tmpFile, - + //absolute $cwd.'/'.$workDir.'/'.$tmpFile, $cwd.'/./'.$workDir.'/'.$tmpFile, @@ -43,17 +43,17 @@ $files = array( //absolute bad path $cwd.'/BADDIR/'.$tmpFile, - + //trailing separators $workDir.'/'.$tmpFile.'/', $cwd.'/'.$workDir.'/'.$tmpFile.'/', - + // multiple separators $workDir.'//'.$tmpFile, $cwd.'//'.$workDir.'//'.$tmpFile, - + ); - + foreach($files as $fileToUnlink) { test_realfile($workDir.'/'.$tmpFile, $fileToUnlink); @@ -66,7 +66,7 @@ rmdir($workDir); function test_realfile($file, $tounlink) { touch($file); - echo "-- removing $tounlink --\n"; + echo "-- removing $tounlink --\n"; $res = unlink($tounlink); if ($res === true) { if (file_exists($tounlink) === false) { @@ -88,9 +88,9 @@ function test_link($linkedfile, $toLinkTo, $tounlink, $softlink) { } else { link($toLinkTo, $linkedfile); - $msg = "hard link"; - } - echo "-- unlinking $msg $tounlink --\n"; + $msg = "hard link"; + } + echo "-- unlinking $msg $tounlink --\n"; $res = unlink($tounlink); if ($res === true) { if (file_exists($tounlink) === false) { diff --git a/ext/standard/tests/file/unlink_variation9-win32.phpt b/ext/standard/tests/file/unlink_variation9-win32.phpt index 0eaed2e4ca..7532785a5d 100644 --- a/ext/standard/tests/file/unlink_variation9-win32.phpt +++ b/ext/standard/tests/file/unlink_variation9-win32.phpt @@ -7,13 +7,13 @@ Dave Kelsey <d_kelsey@uk.ibm.com> if (substr(PHP_OS, 0, 3) != 'WIN') { die('skip.. only for Windows'); } -?> +?> --FILE-- <?php /* Prototype : bool unlink(string filename[, context context]) * Description: Delete a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing unlink() : variation ***\n"; @@ -30,11 +30,11 @@ $files = array( $workDir.'\\'.$tmpFile, '.\\'.$workDir.'\\'.$tmpFile, $workDir.'\\..\\'.$workDir.'\\'.$tmpFile, - + // relative bad path $workDir.'\\..\\BADDIR\\'.$tmpFile, 'BADDIR\\'.$tmpFile, - + //absolute $cwd.'\\'.$workDir.'\\'.$tmpFile, $cwd.'\\.\\'.$workDir.'\\'.$tmpFile, @@ -42,26 +42,26 @@ $files = array( //absolute bad path $cwd.'\\BADDIR\\'.$tmpFile, - + //trailing separators $workDir.'\\'.$tmpFile.'\\', $cwd.'\\'.$workDir.'\\'.$tmpFile.'\\', - + // multiple separators $workDir.'\\\\'.$tmpFile, $cwd.'\\\\'.$workDir.'\\\\'.$tmpFile, - + // Unixified File $unixifiedFile, - + ); - + foreach($files as $fileToUnlink) { $file = $workDir.'/'.$tmpFile; $tounlink = $fileToUnlink; touch($file); - echo "-- removing $tounlink --\n"; + echo "-- removing $tounlink --\n"; $res = unlink($tounlink); if ($res === true) { if (file_exists($tounlink) === false) { diff --git a/ext/standard/tests/file/userfilters.phpt b/ext/standard/tests/file/userfilters.phpt index dfa8376fff..73f87de613 100644 --- a/ext/standard/tests/file/userfilters.phpt +++ b/ext/standard/tests/file/userfilters.phpt @@ -10,7 +10,7 @@ class testfilter extends php_user_filter { $consumed += strlen($bucket->data); stream_bucket_append($out, $bucket); } - return PSFS_PASS_ON; + return PSFS_PASS_ON; } function oncreate() { diff --git a/ext/standard/tests/file/userstreams.phpt b/ext/standard/tests/file/userstreams.phpt index 0e649e9a92..7f0dc1d91c 100644 --- a/ext/standard/tests/file/userstreams.phpt +++ b/ext/standard/tests/file/userstreams.phpt @@ -102,7 +102,7 @@ class mystream $this->position = strlen($GLOBALS[$this->varname]); else $this->position = 0; - + return true; } @@ -266,7 +266,7 @@ foreach($line_lengths as $line_length) { var_dump($dat); break; } - + $j++; } if ($fail_count) diff --git a/ext/standard/tests/file/windows_acls/bug44859.phpt b/ext/standard/tests/file/windows_acls/bug44859.phpt index 4454ee1173..20e10f5c5b 100644 --- a/ext/standard/tests/file/windows_acls/bug44859.phpt +++ b/ext/standard/tests/file/windows_acls/bug44859.phpt @@ -1,7 +1,7 @@ --TEST-- bug #44859 (incorrect result with NTFS ACL permissions, is_writable) --SKIPIF-- -<?php +<?php include_once __DIR__ . '/common.inc'; skipif(); ?> diff --git a/ext/standard/tests/file/windows_acls/bug44859_2.phpt b/ext/standard/tests/file/windows_acls/bug44859_2.phpt index 514953f42e..583e63a2a6 100644 --- a/ext/standard/tests/file/windows_acls/bug44859_2.phpt +++ b/ext/standard/tests/file/windows_acls/bug44859_2.phpt @@ -1,7 +1,7 @@ --TEST-- bug #44859 (incorrect result with NTFS ACL permissions, is_readable) --SKIPIF-- -<?php +<?php include_once __DIR__ . '/common.inc'; skipif(); ?> diff --git a/ext/standard/tests/file/windows_acls/bug44859_3.phpt b/ext/standard/tests/file/windows_acls/bug44859_3.phpt index ed57abba07..35db1f29be 100644 --- a/ext/standard/tests/file/windows_acls/bug44859_3.phpt +++ b/ext/standard/tests/file/windows_acls/bug44859_3.phpt @@ -1,7 +1,7 @@ --TEST-- bug #44859 (incorrect result with NTFS ACL permissions, is_executable) --SKIPIF-- -<?php +<?php include_once __DIR__ . '/common.inc'; skipif(); ?> diff --git a/ext/standard/tests/file/windows_acls/bug44859_4.phpt b/ext/standard/tests/file/windows_acls/bug44859_4.phpt index bf640fa660..452581fa05 100644 --- a/ext/standard/tests/file/windows_acls/bug44859_4.phpt +++ b/ext/standard/tests/file/windows_acls/bug44859_4.phpt @@ -3,7 +3,7 @@ bug #44859 (incorrect result with NTFS ACL permissions, is_readable) --CREDITS-- Venkat Raman Don --SKIPIF-- -<?php +<?php include_once __DIR__ . '/common.inc'; skipif(); ?> diff --git a/ext/standard/tests/file/windows_mb_path/bug54977.phpt b/ext/standard/tests/file/windows_mb_path/bug54977.phpt index d5b184158e..b1bc415f05 100644 --- a/ext/standard/tests/file/windows_mb_path/bug54977.phpt +++ b/ext/standard/tests/file/windows_mb_path/bug54977.phpt @@ -27,7 +27,7 @@ foreach ($paths as $d) { } $myDirectory = opendir($prefix); -while($entryName = readdir($myDirectory)) { +while($entryName = readdir($myDirectory)) { echo get_basename_with_cp($prefix . $entryName, 65001, false) . "\n"; } closedir($myDirectory); diff --git a/ext/standard/tests/file/windows_mb_path/bug64506.phpt b/ext/standard/tests/file/windows_mb_path/bug64506.phpt index 784cffadb7..6d9367f857 100644 --- a/ext/standard/tests/file/windows_mb_path/bug64506.phpt +++ b/ext/standard/tests/file/windows_mb_path/bug64506.phpt @@ -36,7 +36,7 @@ var_dump(unlink($fnw)); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt index 7a6496a619..a5dea1c9b8 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1250"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt index bd4421e7a2..ae7eff4a13 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt @@ -37,7 +37,7 @@ remove_data("dir_cp1250"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt index 488343d8d1..45531b6d6b 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt @@ -38,7 +38,7 @@ remove_data("dir_cp1250"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt index 84b05b71d9..c70570b2b0 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1250"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt index 3759daa71d..a7df51695f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt @@ -37,7 +37,7 @@ remove_data("dir_cp1250"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt index 7e1998ba2a..75e5c55ca9 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt @@ -38,7 +38,7 @@ remove_data("dir_cp1250"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt index 0fbc78fc12..c7604184d2 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1253"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt index ddc79b1204..7b6342ed1b 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt @@ -37,7 +37,7 @@ remove_data("dir_cp1253"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt index 6e28c89e0c..579f78e7ef 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt @@ -38,7 +38,7 @@ remove_data("dir_cp1253"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt index 9a92099cd0..2e63d376c8 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1254"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt index 551a0f2235..7391c3bd9d 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt @@ -37,7 +37,7 @@ remove_data("dir_cp1254"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt index 12df56b11e..8ac17416fe 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt @@ -38,7 +38,7 @@ remove_data("dir_cp1254"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt index cbaba44e4e..0c330ea445 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt @@ -16,7 +16,7 @@ skip_if_no_required_exts(); #vim: set encoding=cp1254 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; $item = "çokbaytlı işleri"; @@ -32,7 +32,7 @@ remove_data("file_cp1254"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\çokbaytlı işleri" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt index 31a48dbc0c..6d8b55d536 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1255"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt index b6a59e4be3..b73f01f729 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt @@ -37,7 +37,7 @@ remove_data("dir_cp1255"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt index 53f83b3a0e..07cfcf053f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt @@ -38,7 +38,7 @@ remove_data("dir_cp1255"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt index b021df7fa4..3471fa7b1f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1256"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt index 2fb10a97a5..4c12d76d97 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt @@ -37,7 +37,7 @@ remove_data("dir_cp1256"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt index ba70e1a77e..4f3108427f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt @@ -38,7 +38,7 @@ remove_data("dir_cp1256"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt index 843c66f4a2..13ec027748 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt @@ -16,10 +16,10 @@ skip_if_no_required_exts(); #vim: set encoding=cp874 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; -$item = "เป็นแฟ้มที่ทดสอบ11"; +$item = "เป็นแฟ้มที่ทดสอบ11"; $prefix = create_data("file_cp874", $item); $fn = $prefix . DIRECTORY_SEPARATOR . $item; @@ -32,7 +32,7 @@ remove_data("file_cp874"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\เป็นแฟ้มที่ทดสอบ11" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt index 32b6f9b066..a287847352 100644 --- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_kartuli"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt index a92e7c34ed..8f15596d38 100644 --- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt @@ -37,7 +37,7 @@ remove_data("dir_kartuli"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt index edfb279cd2..6b0f864cc2 100644 --- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt @@ -38,7 +38,7 @@ remove_data("dir_kartuli"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt index 46077258d1..8f08357792 100644 --- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt @@ -16,10 +16,10 @@ skip_if_no_required_exts(); #vim: set encoding=cp874 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; -$item = "ქართველები55"; +$item = "ქართველები55"; $prefix = create_data("file_kartuli", $item); $fn = $prefix . DIRECTORY_SEPARATOR . $item; @@ -32,7 +32,7 @@ remove_data("file_kartuli"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\ქართველები55" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt index 6bc28110e0..688fc6caca 100644 --- a/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt @@ -12,14 +12,14 @@ skip_if_no_required_exts("mbstring"); --FILE-- <?php -$p = ""; +$p = ""; $s = str_repeat('a', 50); $how_many = 32; for ($i = 0; $i < $how_many; $i++) { $p .= "$s"; $p .= DIRECTORY_SEPARATOR; -} +} $p = realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . $p; diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_1.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_1.phpt index 94518e7a65..b2af71aa76 100644 --- a/ext/standard/tests/file/windows_mb_path/test_long_path_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_long_path_1.phpt @@ -11,7 +11,7 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); --FILE-- <?php -$p = ""; +$p = ""; $s = str_repeat('a', 50); $how_many = 32; @@ -19,7 +19,7 @@ $how_many = 32; for ($i = 0; $i < $how_many; $i++) { $p .= "$s"; $p .= DIRECTORY_SEPARATOR; -} +} $p = realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . $p; diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt index 3be1850c5a..bcae2c53bc 100644 --- a/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt @@ -11,7 +11,7 @@ skip_if_no_required_exts("mbstring"); ?> --FILE-- <?php -$p = ""; +$p = ""; $s = str_repeat('x', 50) . "ü"; $how_many = 32; @@ -19,7 +19,7 @@ $how_many = 32; for ($i = 0; $i < $how_many; $i++) { $p .= "$s"; $p .= DIRECTORY_SEPARATOR; -} +} /* path doesn't exist at this point! */ $p = realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . $p; 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 2453538190..0dcbba2480 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 @@ -15,13 +15,13 @@ if (strlen($start) > 260 || strlen($start) > 248) { --FILE-- <?php -$p = ""; +$p = ""; $s = str_repeat('a', 50); $how_many = 32; for ($i = 0; $i < $how_many; $i++) { $p .= "$s\\"; -} +} $start = realpath(dirname(__FILE__)); if (strlen($start) <= 248) { diff --git a/ext/standard/tests/filters/001.phpt b/ext/standard/tests/filters/001.phpt index afbcdcfdd5..fbfdda2385 100644 --- a/ext/standard/tests/filters/001.phpt +++ b/ext/standard/tests/filters/001.phpt @@ -12,7 +12,7 @@ var_dump(stream_filter_register("", array())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: stream_filter_register(): Filter name cannot be empty in %s on line %d bool(false) diff --git a/ext/standard/tests/filters/stream_filter_remove_basic.phpt b/ext/standard/tests/filters/stream_filter_remove_basic.phpt index 3744b72467..0999f7c6b9 100644 --- a/ext/standard/tests/filters/stream_filter_remove_basic.phpt +++ b/ext/standard/tests/filters/stream_filter_remove_basic.phpt @@ -10,7 +10,7 @@ if(! in_array( "string.rot13", $filters )) die( "skip rot13 filter not available /* Prototype : bool stream_filter_remove(resource stream_filter) * Description: Flushes any data in the filter's internal buffer, removes it from the chain, and frees the resource * Source code: ext/standard/streamsfuncs.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing stream_filter_remove() : basic functionality ***\n"; diff --git a/ext/standard/tests/filters/stream_filter_remove_error.phpt b/ext/standard/tests/filters/stream_filter_remove_error.phpt index 9cbb925855..d1be672136 100644 --- a/ext/standard/tests/filters/stream_filter_remove_error.phpt +++ b/ext/standard/tests/filters/stream_filter_remove_error.phpt @@ -10,7 +10,7 @@ if(! in_array( "string.rot13", $filters )) die( "skip rot13 filter not available /* Prototype : bool stream_filter_remove(resource stream_filter) * Description: Flushes any data in the filter's internal buffer, removes it from the chain, and frees the resource * Source code: ext/standard/streamsfuncs.c - * Alias to functions: + * Alias to functions: */ $file = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'streamfilterTest.txt'; diff --git a/ext/standard/tests/general_functions/001.phpt b/ext/standard/tests/general_functions/001.phpt index bfd82e55b0..307122e1cb 100644 --- a/ext/standard/tests/general_functions/001.phpt +++ b/ext/standard/tests/general_functions/001.phpt @@ -1,7 +1,7 @@ --TEST-- sprintf() function --FILE-- -<?php +<?php $agent = sprintf("%.5s", "James Bond, 007"); diff --git a/ext/standard/tests/general_functions/003.phpt b/ext/standard/tests/general_functions/003.phpt index 7ad90c8b5a..0388cf95b0 100644 --- a/ext/standard/tests/general_functions/003.phpt +++ b/ext/standard/tests/general_functions/003.phpt @@ -1,11 +1,11 @@ --TEST-- levenshtein() function test --FILE-- -<?php +<?php function test_me($title,$expect,$text1,$text2,$cost1=0,$cost2=0,$cost3=0) { - if($cost1==0) + if($cost1==0) $result=levenshtein($text1,$text2); else $result=levenshtein($text1,$text2,$cost1,$cost2,$cost3); @@ -16,8 +16,8 @@ function test_me($title,$expect,$text1,$text2,$cost1=0,$cost2=0,$cost3=0) { echo "for '$text1'/'$text2' "; if($cost1) echo "($cost1:$cost2:$cost3)"; echo "\n"; - - return 1; + + return 1; } $n=0; diff --git a/ext/standard/tests/general_functions/004.phpt b/ext/standard/tests/general_functions/004.phpt index 40b47cc1ca..5468ca99f0 100644 --- a/ext/standard/tests/general_functions/004.phpt +++ b/ext/standard/tests/general_functions/004.phpt @@ -1,7 +1,7 @@ --TEST-- fgetcsv() with tab delimited fields (BUG #8258) --FILE-- -<?php +<?php chdir(dirname(__FILE__)); $fp=fopen("004.data","r"); while($a=fgetcsv($fp,100,"\t")) { diff --git a/ext/standard/tests/general_functions/007.phpt b/ext/standard/tests/general_functions/007.phpt index f755ab4f80..02fc6c6480 100644 --- a/ext/standard/tests/general_functions/007.phpt +++ b/ext/standard/tests/general_functions/007.phpt @@ -5,7 +5,7 @@ MD5 / Base64 function test($str) { $res = md5(base64_decode(base64_encode($str)))."\n"; return $res; -} +} echo test(""); echo test("a"); echo test("abc"); diff --git a/ext/standard/tests/general_functions/009.phpt b/ext/standard/tests/general_functions/009.phpt index e80d36140d..39dc2189b3 100644 --- a/ext/standard/tests/general_functions/009.phpt +++ b/ext/standard/tests/general_functions/009.phpt @@ -5,7 +5,7 @@ SHA1 function test($str) { $res = sha1($str)."\n"; return $res; -} +} echo test(""); echo test("a"); echo test("abc"); diff --git a/ext/standard/tests/general_functions/bug27678.phpt b/ext/standard/tests/general_functions/bug27678.phpt index 6f95509e14..7f6597d288 100644 --- a/ext/standard/tests/general_functions/bug27678.phpt +++ b/ext/standard/tests/general_functions/bug27678.phpt @@ -11,6 +11,6 @@ var_dump(strlen($num) == 3); // $num == 'inf' echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- bool(true) Done diff --git a/ext/standard/tests/general_functions/bug31190.phpt b/ext/standard/tests/general_functions/bug31190.phpt index 7d154708fa..12776448b3 100644 --- a/ext/standard/tests/general_functions/bug31190.phpt +++ b/ext/standard/tests/general_functions/bug31190.phpt @@ -4,7 +4,7 @@ Bug #31190 (exception in call_user_func_array()) <?php class test { - function throwException() { throw new Exception("Hello World!\n"); + function throwException() { throw new Exception("Hello World!\n"); } } $array = array(new test(), 'throwException'); diff --git a/ext/standard/tests/general_functions/bug36011.phpt b/ext/standard/tests/general_functions/bug36011.phpt index 248608e008..00530bf846 100644 --- a/ext/standard/tests/general_functions/bug36011.phpt +++ b/ext/standard/tests/general_functions/bug36011.phpt @@ -9,17 +9,17 @@ class TestClass { echo __METHOD__ . "()\n"; } - + function whee() { array_map(array('TestClass', 'test'), array('array_value')); } - + function whee4() { call_user_func(array('TestClass', 'test')); } - + static function whee5() { call_user_func(array('TestClass', 'test')); diff --git a/ext/standard/tests/general_functions/bug40752.phpt b/ext/standard/tests/general_functions/bug40752.phpt index 9500573e8d..9bf524029c 100644 --- a/ext/standard/tests/general_functions/bug40752.phpt +++ b/ext/standard/tests/general_functions/bug40752.phpt @@ -22,7 +22,7 @@ unlink($file); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(1) { ["foo"]=> array(1) { diff --git a/ext/standard/tests/general_functions/bug41037.phpt b/ext/standard/tests/general_functions/bug41037.phpt index 0ffc8d58f6..b9bb5856d8 100644 --- a/ext/standard/tests/general_functions/bug41037.phpt +++ b/ext/standard/tests/general_functions/bug41037.phpt @@ -14,7 +14,7 @@ declare (ticks=1) { echo "Done\n"; } ?> ---EXPECTF-- +--EXPECTF-- hello Warning: unregister_tick_function(): Unable to delete tick function executed at the moment in %s on line %d Done diff --git a/ext/standard/tests/general_functions/bug41445.phpt b/ext/standard/tests/general_functions/bug41445.phpt index 000e9d347d..f46dc9093c 100644 --- a/ext/standard/tests/general_functions/bug41445.phpt +++ b/ext/standard/tests/general_functions/bug41445.phpt @@ -35,7 +35,7 @@ var_dump(parse_ini_file($file)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(2) { ["001099030277"]=> array(1) { diff --git a/ext/standard/tests/general_functions/bug41445_1.phpt b/ext/standard/tests/general_functions/bug41445_1.phpt index 120d9400b6..b70bf9b8f0 100644 --- a/ext/standard/tests/general_functions/bug41445_1.phpt +++ b/ext/standard/tests/general_functions/bug41445_1.phpt @@ -25,7 +25,7 @@ var_dump(parse_ini_file($file)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(3) { ["2454.33"]=> array(1) { diff --git a/ext/standard/tests/general_functions/bug43293_1.phpt b/ext/standard/tests/general_functions/bug43293_1.phpt index d2c7f10ca4..34eb2f855c 100644 --- a/ext/standard/tests/general_functions/bug43293_1.phpt +++ b/ext/standard/tests/general_functions/bug43293_1.phpt @@ -4,7 +4,7 @@ Bug #43293 (Multiple segfaults in getopt()) register_argc_argv=Off --FILE-- <?php -$argv = array(1, 2, 3); +$argv = array(1, 2, 3); var_dump(getopt("abcd")); var_dump($argv); $argv = null; diff --git a/ext/standard/tests/general_functions/bug44667.phpt b/ext/standard/tests/general_functions/bug44667.phpt index 53290a7a30..d4d7b94b4b 100644 --- a/ext/standard/tests/general_functions/bug44667.phpt +++ b/ext/standard/tests/general_functions/bug44667.phpt @@ -11,19 +11,19 @@ $descriptor_spec = array( 0 => array('pipe', 'rb'), 1 => array('pipe', 'wb'), ); - + $proc = proc_open('cat', $descriptor_spec, $pipes); - + fwrite($pipes[0], 'Hello', 5); fflush($pipes[0]); fclose($pipes[0]); - + $result = fread($pipes[1], 5); fclose($pipes[1]); - + proc_close($proc); - -echo "Result is: ", $result, "\n"; + +echo "Result is: ", $result, "\n"; echo "Done\n"; diff --git a/ext/standard/tests/general_functions/bug66094.phpt b/ext/standard/tests/general_functions/bug66094.phpt index ecc13ab07a..d218e70efa 100644 --- a/ext/standard/tests/general_functions/bug66094.phpt +++ b/ext/standard/tests/general_functions/bug66094.phpt @@ -7,6 +7,6 @@ register_tick_function($closure = function () { echo "Tick!\n"; }); unregister_tick_function($closure); echo "done"; ?> ---EXPECT-- +--EXPECT-- Tick! done diff --git a/ext/standard/tests/general_functions/call_user_func_array_variation_002.phpt b/ext/standard/tests/general_functions/call_user_func_array_variation_002.phpt index 4a4845aa1d..9bd7ddfb35 100644 --- a/ext/standard/tests/general_functions/call_user_func_array_variation_002.phpt +++ b/ext/standard/tests/general_functions/call_user_func_array_variation_002.phpt @@ -5,7 +5,7 @@ Test call_user_func_array() function : first parameter variation /* Prototype : mixed call_user_func_array(string function_name, array parameters) * Description: Call a user function which is the first parameter with the arguments contained in array * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing call_user_func_array() : usage variation ***\n"; diff --git a/ext/standard/tests/general_functions/call_user_func_array_variation_003.phpt b/ext/standard/tests/general_functions/call_user_func_array_variation_003.phpt index 51a5d74ae2..efd6b76255 100644 --- a/ext/standard/tests/general_functions/call_user_func_array_variation_003.phpt +++ b/ext/standard/tests/general_functions/call_user_func_array_variation_003.phpt @@ -5,7 +5,7 @@ Test call_user_func_array() function : second parameter variation /* Prototype : mixed call_user_func_array(string function_name, array parameters) * Description: Call a user function which is the first parameter with the arguments contained in array * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing call_user_func_array() : usage variation ***\n"; diff --git a/ext/standard/tests/general_functions/closures_001.phpt b/ext/standard/tests/general_functions/closures_001.phpt index 3a077f2db6..0e81f912cf 100644 --- a/ext/standard/tests/general_functions/closures_001.phpt +++ b/ext/standard/tests/general_functions/closures_001.phpt @@ -6,6 +6,6 @@ register_shutdown_function(function () { echo "Hello World!\n"; }); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- Done Hello World! diff --git a/ext/standard/tests/general_functions/closures_002.phpt b/ext/standard/tests/general_functions/closures_002.phpt index 6df389bbb1..e0ef5121c0 100644 --- a/ext/standard/tests/general_functions/closures_002.phpt +++ b/ext/standard/tests/general_functions/closures_002.phpt @@ -16,7 +16,7 @@ echo "$i\n"; echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Test %d %d diff --git a/ext/standard/tests/general_functions/debug_zval_dump_o.phpt b/ext/standard/tests/general_functions/debug_zval_dump_o.phpt index e2c84dae9b..b14dcad344 100644 --- a/ext/standard/tests/general_functions/debug_zval_dump_o.phpt +++ b/ext/standard/tests/general_functions/debug_zval_dump_o.phpt @@ -76,7 +76,7 @@ class contains_object_class } /* creating new object $obj */ -$obj = new contains_object_class(); +$obj = new contains_object_class(); $obj1 = & $obj; //object $obj1 references object $obj $obj2 = & $obj; $obj3 = & $obj2; diff --git a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt index 849d8b492c..68a9f7cd9e 100644 --- a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt +++ b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt @@ -49,7 +49,7 @@ debug_zval_dump($ref_first_var); echo "\n-- Value of \$first_var --\n"; debug_zval_dump($first_var); -unset($ref_first_var); +unset($ref_first_var); /* dump value and reference count of $first_var, $ref_first_var here $ref_first_var is unset */ @@ -71,7 +71,7 @@ debug_zval_dump($var_3); /* unsetting $var_3 */ unset($var_3); -echo "\n-- Value of \$var_3: (after unsetting var_3) --\n"; +echo "\n-- Value of \$var_3: (after unsetting var_3) --\n"; debug_zval_dump($var_3); echo "\n-- Value of \$var_2: --\n"; debug_zval_dump($var_2); @@ -94,7 +94,7 @@ $misc_values = array ( /* nulls */ NULL, null, - + /* unset variable */ @$unset_var, 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 c53b5153f8..57115a2b72 100644 --- a/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt +++ b/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt @@ -13,7 +13,7 @@ enable_dl=1 <?php var_dump(dl(str_repeat("a", 8376757))); ?> ---EXPECTF-- +--EXPECTF-- Warning: dl(): File name exceeds the maximum allowed length of %d characters in %s on line %d bool(false) diff --git a/ext/standard/tests/general_functions/error_clear_last.phpt b/ext/standard/tests/general_functions/error_clear_last.phpt index 02936c84cb..675affb625 100644 --- a/ext/standard/tests/general_functions/error_clear_last.phpt +++ b/ext/standard/tests/general_functions/error_clear_last.phpt @@ -15,7 +15,7 @@ var_dump(error_get_last()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- NULL NULL array(4) { diff --git a/ext/standard/tests/general_functions/error_get_last.phpt b/ext/standard/tests/general_functions/error_get_last.phpt index 95a6cf434c..71f068f104 100644 --- a/ext/standard/tests/general_functions/error_get_last.phpt +++ b/ext/standard/tests/general_functions/error_get_last.phpt @@ -13,7 +13,7 @@ var_dump(error_get_last()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- NULL Warning: error_get_last() expects exactly 0 parameters, 1 given in %s on line %d diff --git a/ext/standard/tests/general_functions/escapeshellarg_basic-win32-mb.phpt b/ext/standard/tests/general_functions/escapeshellarg_basic-win32-mb.phpt index f85f4a4195..d7b27cd8de 100644 --- a/ext/standard/tests/general_functions/escapeshellarg_basic-win32-mb.phpt +++ b/ext/standard/tests/general_functions/escapeshellarg_basic-win32-mb.phpt @@ -10,7 +10,7 @@ if( substr(PHP_OS, 0, 3) != "WIN" ) /* Prototype : string escapeshellarg ( string $arg ) * Description: Escape a string to be used as a shell argument. * Source code: ext/standard/exec.c - * Alias to functions: + * Alias to functions: */ echo "Simple testcase for escapeshellarg() function\n"; diff --git a/ext/standard/tests/general_functions/escapeshellarg_basic-win32.phpt b/ext/standard/tests/general_functions/escapeshellarg_basic-win32.phpt index d97c1a956b..7ee46ea9a2 100644 --- a/ext/standard/tests/general_functions/escapeshellarg_basic-win32.phpt +++ b/ext/standard/tests/general_functions/escapeshellarg_basic-win32.phpt @@ -10,7 +10,7 @@ if( substr(PHP_OS, 0, 3) != "WIN" ) /* Prototype : string escapeshellarg ( string $arg ) * Description: Escape a string to be used as a shell argument. * Source code: ext/standard/exec.c - * Alias to functions: + * Alias to functions: */ echo "Simple testcase for escapeshellarg() function\n"; diff --git a/ext/standard/tests/general_functions/escapeshellarg_basic.phpt b/ext/standard/tests/general_functions/escapeshellarg_basic.phpt index c26915c923..1efa72d992 100644 --- a/ext/standard/tests/general_functions/escapeshellarg_basic.phpt +++ b/ext/standard/tests/general_functions/escapeshellarg_basic.phpt @@ -10,7 +10,7 @@ if( substr(PHP_OS, 0, 3) == "WIN" ) /* Prototype : string escapeshellarg ( string $arg ) * Description: Escape a string to be used as a shell argument. * Source code: ext/standard/exec.c - * Alias to functions: + * Alias to functions: */ echo "Simple testcase for escapeshellarg() function\n"; diff --git a/ext/standard/tests/general_functions/escapeshellarg_error.phpt b/ext/standard/tests/general_functions/escapeshellarg_error.phpt index 139a445202..8746b5884a 100644 --- a/ext/standard/tests/general_functions/escapeshellarg_error.phpt +++ b/ext/standard/tests/general_functions/escapeshellarg_error.phpt @@ -38,7 +38,7 @@ var_dump( escapeshellarg($fp)); fclose($fp); echo "\n-- Testing escapeshellarg() function with a array supplied for argument --\n"; -$arg = array(1,2,3); +$arg = array(1,2,3); var_dump( escapeshellarg($arg)); ?> diff --git a/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt b/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt index 8f8bc19d8f..f4e9439b14 100644 --- a/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt +++ b/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12, - -12, + -12, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', diff --git a/ext/standard/tests/general_functions/escapeshellarg_variation1.phpt b/ext/standard/tests/general_functions/escapeshellarg_variation1.phpt index 32431a581a..6f3b6a9f32 100644 --- a/ext/standard/tests/general_functions/escapeshellarg_variation1.phpt +++ b/ext/standard/tests/general_functions/escapeshellarg_variation1.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12, - -12, + -12, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', diff --git a/ext/standard/tests/general_functions/floatval.phpt b/ext/standard/tests/general_functions/floatval.phpt index d7bdffd6ae..136f57707c 100644 --- a/ext/standard/tests/general_functions/floatval.phpt +++ b/ext/standard/tests/general_functions/floatval.phpt @@ -102,7 +102,7 @@ var_dump( doubleval() ); //arguments more than expected var_dump( floatval(TRUE, FALSE) ); var_dump( doubleval(TRUE, FALSE) ); - + echo "\nDone\n"; diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation9.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation9.phpt index 00a24597f8..6e4b304018 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_variation9.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_variation9.phpt @@ -21,7 +21,7 @@ EOT; $variation_array = array( 'session.use_cookies', - 'session.serialize_handler', + 'session.serialize_handler', 'session.save_handler' ); diff --git a/ext/standard/tests/general_functions/get_defined_constants_basic.phpt b/ext/standard/tests/general_functions/get_defined_constants_basic.phpt index 9de39c18d0..ad40e2df7f 100644 --- a/ext/standard/tests/general_functions/get_defined_constants_basic.phpt +++ b/ext/standard/tests/general_functions/get_defined_constants_basic.phpt @@ -5,7 +5,7 @@ Test get_defined_constants() function : basic functionality /* Prototype : array get_defined_constants ([ bool $categorize ] ) * Description: Returns an associative array with the names of all the constants and their values * Source code: Zend/zend_builtin_functions.c - */ + */ echo "*** Testing get_defined_constants() : basic functionality ***\n"; @@ -29,7 +29,7 @@ if ($n2 == $n1 + 1 && array_key_exists("USER_CONSTANT", $arr2)) { ?> ===DONE=== ---EXPECT-- +--EXPECT-- *** Testing get_defined_constants() : basic functionality *** string(5) "array" string(5) "array" diff --git a/ext/standard/tests/general_functions/get_defined_constants_error.phpt b/ext/standard/tests/general_functions/get_defined_constants_error.phpt index 1092712ee9..098abd19c6 100644 --- a/ext/standard/tests/general_functions/get_defined_constants_error.phpt +++ b/ext/standard/tests/general_functions/get_defined_constants_error.phpt @@ -5,7 +5,7 @@ Test get_defined_constants() function : error conditions /* Prototype : array get_defined_constants ([ bool $categorize ] ) * Description: Returns an associative array with the names of all the constants and their values * Source code: Zend/zend_builtin_functions.c - */ + */ echo "*** Testing get_defined_constants() : error conditions ***\n"; diff --git a/ext/standard/tests/general_functions/get_defined_vars_basic.phpt b/ext/standard/tests/general_functions/get_defined_vars_basic.phpt index 3aa6e72a92..cd0360e3ee 100644 --- a/ext/standard/tests/general_functions/get_defined_vars_basic.phpt +++ b/ext/standard/tests/general_functions/get_defined_vars_basic.phpt @@ -11,39 +11,39 @@ Test get_defined_vars() function echo "Simple testcase for get_defined_vars() function\n\n"; function f1() { - echo "\n-- Function f1() called --\n"; + echo "\n-- Function f1() called --\n"; $vars = get_defined_vars(); - + if (count($vars) != 0) { - echo "TEST FAILED\n"; - } - - echo "\n-- ..define some local variables --\n"; + echo "TEST FAILED\n"; + } + + echo "\n-- ..define some local variables --\n"; $i = 123; $f = 123.456; $b = false; - $s = "Hello World"; + $s = "Hello World"; $arr = array(1,2,3,4); - var_dump( get_defined_vars() ); + var_dump( get_defined_vars() ); f2(); } function f2() { - echo "\n -- Function f2() called --\n"; + echo "\n -- Function f2() called --\n"; $vars= get_defined_vars(); - + if (count($vars) != 0) { - echo "TEST FAILED\n"; + echo "TEST FAILED\n"; } - - echo "\n-- ...define some variables --\n"; + + echo "\n-- ...define some variables --\n"; $i = 456; $f = 456.678; $b = true; - $s = "Goodnight"; - $arr = array("foo", "bar"); + $s = "Goodnight"; + $arr = array("foo", "bar"); var_dump( get_defined_vars() ); - + echo "\n-- ...define some more variables --\n"; $i1 = 456; $f1 = 456.678; @@ -56,8 +56,8 @@ echo "\n-- Get variables at global scope --\n"; $vars = get_defined_vars(); if (count($vars) == 0) { - echo "TEST FAILED - Global variables missing at global scope\n"; -} + echo "TEST FAILED - Global variables missing at global scope\n"; +} // call a function f1(); diff --git a/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt b/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt index 2dbe332ccc..33d4af03d2 100644 --- a/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt +++ b/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt @@ -5,7 +5,7 @@ Test get_extension_funcs() function: basic test /* Prototype : array get_extension_funcs ( string $module_name ) * Description: Returns an array with the names of the functions of a module. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "Simple testcase for get_extension_funcs() function\n"; diff --git a/ext/standard/tests/general_functions/get_extension_funcs_error.phpt b/ext/standard/tests/general_functions/get_extension_funcs_error.phpt index 33e32a66a5..d3d72f301b 100644 --- a/ext/standard/tests/general_functions/get_extension_funcs_error.phpt +++ b/ext/standard/tests/general_functions/get_extension_funcs_error.phpt @@ -5,7 +5,7 @@ Test get_extension_funcs() function : error conditions /* Prototype : array get_extension_funcs ( string $module_name ) * Description: Returns an array with the names of the functions of a module. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing get_extension_funcs() : error conditions ***\n"; diff --git a/ext/standard/tests/general_functions/get_extension_funcs_variation.phpt b/ext/standard/tests/general_functions/get_extension_funcs_variation.phpt index c575737264..c412d1816c 100644 --- a/ext/standard/tests/general_functions/get_extension_funcs_variation.phpt +++ b/ext/standard/tests/general_functions/get_extension_funcs_variation.phpt @@ -5,7 +5,7 @@ Test get_extension_funcs() function : error conditions /* Prototype : array get_extension_funcs ( string $module_name ) * Description: Returns an array with the names of the functions of a module. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing get_extension_funcs() function: with unexpected inputs for 'module_name' argument ***\n"; @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource diff --git a/ext/standard/tests/general_functions/get_include_path_basic.phpt b/ext/standard/tests/general_functions/get_include_path_basic.phpt index 999862bc64..b777a2a44d 100644 --- a/ext/standard/tests/general_functions/get_include_path_basic.phpt +++ b/ext/standard/tests/general_functions/get_include_path_basic.phpt @@ -17,7 +17,7 @@ if (ini_get("include_path") == get_include_path()) { echo "PASSED\n"; } else { echo "FAILED\n"; -} +} echo "\nError cases:\n"; var_dump(get_include_path(TRUE)); diff --git a/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt b/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt index 52b2136f5b..127378d3c1 100644 --- a/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt +++ b/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt @@ -5,7 +5,7 @@ Test get_loaded_extensions() function : basic functionality /* Prototype : array get_loaded_extensions ([ bool $zend_extensions= false ] ) * Description: Returns an array with the names of all modules compiled and loaded * Source code: Zend/zend_builtin_functions.c - */ + */ echo "*** Testing get_loaded_extensions() : basic functionality ***\n"; diff --git a/ext/standard/tests/general_functions/get_loaded_extensions_error.phpt b/ext/standard/tests/general_functions/get_loaded_extensions_error.phpt index d731046dc6..10862f4468 100644 --- a/ext/standard/tests/general_functions/get_loaded_extensions_error.phpt +++ b/ext/standard/tests/general_functions/get_loaded_extensions_error.phpt @@ -5,7 +5,7 @@ Test get_loaded_extensions() function : error conditions /* Prototype : array get_loaded_extensions ([ bool $zend_extensions= false ] ) * Description: Returns an array with the names of all modules compiled and loaded * Source code: Zend/zend_builtin_functions.c - */ + */ echo "*** Testing get_loaded_extensions() : error conditions ***\n"; diff --git a/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt b/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt index 75cde18b08..add1ea141c 100644 --- a/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt +++ b/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt @@ -9,9 +9,9 @@ Test get_magic_quotes_gpc() function echo "Simple testcase for get_magic_quotes_gpc() function\n"; var_dump(get_magic_quotes_gpc()); -echo "\n-- Error cases --\n"; +echo "\n-- Error cases --\n"; // no checks on number of args -var_dump(get_magic_quotes_gpc(true)); +var_dump(get_magic_quotes_gpc(true)); ?> ===DONE=== diff --git a/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt b/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt index 4106ee9eea..620e97cf83 100644 --- a/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt +++ b/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt @@ -10,9 +10,9 @@ echo "Simple testcase for get_magic_quotes_runtime() function\n"; var_dump(get_magic_quotes_runtime()); -echo "\n-- Error cases --\n"; +echo "\n-- Error cases --\n"; // no checks on number of args -var_dump(get_magic_quotes_runtime(true)); +var_dump(get_magic_quotes_runtime(true)); ?> ===DONE=== diff --git a/ext/standard/tests/general_functions/get_resource_type_basic.phpt b/ext/standard/tests/general_functions/get_resource_type_basic.phpt index 7ff4aec2c3..99ffbafdea 100644 --- a/ext/standard/tests/general_functions/get_resource_type_basic.phpt +++ b/ext/standard/tests/general_functions/get_resource_type_basic.phpt @@ -5,12 +5,12 @@ Test get_resource_type() function : basic functionality /* Prototype : string get_resource_type ( resource $handle ) * Description: Returns the resource type * Source code: Zend/zend_builtin_functions.c - */ + */ echo "*** Testing get_resource_type() : basic functionality ***\n"; $res = fopen(__FILE__, "r"); -var_dump(get_resource_type($res)); +var_dump(get_resource_type($res)); ?> ===DONE=== diff --git a/ext/standard/tests/general_functions/get_resource_type_error.phpt b/ext/standard/tests/general_functions/get_resource_type_error.phpt index 40dcf07799..f7457bf7f4 100644 --- a/ext/standard/tests/general_functions/get_resource_type_error.phpt +++ b/ext/standard/tests/general_functions/get_resource_type_error.phpt @@ -5,7 +5,7 @@ Test get_resource_type() function : error conditions /* Prototype : string get_resource_type ( resource $handle ) * Description: Returns the resource type * Source code: Zend/zend_builtin_functions.c - */ + */ echo "*** Testing get_resource_type() : error conditions ***\n"; diff --git a/ext/standard/tests/general_functions/get_resource_type_variation1.phpt b/ext/standard/tests/general_functions/get_resource_type_variation1.phpt index cd974fd5e0..df4a04b9d4 100644 --- a/ext/standard/tests/general_functions/get_resource_type_variation1.phpt +++ b/ext/standard/tests/general_functions/get_resource_type_variation1.phpt @@ -5,14 +5,14 @@ Test get_resource_type() function : usage variations - different data types as h /* Prototype : string get_resource_type ( resource $handle ) * Description: Returns the resource type * Source code: Zend/zend_builtin_functions.c - */ + */ echo "*** Testing get_resource_type() : variation test ***\n"; class Hello { public function SayHello($arg) { echo "Hello\n"; - } + } } $res = fopen(__FILE__, "r"); diff --git a/ext/standard/tests/general_functions/getmypid_basic.phpt b/ext/standard/tests/general_functions/getmypid_basic.phpt index 869eb59442..3f4d9cd5cf 100644 --- a/ext/standard/tests/general_functions/getmypid_basic.phpt +++ b/ext/standard/tests/general_functions/getmypid_basic.phpt @@ -5,7 +5,7 @@ Test getmypid() function: basic test /* Prototype : int getmypid ( void ) * Description: Gets the current PHP process ID. * Source code: ext/standard/pageinfo.c - * Alias to functions: + * Alias to functions: */ echo "Simple testcase for getmypid() function\n"; diff --git a/ext/standard/tests/general_functions/getrusage.phpt b/ext/standard/tests/general_functions/getrusage.phpt index e9fc8c6f6e..4caca88e1b 100644 --- a/ext/standard/tests/general_functions/getrusage.phpt +++ b/ext/standard/tests/general_functions/getrusage.phpt @@ -13,7 +13,7 @@ var_dump(getrusage(array())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(5) "array" string(5) "array" string(5) "array" diff --git a/ext/standard/tests/general_functions/getrusage_basic.phpt b/ext/standard/tests/general_functions/getrusage_basic.phpt index b2379a7663..0fe0a6afba 100644 --- a/ext/standard/tests/general_functions/getrusage_basic.phpt +++ b/ext/standard/tests/general_functions/getrusage_basic.phpt @@ -7,7 +7,7 @@ Test getrusage() function: basic test /* Prototype : array getrusage ([ int $who ] ) * Description: Gets the current resource usages * Source code: ext/standard/microtime.c - * Alias to functions: + * Alias to functions: */ echo "Simple testcase for getrusage() function\n"; @@ -16,11 +16,11 @@ $dat = getrusage(); if (!is_array($dat)) { echo "TEST FAILED : getrusage should return an array\n"; -} +} // echo the fields which are common to all platforms echo "User time used (seconds) " . $dat["ru_utime.tv_sec"] . "\n"; -echo "User time used (microseconds) " . $dat["ru_utime.tv_usec"] . "\n"; +echo "User time used (microseconds) " . $dat["ru_utime.tv_usec"] . "\n"; ?> ===DONE=== --EXPECTF-- diff --git a/ext/standard/tests/general_functions/getrusage_error.phpt b/ext/standard/tests/general_functions/getrusage_error.phpt index a40a43449a..04c9fb9abe 100644 --- a/ext/standard/tests/general_functions/getrusage_error.phpt +++ b/ext/standard/tests/general_functions/getrusage_error.phpt @@ -7,7 +7,7 @@ Test getrusage() function : error conditions - incorrect number of args /* Prototype : array getrusage ([ int $who ] ) * Description: Gets the current resource usages * Source code: ext/standard/microtime.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/standard/tests/general_functions/getrusage_variation1.phpt b/ext/standard/tests/general_functions/getrusage_variation1.phpt index 568c9c7383..0c072ed6e0 100644 --- a/ext/standard/tests/general_functions/getrusage_variation1.phpt +++ b/ext/standard/tests/general_functions/getrusage_variation1.phpt @@ -3,14 +3,14 @@ Test getrusage() function : usage variation - diff data types as $who arg --SKIPIF-- <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64-bit only"); -if (!function_exists("getrusage")) die("skip"); +if (!function_exists("getrusage")) die("skip"); ?> --FILE-- <?php /* Prototype : array getrusage ([ int $who ] ) * Description: Gets the current resource usages * Source code: ext/standard/microtime.c - * Alias to functions: + * Alias to functions: */ @@ -50,13 +50,13 @@ $inputs = array( false, TRUE, FALSE, - + // string data /*16*/ "0", '1', "1232456", "1.23E4", - + // undefined data /*20*/ @$undefined_var, diff --git a/ext/standard/tests/general_functions/getservbyname_error.phpt b/ext/standard/tests/general_functions/getservbyname_error.phpt index eaeec64888..ec9b7795a5 100644 --- a/ext/standard/tests/general_functions/getservbyname_error.phpt +++ b/ext/standard/tests/general_functions/getservbyname_error.phpt @@ -8,7 +8,7 @@ Danilo Sanchi (sanchi@grupporetina.com) --FILE-- <?php $service = "www"; -$protocol = "tcp"; +$protocol = "tcp"; $extra_arg = 12; var_dump(getservbyname($service, $protocol, $extra_arg ) ); var_dump(getservbyname($service)); diff --git a/ext/standard/tests/general_functions/getservbyname_variation14.phpt b/ext/standard/tests/general_functions/getservbyname_variation14.phpt index 986d7d5973..8e94bb9557 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation14.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation14.phpt @@ -6,7 +6,7 @@ Test function getservbyname() by substituting argument 2 with string values. echo "*** Test substituting argument 2 with string values ***\n"; -$service = "www"; +$service = "www"; $heredoc = <<<EOT diff --git a/ext/standard/tests/general_functions/getservbyname_variation2.phpt b/ext/standard/tests/general_functions/getservbyname_variation2.phpt index 7c00b1e7f7..a659ba4cce 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation2.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation2.phpt @@ -6,7 +6,7 @@ Test function getservbyname() by substituting argument 1 with boolean values. echo "*** Test substituting argument 1 with boolean values ***\n"; -$protocol = "tcp"; +$protocol = "tcp"; $variation_array = array( diff --git a/ext/standard/tests/general_functions/getservbyname_variation5.phpt b/ext/standard/tests/general_functions/getservbyname_variation5.phpt index f06a6ec884..2ee334a0ba 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation5.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation5.phpt @@ -6,7 +6,7 @@ Test function getservbyname() by substituting argument 1 with int values. echo "*** Test substituting argument 1 with int values ***\n"; -$protocol = "tcp"; +$protocol = "tcp"; $variation_array = array ( diff --git a/ext/standard/tests/general_functions/getservbyport_error.phpt b/ext/standard/tests/general_functions/getservbyport_error.phpt index e2c245b7ea..7d4107cedf 100644 --- a/ext/standard/tests/general_functions/getservbyport_error.phpt +++ b/ext/standard/tests/general_functions/getservbyport_error.phpt @@ -8,7 +8,7 @@ Simone Gentili (sensorario@gmail.com) --FILE-- <?php $port = 80; -$protocol = "tcp"; +$protocol = "tcp"; $extra_arg = 12; var_dump(getservbyport( $port, $protocol, $extra_arg ) ); var_dump(getservbyport($port)); diff --git a/ext/standard/tests/general_functions/getservbyport_variation1.phpt b/ext/standard/tests/general_functions/getservbyport_variation1.phpt index 3073f66430..a876ac1fea 100644 --- a/ext/standard/tests/general_functions/getservbyport_variation1.phpt +++ b/ext/standard/tests/general_functions/getservbyport_variation1.phpt @@ -18,7 +18,7 @@ Simone Gentili (sensorario@gmail.com) var_dump(getservbyport( 2, 2)); var_dump(getservbyport( "80", "tcp")); var_dump(getservbyport( new stdClass(), new stdClass())); - + ?> --EXPECTF-- bool(false) diff --git a/ext/standard/tests/general_functions/gettype_settype_error.phpt b/ext/standard/tests/general_functions/gettype_settype_error.phpt index 2c6aac6875..af8959d9fd 100644 --- a/ext/standard/tests/general_functions/gettype_settype_error.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_error.phpt @@ -32,7 +32,7 @@ var_dump( settype( $var, "unknown" ) ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- **** Testing gettype() and settype() functions **** *** Testing gettype(): error conditions *** diff --git a/ext/standard/tests/general_functions/gettype_settype_variation1.phpt b/ext/standard/tests/general_functions/gettype_settype_variation1.phpt index 6265d0a373..5761f1b832 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation1.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation1.phpt @@ -24,7 +24,7 @@ precision=14 dump the variable to see its new data get the new type of the variable */ - + /* function to handle catchable errors */ function foo($errno, $errstr, $errfile, $errline) { // var_dump($errstr); @@ -33,7 +33,7 @@ function foo($errno, $errstr, $errfile, $errline) { } //set the error handler, this is required as // settype() would fail with catachable fatal error -set_error_handler("foo"); +set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); @@ -57,7 +57,7 @@ class point } } -$var_values = array ( +$var_values = array ( /* nulls */ null, @@ -65,7 +65,7 @@ $var_values = array ( FALSE, TRUE, true, - + /* strings */ "\xFF", "\x66", @@ -79,7 +79,7 @@ $var_values = array ( "10", "10string", '10string', - "1", + "1", "-1", "1e2", " 1", @@ -125,11 +125,11 @@ $var_values = array ( 0555, -0555, 02224242434343152, // an octal value > than max int - + /* floats */ 1e5, -1e5, - 1E5, + 1E5, -1E5, -1.5, .5, @@ -155,7 +155,7 @@ $var_values = array ( $undef_var ); -/* test conversion to null type */ +/* test conversion to null type */ $type = "null"; echo "\n*** Testing gettype() & settype() functions : usage variations ***\n"; @@ -166,20 +166,20 @@ foreach ($var_values as $var) { // get the current data type var_dump( gettype($var) ); - + // convert it to null var_dump( settype($var, $type) ); // dump the converted data var_dump( $var ); - + // check the new type after conversion var_dump( gettype($var) ); } echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation2.phpt b/ext/standard/tests/general_functions/gettype_settype_variation2.phpt index ba3a0dbfec..ab9126c281 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation2.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation2.phpt @@ -36,7 +36,7 @@ function foo($errno, $errstr, $errfile, $errline) { } //set the error handler, this is required as // settype() would fail with catachable fatal error -set_error_handler("foo"); +set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); @@ -60,7 +60,7 @@ class point } } -$var_values = array ( +$var_values = array ( /* nulls */ null, @@ -68,7 +68,7 @@ $var_values = array ( FALSE, TRUE, true, - + /* strings */ "\xFF", "\x66", @@ -82,7 +82,7 @@ $var_values = array ( "10", "10string", '10string', - "1", + "1", "-1", "1e2", " 1", @@ -128,11 +128,11 @@ $var_values = array ( 0555, -0555, 02224242434343152, // an octal value > than max int - + /* floats */ 1e5, -1e5, - 1E5, + 1E5, -1E5, -1.5, .5, @@ -173,13 +173,13 @@ foreach ($types as $type) { // get the current data type var_dump( gettype($var) ); - + // convert it to new type var_dump( settype($var, $type) ); - + // dump the converted $var var_dump( $var ); - + // get the new type of the $var var_dump( gettype($var) ); } diff --git a/ext/standard/tests/general_functions/gettype_settype_variation3.phpt b/ext/standard/tests/general_functions/gettype_settype_variation3.phpt index 29c1463fb1..ff30b3e919 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation3.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation3.phpt @@ -33,7 +33,7 @@ function foo($errno, $errstr, $errfile, $errline) { } //set the error handler, this is required as // settype() would fail with catachable fatal error -set_error_handler("foo"); +set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); @@ -57,7 +57,7 @@ class point } } -$var_values = array ( +$var_values = array ( /* nulls */ null, @@ -65,7 +65,7 @@ $var_values = array ( FALSE, TRUE, true, - + /* strings */ "\xFF", "\x66", @@ -79,7 +79,7 @@ $var_values = array ( "10", "10string", '10string', - "1", + "1", "-1", "1e2", " 1", @@ -125,11 +125,11 @@ $var_values = array ( 0555, -0555, 02224242434343152, // an octal value > than max int - + /* floats */ 1e5, -1e5, - 1E5, + 1E5, -1E5, -1.5, .5, @@ -184,7 +184,7 @@ foreach ($types as $type) { echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation4.phpt b/ext/standard/tests/general_functions/gettype_settype_variation4.phpt index 6f7cc23df4..03fd9e3d9e 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation4.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation4.phpt @@ -33,7 +33,7 @@ function foo($errno, $errstr, $errfile, $errline) { } //set the error handler, this is required as // settype() would fail with catachable fatal error -set_error_handler("foo"); +set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); @@ -61,7 +61,7 @@ class class_with_no_member { // no member(s) } -$var_values = array ( +$var_values = array ( /* nulls */ null, @@ -69,7 +69,7 @@ $var_values = array ( FALSE, TRUE, true, - + /* strings */ "\xFF", "\x66", @@ -86,7 +86,7 @@ $var_values = array ( "10", "10string", '10string', - "1", + "1", "-1", "1e2", " 1", @@ -133,12 +133,12 @@ $var_values = array ( 0555, -0555, 02224242434343152, // an octal value > than max int - + /* floats */ 0.0, 1e5, -1e5, - 1E5, + 1E5, -1E5, -1.5, .5, @@ -163,7 +163,7 @@ $var_values = array ( /* undefined/unset vars */ $unset_var, $undef_var, - + /* binary strings */ b"0", b'0', @@ -209,7 +209,7 @@ foreach ($types as $type) { echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/head.phpt b/ext/standard/tests/general_functions/head.phpt index e83bbf6aca..059c56b258 100644 --- a/ext/standard/tests/general_functions/head.phpt +++ b/ext/standard/tests/general_functions/head.phpt @@ -27,7 +27,7 @@ var_dump(headers_list()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- NULL bool(false) array(0) { diff --git a/ext/standard/tests/general_functions/intval_variation1.phpt b/ext/standard/tests/general_functions/intval_variation1.phpt index bf88c7c920..dc12153832 100644 --- a/ext/standard/tests/general_functions/intval_variation1.phpt +++ b/ext/standard/tests/general_functions/intval_variation1.phpt @@ -5,7 +5,7 @@ Test intval() function : usage variation /* Prototype : int intval(mixed var [, int base]) * Description: Get the integer value of a variable using the optional base for the conversion * Source code: ext/standard/type.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing intval() : usage variation ***\n"; diff --git a/ext/standard/tests/general_functions/intval_variation2.phpt b/ext/standard/tests/general_functions/intval_variation2.phpt index b27ace4063..150c7f8222 100644 --- a/ext/standard/tests/general_functions/intval_variation2.phpt +++ b/ext/standard/tests/general_functions/intval_variation2.phpt @@ -7,7 +7,7 @@ Test intval() function : usage variation /* Prototype : int intval(mixed var [, int base]) * Description: Get the integer value of a variable using the optional base for the conversion * Source code: ext/standard/type.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing intval() : usage variation ***\n"; diff --git a/ext/standard/tests/general_functions/is_array.phpt b/ext/standard/tests/general_functions/is_array.phpt index 469a8ec6cb..767e5d9320 100644 --- a/ext/standard/tests/general_functions/is_array.phpt +++ b/ext/standard/tests/general_functions/is_array.phpt @@ -46,7 +46,7 @@ unset($unset_array); // other types in a array $varient_arrays = array ( /* integers */ - 543915, + 543915, -5322, 0x55F, -0xCCF, @@ -54,7 +54,7 @@ $varient_arrays = array ( -0654, /* strings */ - "", + "", '', "0", '0', @@ -68,10 +68,10 @@ $varient_arrays = array ( .5E+8, -.5e+90, 1e5, - + /* objects */ new stdclass, - + /* resources */ $fp, $dfp, @@ -81,7 +81,7 @@ $varient_arrays = array ( NULL, /* boolean */ - true, + true, TRUE, FALSE, false, @@ -104,7 +104,7 @@ var_dump( is_array() ); //arguments more than expected var_dump( is_array ($fp, $fp) ); - + echo "Done\n"; /* close resources */ fclose($fp); diff --git a/ext/standard/tests/general_functions/is_bool.phpt b/ext/standard/tests/general_functions/is_bool.phpt index a8336524de..82bed146a2 100644 --- a/ext/standard/tests/general_functions/is_bool.phpt +++ b/ext/standard/tests/general_functions/is_bool.phpt @@ -18,7 +18,7 @@ $valid_bools = array( bool values, expected output: bool(true) */ $loop_counter = 1; foreach ($valid_bools as $bool_val ) { - echo "-- Iteration $loop_counter --\n"; $loop_counter++; + echo "-- Iteration $loop_counter --\n"; $loop_counter++; var_dump( is_bool($bool_val) ); } @@ -98,7 +98,7 @@ $not_bool_types = array ( /* nulls */ null, NULL, - + /* arrays */ array(), array(0), @@ -114,8 +114,8 @@ $not_bool_types = array ( array(1 => "One", "two" => 2), /* unset bool vars and undefined var */ - @$unset_bool1, - @$unset_bool2, + @$unset_bool1, + @$unset_bool2, @$unset_var, @$undefined_var ); @@ -123,7 +123,7 @@ $not_bool_types = array ( is_bool() on non bull types, expected output: bool(false) */ $loop_counter = 1; foreach ($not_bool_types as $type ) { - echo "-- Iteration $loop_counter --\n"; $loop_counter++; + echo "-- Iteration $loop_counter --\n"; $loop_counter++; var_dump( is_bool($type) ); } @@ -133,7 +133,7 @@ var_dump( is_bool() ); //arguments more than expected var_dump( is_bool(TRUE, FALSE) ); - + echo "Done\n"; // close resources diff --git a/ext/standard/tests/general_functions/is_callable_basic2.phpt b/ext/standard/tests/general_functions/is_callable_basic2.phpt index 06941832db..bec24c8e81 100644 --- a/ext/standard/tests/general_functions/is_callable_basic2.phpt +++ b/ext/standard/tests/general_functions/is_callable_basic2.phpt @@ -32,11 +32,11 @@ echo "\n*** Testing is_callable() on objects ***\n"; class object_class { public $value = 100; - + /* static method */ static public function foo() { } - + public function foo1() { } /* function name with mixed string and integer */ @@ -47,7 +47,7 @@ class object_class } /* function name having boolean value */ public function TRUE() { - } + } protected function foo2() { } diff --git a/ext/standard/tests/general_functions/is_float.phpt b/ext/standard/tests/general_functions/is_float.phpt index 6adf5414f8..e223047640 100644 --- a/ext/standard/tests/general_functions/is_float.phpt +++ b/ext/standard/tests/general_functions/is_float.phpt @@ -8,7 +8,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); <?php /* Prototype: bool is_float ( mixed $var ); * Description: Finds whether the given variable is a float - */ + */ echo "*** Testing is_float(), is_double() and is_real() with float values***\n"; // different valid float values @@ -90,7 +90,7 @@ $not_floats = array ( TRUE, false, FALSE, - + "", // strings '', "0", @@ -103,7 +103,7 @@ $not_floats = array ( '1e5', '1.5e6_string', "1.5e6_string", - + 1, // integers, hex and octal -1, 0, @@ -112,7 +112,7 @@ $not_floats = array ( -0x673, 0123, -0123, - + @$unset_var, // unset variable @$undefined_var ); @@ -137,7 +137,7 @@ var_dump( is_real() ); var_dump( is_float( $floats[0], $floats[1]) ); var_dump( is_double( $floats[0], $floats[1]) ); var_dump( is_real( $floats[0], $floats[1]) ); - + echo "Done\n"; // close the resources used diff --git a/ext/standard/tests/general_functions/is_float_64bit.phpt b/ext/standard/tests/general_functions/is_float_64bit.phpt index f5350f848e..7b20dff2ce 100644 --- a/ext/standard/tests/general_functions/is_float_64bit.phpt +++ b/ext/standard/tests/general_functions/is_float_64bit.phpt @@ -10,7 +10,7 @@ precision=14 <?php /* Prototype: bool is_float ( mixed $var ); * Description: Finds whether the given variable is a float - */ + */ echo "*** Testing is_float(), is_double() and is_real() with float values***\n"; // different valid float values @@ -92,7 +92,7 @@ $not_floats = array ( TRUE, false, FALSE, - + "", // strings '', "0", @@ -105,7 +105,7 @@ $not_floats = array ( '1e5', '1.5e6_string', "1.5e6_string", - + 1, // integers, hex and octal -1, 0, @@ -114,7 +114,7 @@ $not_floats = array ( -0x673, 0123, -0123, - + @$unset_var, // unset variable @$undefined_var ); @@ -139,7 +139,7 @@ var_dump( is_real() ); var_dump( is_float( $floats[0], $floats[1]) ); var_dump( is_double( $floats[0], $floats[1]) ); var_dump( is_real( $floats[0], $floats[1]) ); - + echo "Done\n"; ?> --EXPECTF-- diff --git a/ext/standard/tests/general_functions/is_int.phpt b/ext/standard/tests/general_functions/is_int.phpt index aa2306e763..4266a3b39c 100644 --- a/ext/standard/tests/general_functions/is_int.phpt +++ b/ext/standard/tests/general_functions/is_int.phpt @@ -17,7 +17,7 @@ $valid_ints = array( 1, -1, -2147483648, // max negative integer value - -2147483647, + -2147483647, 2147483647, // max positive integer value 2147483640, 0x123B, // integer as hexadecimal @@ -36,7 +36,7 @@ $valid_ints = array( integer values, expected output: bool(true) */ $loop_counter = 1; foreach ($valid_ints as $int_val ) { - echo "--Iteration $loop_counter--\n"; $loop_counter++; + echo "--Iteration $loop_counter--\n"; $loop_counter++; var_dump( is_int($int_val) ); var_dump( is_integer($int_val) ); var_dump( is_long($int_val) ); @@ -61,7 +61,7 @@ $not_int_types = array ( 0x800000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int -020000000001, // float value, beyond max negative int - 0.0, + 0.0, -0.1, 1.0, 1e5, @@ -70,14 +70,14 @@ $not_int_types = array ( -1E9, 10.0000000000000000005, 10.5e+5, - + /* objects */ new stdclass, /* resources */ $fp, $dfp, - + /* arrays */ array(), array(0), @@ -91,7 +91,7 @@ $not_int_types = array ( array(FALSE), array(1,2,3,4), array(1 => "One", "two" => 2), - + /* strings */ "", '', @@ -126,7 +126,7 @@ $not_int_types = array ( is_int() on non integer types, expected output: bool(false) */ $loop_counter = 1; foreach ($not_int_types as $type ) { - echo "--Iteration $loop_counter--\n"; $loop_counter++; + echo "--Iteration $loop_counter--\n"; $loop_counter++; var_dump( is_int($type) ); var_dump( is_integer($type) ); var_dump( is_long($type) ); @@ -142,7 +142,7 @@ var_dump( is_long() ); var_dump( is_int(TRUE, FALSE) ); var_dump( is_integer(TRUE, FALSE) ); var_dump( is_long(TRUE, FALSE) ); - + echo "Done\n"; // close the resources diff --git a/ext/standard/tests/general_functions/is_int_64bit.phpt b/ext/standard/tests/general_functions/is_int_64bit.phpt index ac98b09436..883debbfd8 100644 --- a/ext/standard/tests/general_functions/is_int_64bit.phpt +++ b/ext/standard/tests/general_functions/is_int_64bit.phpt @@ -19,7 +19,7 @@ $valid_ints = array( 1, -1, -2147483648, // max negative integer value - -2147483647, + -2147483647, 2147483647, // max positive integer value 2147483640, 0x123B, // integer as hexadecimal @@ -38,7 +38,7 @@ $valid_ints = array( integer values, expected output: bool(true) */ $loop_counter = 1; foreach ($valid_ints as $int_val ) { - echo "--Iteration $loop_counter--\n"; $loop_counter++; + echo "--Iteration $loop_counter--\n"; $loop_counter++; var_dump( is_int($int_val) ); var_dump( is_integer($int_val) ); var_dump( is_long($int_val) ); @@ -63,7 +63,7 @@ $not_int_types = array ( 0x800000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int -020000000001, // float value, beyond max negative int - 0.0, + 0.0, -0.1, 1.0, 1e5, @@ -72,14 +72,14 @@ $not_int_types = array ( -1E9, 10.0000000000000000005, 10.5e+5, - + /* objects */ new stdclass, /* resources */ $fp, $dfp, - + /* arrays */ array(), array(0), @@ -93,7 +93,7 @@ $not_int_types = array ( array(FALSE), array(1,2,3,4), array(1 => "One", "two" => 2), - + /* strings */ "", '', @@ -128,7 +128,7 @@ $not_int_types = array ( is_int() on non integer types, expected output: bool(false) */ $loop_counter = 1; foreach ($not_int_types as $type ) { - echo "--Iteration $loop_counter--\n"; $loop_counter++; + echo "--Iteration $loop_counter--\n"; $loop_counter++; var_dump( is_int($type) ); var_dump( is_integer($type) ); var_dump( is_long($type) ); @@ -144,7 +144,7 @@ var_dump( is_long() ); var_dump( is_int(TRUE, FALSE) ); var_dump( is_integer(TRUE, FALSE) ); var_dump( is_long(TRUE, FALSE) ); - + echo "Done\n"; ?> --EXPECTF-- diff --git a/ext/standard/tests/general_functions/is_null.phpt b/ext/standard/tests/general_functions/is_null.phpt index e52b3d29f4..dace39ca10 100644 --- a/ext/standard/tests/general_functions/is_null.phpt +++ b/ext/standard/tests/general_functions/is_null.phpt @@ -15,7 +15,7 @@ $unset_bool = true; $unset_object = new stdclass; $unset_resource = fopen(__FILE__, "r"); // unset them to make it null. -unset ($unset_array, $unset_int, $unset_float, $unset_bool, $unset_object, $unset_resource); +unset ($unset_array, $unset_int, $unset_float, $unset_bool, $unset_object, $unset_resource); $null_var1 = NULL; $null_var2 = null; @@ -133,7 +133,7 @@ var_dump( is_null() ); //arguments more than expected var_dump( is_null(NULL, null) ); - + echo "Done\n"; // close the resources used diff --git a/ext/standard/tests/general_functions/is_numeric.phpt b/ext/standard/tests/general_functions/is_numeric.phpt index b529994ec1..b88f1ec24a 100644 --- a/ext/standard/tests/general_functions/is_numeric.phpt +++ b/ext/standard/tests/general_functions/is_numeric.phpt @@ -58,15 +58,15 @@ $numerics = array( //0x1111111111111111111111, -0x1111111, +0x6698319, - 01000000000000000000000, + 01000000000000000000000, 0123, 0345, - -0200001, - -0200001.7, - 0200001.7, - +0200001, - +0200001.7, - +0200001.7, + -0200001, + -0200001.7, + 0200001.7, + +0200001, + +0200001.7, + +0200001.7, 2.00000000000000000000001, // a float value with more precision points "1", // numeric in the form of string "-1", @@ -108,10 +108,10 @@ unset ($unset_var); // other types in a array $not_numerics = array( "0x80001", - "-0x80001", - "+0x80001", + "-0x80001", + "+0x80001", "-0x80001.5", - "0x80001.5", + "0x80001.5", new stdclass, // object $fp, // resource $dfp, @@ -126,7 +126,7 @@ $not_numerics = array( "20 test", "3.6test", "1,000", - "NULL", + "NULL", "true", true, NULL, @@ -151,7 +151,7 @@ var_dump( is_numeric() ); //arguments more than expected var_dump( is_numeric("10", "20") ); - + echo "Done\n"; // close the resources used diff --git a/ext/standard/tests/general_functions/is_object.phpt b/ext/standard/tests/general_functions/is_object.phpt index 89b5081fae..0060f5e526 100644 --- a/ext/standard/tests/general_functions/is_object.phpt +++ b/ext/standard/tests/general_functions/is_object.phpt @@ -34,7 +34,7 @@ class concreteClass extends abstractClass // interface class interface IValue { - public function setVal ($name, $val); + public function setVal ($name, $val); public function dumpVal (); } @@ -42,11 +42,11 @@ interface IValue class Value implements IValue { private $vars = array (); - + public function setVal ( $name, $val ) { $this->vars[$name] = $val; } - + public function dumpVal () { var_dump ( $vars ); } @@ -67,7 +67,7 @@ class myClass $this->public_var1 = new foo(); $this->private_var = new foo(); $this->proected_var = new foo(); - } + } } // create a object of each class defined above @@ -88,8 +88,8 @@ $valid_objects = array( $foo_object, $Value_object, $concreteClass_object -); - +); + /* loop to check that is_object() recognizes different objects, expected output: bool(true) */ $loop_counter = 1; @@ -144,7 +144,7 @@ var_dump( is_object() ); //arguments more than expected var_dump( is_object($myClass_object, $myClass_object) ); - + echo "Done\n"; // close the resources used diff --git a/ext/standard/tests/general_functions/is_resource_basic.phpt b/ext/standard/tests/general_functions/is_resource_basic.phpt index 27583d3d87..5ff4d2d59d 100644 --- a/ext/standard/tests/general_functions/is_resource_basic.phpt +++ b/ext/standard/tests/general_functions/is_resource_basic.phpt @@ -5,14 +5,14 @@ Test is_resource() function : basic functionality /* Prototype : bool is_resource ( mixed $var ) * Description: Finds whether a variable is a resource * Source code: ext/standard/type.c - */ + */ echo "*** Testing is_resource() : basic functionality ***\n"; class Hello { public function SayHello($arg) { echo "Hello\n"; - } + } } @@ -25,7 +25,7 @@ $vars = array( array(1,2,3,4,5), NULL, new Hello()); - + $types = array( "bool=false", "bool=true", @@ -34,7 +34,7 @@ $types = array( "string", "array", "NULL", - "object"); + "object"); echo "\nNon-resource type cases\n"; @@ -44,7 +44,7 @@ for ($i=0; $i < count($vars); $i++) { } else { echo $types[$i]. " test returns FALSE\n"; } -} +} $res = fopen(__FILE__, "r"); echo "\nResource type..var_dump after file open returns\n"; @@ -64,7 +64,7 @@ if (is_resource($res)) { echo " TRUE\n"; } else { echo " FALSE\n"; -} +} ?> diff --git a/ext/standard/tests/general_functions/is_scalar.phpt b/ext/standard/tests/general_functions/is_scalar.phpt index d3e2fa572b..a7adf6d8e5 100644 --- a/ext/standard/tests/general_functions/is_scalar.phpt +++ b/ext/standard/tests/general_functions/is_scalar.phpt @@ -33,7 +33,7 @@ $scalar_variables = array( " ", ' ', "string", - 'string', + 'string', "0", // numeric as string "40", "50.696", @@ -94,7 +94,7 @@ $variation_array = array( @$resource, @$undefined_var // undefined variable -); +); /* loop through each element of $variation_array to see the working of is_scalar on non-scalar values, expected output: bool(false) @@ -113,7 +113,7 @@ var_dump( is_scalar() ); var_dump( is_scalar( $scalar_variables[2], $scalar_variables[2]) ); var_dump( is_scalar( new stdclass, new stdclass) ); -echo "Done\n"; +echo "Done\n"; // close the resources used fclose($fp); diff --git a/ext/standard/tests/general_functions/is_string.phpt b/ext/standard/tests/general_functions/is_string.phpt index b8c82b187b..685ac6fb14 100644 --- a/ext/standard/tests/general_functions/is_string.phpt +++ b/ext/standard/tests/general_functions/is_string.phpt @@ -146,7 +146,7 @@ var_dump( is_string() ); //arguments more than expected var_dump( is_string("string", "test") ); - + echo "Done\n"; // close the resources used diff --git a/ext/standard/tests/general_functions/isset_basic1.phpt b/ext/standard/tests/general_functions/isset_basic1.phpt index 4c03210342..7731097799 100644 --- a/ext/standard/tests/general_functions/isset_basic1.phpt +++ b/ext/standard/tests/general_functions/isset_basic1.phpt @@ -4,7 +4,7 @@ Test isset() function : basic functionality <?php /* Prototype : bool isset ( mixed $var [, mixed $var [, $... ]] ) * Description: Determine if a variable is set and is not NULL - */ + */ class foo {} diff --git a/ext/standard/tests/general_functions/isset_basic2.phpt b/ext/standard/tests/general_functions/isset_basic2.phpt index 9137aeb922..bf121ed6dc 100644 --- a/ext/standard/tests/general_functions/isset_basic2.phpt +++ b/ext/standard/tests/general_functions/isset_basic2.phpt @@ -4,7 +4,7 @@ Test isset() function : basic functionality <?php /* Prototype : bool isset ( mixed $var [, mixed $var [, $... ]] ) * Description: Determine if a variable is set and is not NULL - */ + */ class foo {} @@ -28,14 +28,14 @@ var_dump(isset($i, $f, $s, $b)); echo "\n\nArray test:\n"; $arr = array(); -var_dump(isset($var)); +var_dump(isset($var)); var_dump(isset($var[1])); -var_dump(isset($var, $var[1])); +var_dump(isset($var, $var[1])); echo "..now set\n"; $var[1] = 10; -var_dump(isset($var)); -var_dump(isset($var[1])); -var_dump(isset($var, $var[1])); +var_dump(isset($var)); +var_dump(isset($var[1])); +var_dump(isset($var, $var[1])); ?> ===DONE=== diff --git a/ext/standard/tests/general_functions/ob_get_flush_basic.phpt b/ext/standard/tests/general_functions/ob_get_flush_basic.phpt index dbda1d9e66..9c76af97bd 100644 --- a/ext/standard/tests/general_functions/ob_get_flush_basic.phpt +++ b/ext/standard/tests/general_functions/ob_get_flush_basic.phpt @@ -7,7 +7,7 @@ output_buffering=0 /* Prototype : bool ob_get_flush(void) * Description: Get current buffer contents, flush (send) the output buffer, and delete current output buffer * Source code: main/output.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ob_get_flush() : basic functionality ***\n"; diff --git a/ext/standard/tests/general_functions/ob_get_flush_error.phpt b/ext/standard/tests/general_functions/ob_get_flush_error.phpt index 1d3538120d..3d3b47d615 100644 --- a/ext/standard/tests/general_functions/ob_get_flush_error.phpt +++ b/ext/standard/tests/general_functions/ob_get_flush_error.phpt @@ -7,7 +7,7 @@ output_buffering=0 /* Prototype : bool ob_get_flush(void) * Description: Get current buffer contents, flush (send) the output buffer, and delete current output buffer * Source code: main/output.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ob_get_flush() : error conditions ***\n"; diff --git a/ext/standard/tests/general_functions/ob_get_length_basic.phpt b/ext/standard/tests/general_functions/ob_get_length_basic.phpt index 9b3e8fb465..5fdc71d67c 100644 --- a/ext/standard/tests/general_functions/ob_get_length_basic.phpt +++ b/ext/standard/tests/general_functions/ob_get_length_basic.phpt @@ -7,7 +7,7 @@ output_buffering=0 /* Prototype : int ob_get_length(void) * Description: Return the length of the output buffer * Source code: main/output.c - * Alias to functions: + * Alias to functions: */ function dump_string_length( $string ) diff --git a/ext/standard/tests/general_functions/parse_ini_basic.phpt b/ext/standard/tests/general_functions/parse_ini_basic.phpt index f5a18c457e..8d7b2f8a22 100644 --- a/ext/standard/tests/general_functions/parse_ini_basic.phpt +++ b/ext/standard/tests/general_functions/parse_ini_basic.phpt @@ -14,7 +14,7 @@ var_dump(parse_ini_file($ini_file, 1)); echo "Done.\n"; ?> ---EXPECT-- +--EXPECT-- array(26) { ["basic"]=> array(15) { diff --git a/ext/standard/tests/general_functions/parse_ini_booleans.phpt b/ext/standard/tests/general_functions/parse_ini_booleans.phpt index 530e186a99..5b854c3f41 100644 --- a/ext/standard/tests/general_functions/parse_ini_booleans.phpt +++ b/ext/standard/tests/general_functions/parse_ini_booleans.phpt @@ -10,7 +10,7 @@ var_dump(parse_ini_file($ini_file, 1)); echo "Done.\n"; ?> ---EXPECT-- +--EXPECT-- array(3) { ["error_reporting values"]=> array(6) { diff --git a/ext/standard/tests/general_functions/parse_ini_file.phpt b/ext/standard/tests/general_functions/parse_ini_file.phpt index fb12c3f139..ebc714455d 100644 --- a/ext/standard/tests/general_functions/parse_ini_file.phpt +++ b/ext/standard/tests/general_functions/parse_ini_file.phpt @@ -120,7 +120,7 @@ var_dump(parse_ini_file($filename, true)); @unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: parse_ini_file() expects at least 1 parameter, 0 given in %sparse_ini_file.php on line 6 bool(false) diff --git a/ext/standard/tests/general_functions/parse_ini_string_001.phpt b/ext/standard/tests/general_functions/parse_ini_string_001.phpt index e5e402b8fc..c3939a2246 100644 --- a/ext/standard/tests/general_functions/parse_ini_string_001.phpt +++ b/ext/standard/tests/general_functions/parse_ini_string_001.phpt @@ -69,7 +69,7 @@ Non_alpha12 = \ ;Non_alpha17 = ~ ;Non_alpha18 = ! ;Non_alpha19 = $ -;Non_alpha20 = () +;Non_alpha20 = () Non_alpha1_quotes = ";" Non_alpha2_quotes = "+" diff --git a/ext/standard/tests/general_functions/parse_ini_string_002.phpt b/ext/standard/tests/general_functions/parse_ini_string_002.phpt index 98c9c0b359..106cd0c842 100644 --- a/ext/standard/tests/general_functions/parse_ini_string_002.phpt +++ b/ext/standard/tests/general_functions/parse_ini_string_002.phpt @@ -86,7 +86,7 @@ var_dump(parse_ini_string($ini, true)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: parse_ini_string() expects at least 1 parameter, 0 given in %s bool(false) diff --git a/ext/standard/tests/general_functions/php_uname_error.phpt b/ext/standard/tests/general_functions/php_uname_error.phpt index ca4c3d4022..2f671cd016 100644 --- a/ext/standard/tests/general_functions/php_uname_error.phpt +++ b/ext/standard/tests/general_functions/php_uname_error.phpt @@ -13,7 +13,7 @@ var_dump( php_uname('a', true) ); echo "\n-- Testing php_uname() function with invalid mode --\n"; // am invalid mode should result in same o/p as mode 'a' -var_dump( php_uname('z') == php_uname('z') ); +var_dump( php_uname('z') == php_uname('z') ); class barClass { } diff --git a/ext/standard/tests/general_functions/php_uname_variation1.phpt b/ext/standard/tests/general_functions/php_uname_variation1.phpt index d94fd80049..4a47827657 100644 --- a/ext/standard/tests/general_functions/php_uname_variation1.phpt +++ b/ext/standard/tests/general_functions/php_uname_variation1.phpt @@ -26,34 +26,34 @@ $values = array( "1" => 1, "12345" => 12345, "-2345" => -2345, - + // float data "10.5" => 10.5, "-10.5" => -10.5, "10.1234567e10" => 10.1234567e10, "10.7654321E-10" => 10.7654321E-10, ".5" => .5, - + // null data "NULL" => NULL, "null" => null, - + // boolean data "true" => true, "false" => false, "TRUE" => TRUE, "FALSE" => FALSE, - + // empty data "\"\"" => "", "''" => '', - + // object data "new fooClass()" => new fooClass(), - + // undefined data "undefined var" => $undefined_var, - + // unset data "unset var" => $unset_var, ); diff --git a/ext/standard/tests/general_functions/print_r.phpt b/ext/standard/tests/general_functions/print_r.phpt index 5069dd33f1..0cc8e609b1 100644 --- a/ext/standard/tests/general_functions/print_r.phpt +++ b/ext/standard/tests/general_functions/print_r.phpt @@ -42,7 +42,7 @@ $integers = array ( -0x80000000, // min range of hexadecimal integer 017777777777, // max posotive octal integer -020000000000 // min range of octal integer -); +); /* calling check_printr() to display contents of integer variables using print_r() */ check_printr($integers); @@ -112,7 +112,7 @@ $booleans = array ( FALSE, true, false -); +); /* calling check_printr() to display boolean variables using print_r() */ check_printr($booleans); var_dump( reset($booleans) ); @@ -227,7 +227,7 @@ print_r($recursion_obj2); echo "\n*** Testing print_r() on resources ***\n"; /* file type resource */ -$file_handle = fopen(__FILE__, "r"); +$file_handle = fopen(__FILE__, "r"); /* directory type resource */ $dir_handle = opendir( dirname(__FILE__) ); diff --git a/ext/standard/tests/general_functions/print_r_64bit.phpt b/ext/standard/tests/general_functions/print_r_64bit.phpt index 3054e0a431..8809a1b808 100644 --- a/ext/standard/tests/general_functions/print_r_64bit.phpt +++ b/ext/standard/tests/general_functions/print_r_64bit.phpt @@ -47,7 +47,7 @@ $integers = array ( -0x80000000, // min range of hexadecimal integer 017777777777, // max posotive octal integer -020000000000 // min range of octal integer -); +); /* calling check_printr() to display contents of integer variables using print_r() */ check_printr($integers); @@ -117,7 +117,7 @@ $booleans = array ( FALSE, true, false -); +); /* calling check_printr() to display boolean variables using print_r() */ check_printr($booleans); var_dump( reset($booleans) ); @@ -232,7 +232,7 @@ print_r($recursion_obj2); echo "\n*** Testing print_r() on resources ***\n"; /* file type resource */ -$file_handle = fopen(__FILE__, "r"); +$file_handle = fopen(__FILE__, "r"); /* directory type resource */ $dir_handle = opendir( dirname(__FILE__) ); diff --git a/ext/standard/tests/general_functions/putenv.phpt b/ext/standard/tests/general_functions/putenv.phpt index 254207320b..ab2c1b41f7 100644 --- a/ext/standard/tests/general_functions/putenv.phpt +++ b/ext/standard/tests/general_functions/putenv.phpt @@ -20,7 +20,7 @@ var_dump(putenv("")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(false) bool(true) string(5) "value" diff --git a/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt b/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt index 76c6db5468..ea8a0ab119 100644 --- a/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt +++ b/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt @@ -24,7 +24,7 @@ var_dump(putenv('FOO=啊a啊啊啊啊'), getenv("FOO")); ?> ===DONE=== ---EXPECT-- +--EXPECT-- bool(true) string(3) "啊" bool(true) diff --git a/ext/standard/tests/general_functions/rand.phpt b/ext/standard/tests/general_functions/rand.phpt index 93faf3ac16..e6639a71c7 100644 --- a/ext/standard/tests/general_functions/rand.phpt +++ b/ext/standard/tests/general_functions/rand.phpt @@ -29,7 +29,7 @@ var_dump(mt_getrandmax(1)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(%d) Warning: mt_rand() expects exactly 2 parameters, 1 given in %s on line %d diff --git a/ext/standard/tests/general_functions/sleep_basic.phpt b/ext/standard/tests/general_functions/sleep_basic.phpt index ac0b1d7db2..2c5f5ab3e6 100644 --- a/ext/standard/tests/general_functions/sleep_basic.phpt +++ b/ext/standard/tests/general_functions/sleep_basic.phpt @@ -15,7 +15,7 @@ echo "*** Testing sleep() : basic functionality ***\n"; $sleeptime = 1; // sleep for 1 seconds -set_time_limit(20); +set_time_limit(20); $time_start = microtime(true); diff --git a/ext/standard/tests/general_functions/sleep_error.phpt b/ext/standard/tests/general_functions/sleep_error.phpt index 199bd8e9bc..2e75837701 100644 --- a/ext/standard/tests/general_functions/sleep_error.phpt +++ b/ext/standard/tests/general_functions/sleep_error.phpt @@ -7,7 +7,7 @@ Test sleep() function : error conditions * Source code: ext/standard/basic_functions.c */ set_time_limit(20); - + echo "*** Testing sleep() : error conditions ***\n"; echo "\n-- Testing sleep() function with zero arguments --\n"; diff --git a/ext/standard/tests/general_functions/strval.phpt b/ext/standard/tests/general_functions/strval.phpt index ee5313aaae..d72ac7a2ab 100644 --- a/ext/standard/tests/general_functions/strval.phpt +++ b/ext/standard/tests/general_functions/strval.phpt @@ -21,7 +21,7 @@ EOD; /* null heredoc string */ $heredoc_empty_string = <<<EOD EOD; -/* heredoc string with NULL */ +/* heredoc string with NULL */ $heredoc_NULL_string = <<<EOD NULL EOD; @@ -33,15 +33,15 @@ $scalars = array( 1, -1, -2147483648, // max negative integer value - -2147483647, + -2147483647, 2147483647, // max positive integer value 2147483640, 0x123B, // integer as hexadecimal 0x12ab, 0Xfff, 0XFA, - - /* floats */ + + /* floats */ -0x80000000, // max negative integer as hexadecimal 0x7fffffff, // max positive integer as hexadecimal 0x7FFFFFFF, // max positive integer as hexadecimal @@ -66,12 +66,12 @@ $scalars = array( .0034E-30, /* booleans */ - true, + true, TRUE, FALSE, - false, + false, - /* strings */ + /* strings */ "", '', " ", @@ -147,7 +147,7 @@ var_dump( strval() ); //arguments more than expected var_dump( strval( $scalars[0], $scalars[1]) ); - + echo "Done\n"; // close the resources used diff --git a/ext/standard/tests/general_functions/type.phpt b/ext/standard/tests/general_functions/type.phpt index ac29a1bf38..90bfb45f28 100644 --- a/ext/standard/tests/general_functions/type.phpt +++ b/ext/standard/tests/general_functions/type.phpt @@ -54,7 +54,7 @@ foreach ($types as $type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(5) "array" string(6) "string" string(5) "array" diff --git a/ext/standard/tests/general_functions/uniqid_basic.phpt b/ext/standard/tests/general_functions/uniqid_basic.phpt index 2da832b8ed..109fe00328 100644 --- a/ext/standard/tests/general_functions/uniqid_basic.phpt +++ b/ext/standard/tests/general_functions/uniqid_basic.phpt @@ -26,16 +26,16 @@ $prefix = array ( false ); -for ($i = 0; $i < count($prefix); $i++) { +for ($i = 0; $i < count($prefix); $i++) { var_dump(uniqid($prefix[$i])); var_dump(uniqid($prefix[$i], true)); var_dump(uniqid($prefix[$i], false)); echo "\n"; -} +} ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- *** Testing uniqid() : basic functionality *** uniqid() without a prefix diff --git a/ext/standard/tests/general_functions/uniqid_error.phpt b/ext/standard/tests/general_functions/uniqid_error.phpt index 8f7f22d7d3..b358edc48c 100644 --- a/ext/standard/tests/general_functions/uniqid_error.phpt +++ b/ext/standard/tests/general_functions/uniqid_error.phpt @@ -17,7 +17,7 @@ var_dump(uniqid($prefix, $more_entropy, $extra_arg)); echo "\n-- Testing uniqid() function with invalid values for \$prefix --\n"; class class1{} $obj = new class1(); -$res = fopen(__FILE__, "r"); +$res = fopen(__FILE__, "r"); $array = array(1,2,3); uniqid($array, false); @@ -28,7 +28,7 @@ fclose($res); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- *** Testing uniqid() : error conditions *** -- Testing uniqid() function with more than expected no. of arguments -- diff --git a/ext/standard/tests/general_functions/usleep_basic.phpt b/ext/standard/tests/general_functions/usleep_basic.phpt index bec1dfa1d7..a4b31c6524 100644 --- a/ext/standard/tests/general_functions/usleep_basic.phpt +++ b/ext/standard/tests/general_functions/usleep_basic.phpt @@ -10,9 +10,9 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); * Description: Delays program execution for the given number of micro seconds. * Source code: ext/standard/basic_functions.c */ - + set_time_limit(20); - + echo "*** Testing usleep() : basic functionality ***\n"; $sleeptime = 1000000; // == 1 seconds diff --git a/ext/standard/tests/general_functions/usleep_error.phpt b/ext/standard/tests/general_functions/usleep_error.phpt index bdd120cde9..93aa9824e3 100644 --- a/ext/standard/tests/general_functions/usleep_error.phpt +++ b/ext/standard/tests/general_functions/usleep_error.phpt @@ -6,8 +6,8 @@ Test usleep() function : error conditions * Description: Delays program execution for the given number of micro seconds. * Source code: ext/standard/basic_functions.c */ - -set_time_limit(20); + +set_time_limit(20); echo "*** Testing usleep() : error conditions ***\n"; diff --git a/ext/standard/tests/general_functions/var_dump.phpt b/ext/standard/tests/general_functions/var_dump.phpt index 78c862b77d..bccbd23910 100644 --- a/ext/standard/tests/general_functions/var_dump.phpt +++ b/ext/standard/tests/general_functions/var_dump.phpt @@ -22,9 +22,9 @@ function check_vardump( $variables ) { $counter++; } } - + echo "\n*** Testing var_dump() on integer variables ***\n"; -$integers = array ( +$integers = array ( 0, // zero as argument 000000123, //octal value of 83 123000000, @@ -40,7 +40,7 @@ $integers = array ( -0x80000000, // min range of hexadecimal integer 017777777777, // max posotive octal integer -020000000000 // min range of octal integer -); +); /* calling check_vardump() to display contents of integer variables using var_dump() */ check_vardump($integers); @@ -111,7 +111,7 @@ $booleans = array ( FALSE, true, false -); +); /* calling check_vardump() to display boolean variables using var_dump() */ check_vardump($booleans); @@ -226,7 +226,7 @@ var_dump($recursion_obj2); echo "\n*** Testing var_dump() on resources ***\n"; /* file type resource */ -$file_handle = fopen(__FILE__, "r"); +$file_handle = fopen(__FILE__, "r"); /* directory type resource */ $dir_handle = opendir( dirname(__FILE__) ); @@ -254,7 +254,7 @@ $variations = array ( array( new no_member_class, array(), false, 0 ), array( -0.00, "Where am I?", array(7,8,9), TRUE, 'A', 987654321 ), array( @$unset_var, 2.E+10, 100-20.9, 000004.599998 ), //unusual data - array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7') + array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7') ); /* calling check_vardump() to display combinations of scalar and non-scalar variables using var_dump() */ @@ -287,7 +287,7 @@ echo "\n*** Testing error conditions ***\n"; var_dump(); /* closing resource handle used */ -closedir($dir_handle); +closedir($dir_handle); echo "Done\n"; ?> diff --git a/ext/standard/tests/general_functions/var_dump_64bit.phpt b/ext/standard/tests/general_functions/var_dump_64bit.phpt index 3b8212204a..f9ed8dab2e 100644 --- a/ext/standard/tests/general_functions/var_dump_64bit.phpt +++ b/ext/standard/tests/general_functions/var_dump_64bit.phpt @@ -22,9 +22,9 @@ function check_vardump( $variables ) { $counter++; } } - + echo "\n*** Testing var_dump() on integer variables ***\n"; -$integers = array ( +$integers = array ( 0, // zero as argument 000000123, //octal value of 83 123000000, @@ -40,7 +40,7 @@ $integers = array ( -0x80000000, // min range of hexadecimal integer 017777777777, // max posotive octal integer -020000000000 // min range of octal integer -); +); /* calling check_vardump() to display contents of integer variables using var_dump() */ check_vardump($integers); @@ -111,7 +111,7 @@ $booleans = array ( FALSE, true, false -); +); /* calling check_vardump() to display boolean variables using var_dump() */ check_vardump($booleans); @@ -226,7 +226,7 @@ var_dump($recursion_obj2); echo "\n*** Testing var_dump() on resources ***\n"; /* file type resource */ -$file_handle = fopen(__FILE__, "r"); +$file_handle = fopen(__FILE__, "r"); /* directory type resource */ $dir_handle = opendir( dirname(__FILE__) ); @@ -254,7 +254,7 @@ $variations = array ( array( new no_member_class, array(), false, 0 ), array( -0.00, "Where am I?", array(7,8,9), TRUE, 'A', 987654321 ), array( @$unset_var, 2.E+10, 100-20.9, 000004.599998 ), //unusual data - array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7') + array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7') ); /* calling check_vardump() to display combinations of scalar and non-scalar variables using var_dump() */ @@ -287,7 +287,7 @@ echo "\n*** Testing error conditions ***\n"; var_dump(); /* closing resource handle used */ -closedir($dir_handle); +closedir($dir_handle); echo "Done\n"; ?> diff --git a/ext/standard/tests/general_functions/var_export-locale.phpt b/ext/standard/tests/general_functions/var_export-locale.phpt index e440238970..10fb889858 100644 --- a/ext/standard/tests/general_functions/var_export-locale.phpt +++ b/ext/standard/tests/general_functions/var_export-locale.phpt @@ -23,7 +23,7 @@ $valid_ints = array( '1', '-1', '-2147483648', // max negative integer value - '-2147483647', + '-2147483647', 2147483647, // max positive integer value 2147483640, 0x123B, // integer as hexadecimal @@ -57,7 +57,7 @@ echo "*** Testing var_export() with valid boolean values ***\n"; $valid_bool = array( 1, TRUE, - true, + true, 0, FALSE, false @@ -207,18 +207,18 @@ class concreteClass extends abstractClass // interface class interface iValue { - public function setVal ($name, $val); + public function setVal ($name, $val); public function dumpVal (); } // implement the interface class Value implements iValue { private $vars = array (); - + public function setVal ( $name, $val ) { $this->vars[$name] = $val; } - + public function dumpVal () { var_export ( $vars ); } @@ -239,7 +239,7 @@ class myClass $this->public_var1 = new foo(); $this->private_var = new foo(); $this->proected_var = new foo(); - } + } } // create a object of each class defined above @@ -260,7 +260,7 @@ $valid_objects = array( $foo_object, $Value_object, $concreteClass_object - ); + ); $counter = 1; /* Loop to check for above objects with var_export() */ echo "\n*** Output for objects ***\n"; @@ -274,7 +274,7 @@ var_dump( var_export( $obj, TRUE) ); echo "\n"; $counter++; } - + echo "*** Testing var_export() with valid null values ***\n"; // different valid null values $unset_var = array(); @@ -306,7 +306,7 @@ var_export( var_export() ); //arguments more than expected var_export( var_export(TRUE, FALSE, TRUE) ); - + echo "\n\nDone"; diff --git a/ext/standard/tests/general_functions/var_export_basic1.phpt b/ext/standard/tests/general_functions/var_export_basic1.phpt index 5f5f09bb2d..9dbc821271 100644 --- a/ext/standard/tests/general_functions/var_export_basic1.phpt +++ b/ext/standard/tests/general_functions/var_export_basic1.phpt @@ -5,7 +5,7 @@ Test var_export() function with integer values /* Prototype : mixed var_export(mixed var [, bool return]) * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing var_export() with integer values ***\n"; @@ -15,7 +15,7 @@ $valid_ints = array( '1' => '1', '-1' => '-1', '-2147483648' => '-2147483648', // max negative integer value - '-2147483647' => '-2147483647', + '-2147483647' => '-2147483647', '2147483647' => 2147483647, // max positive integer value '2147483640' => 2147483640, '0x123B' => 0x123B, // integer as hexadecimal diff --git a/ext/standard/tests/general_functions/var_export_basic2.phpt b/ext/standard/tests/general_functions/var_export_basic2.phpt index d1c731fd3f..300b5287c8 100644 --- a/ext/standard/tests/general_functions/var_export_basic2.phpt +++ b/ext/standard/tests/general_functions/var_export_basic2.phpt @@ -6,7 +6,7 @@ Test var_export() function with valid boolean values /* Prototype : mixed var_export(mixed var [, bool return]) * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing var_export() with valid boolean values ***\n"; @@ -14,12 +14,12 @@ echo "*** Testing var_export() with valid boolean values ***\n"; $valid_bool = array( "1" => 1, "TRUE" => TRUE, - "true" => true, + "true" => true, "0" => 0, "FALSE" => FALSE, "false" => false ); - + /* Loop to check for above boolean values with var_export() */ echo "\n*** Output for boolean values ***\n"; foreach($valid_bool as $key => $bool_value) { diff --git a/ext/standard/tests/general_functions/var_export_basic3.phpt b/ext/standard/tests/general_functions/var_export_basic3.phpt index d02065a7f6..f31334e69e 100644 --- a/ext/standard/tests/general_functions/var_export_basic3.phpt +++ b/ext/standard/tests/general_functions/var_export_basic3.phpt @@ -7,7 +7,7 @@ serialize_precision=17 /* Prototype : mixed var_export(mixed var [, bool return]) * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing var_export() with valid float values ***\n"; diff --git a/ext/standard/tests/general_functions/var_export_basic4.phpt b/ext/standard/tests/general_functions/var_export_basic4.phpt index 4668ace1c5..9b6e42c71e 100644 --- a/ext/standard/tests/general_functions/var_export_basic4.phpt +++ b/ext/standard/tests/general_functions/var_export_basic4.phpt @@ -5,7 +5,7 @@ Test var_export() function with valid strings /* Prototype : mixed var_export(mixed var [, bool return]) * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ diff --git a/ext/standard/tests/general_functions/var_export_basic5.phpt b/ext/standard/tests/general_functions/var_export_basic5.phpt index dacb355323..3e0e50f21c 100644 --- a/ext/standard/tests/general_functions/var_export_basic5.phpt +++ b/ext/standard/tests/general_functions/var_export_basic5.phpt @@ -7,7 +7,7 @@ serialize_precision=17 /* Prototype : mixed var_export(mixed var [, bool return]) * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ diff --git a/ext/standard/tests/general_functions/var_export_basic6.phpt b/ext/standard/tests/general_functions/var_export_basic6.phpt index bdcdf48c02..a24b44b949 100644 --- a/ext/standard/tests/general_functions/var_export_basic6.phpt +++ b/ext/standard/tests/general_functions/var_export_basic6.phpt @@ -5,7 +5,7 @@ Test var_export() function with valid objects /* Prototype : mixed var_export(mixed var [, bool return]) * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing var_export() with valid objects ***\n"; @@ -35,18 +35,18 @@ class concreteClass extends abstractClass // interface class interface iValue { - public function setVal ($name, $val); + public function setVal ($name, $val); public function dumpVal (); } // implement the interface class Value implements iValue { private $vars = array (); - + public function setVal ( $name, $val ) { $this->vars[$name] = $val; } - + public function dumpVal () { var_export ( $vars ); } @@ -67,7 +67,7 @@ class myClass $this->public_var1 = new foo(); $this->private_var = new foo(); $this->proected_var = new foo(); - } + } } // create a object of each class defined above @@ -88,7 +88,7 @@ $valid_objects = array( "foo_object" => $foo_object, "Value_object" => $Value_object, "concreteClass_object" => $concreteClass_object - ); + ); /* Loop to check for above objects with var_export() */ echo "\n*** Output for objects ***\n"; foreach($valid_objects as $key => $obj) { diff --git a/ext/standard/tests/general_functions/var_export_basic7.phpt b/ext/standard/tests/general_functions/var_export_basic7.phpt index 525c55470d..02668237c9 100644 --- a/ext/standard/tests/general_functions/var_export_basic7.phpt +++ b/ext/standard/tests/general_functions/var_export_basic7.phpt @@ -5,7 +5,7 @@ Test var_export() function with valid null values /* Prototype : mixed var_export(mixed var [, bool return]) * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing var_export() with valid null values ***\n"; diff --git a/ext/standard/tests/general_functions/var_export_basic8.phpt b/ext/standard/tests/general_functions/var_export_basic8.phpt index faae2bca17..3fe0a23d3a 100644 --- a/ext/standard/tests/general_functions/var_export_basic8.phpt +++ b/ext/standard/tests/general_functions/var_export_basic8.phpt @@ -5,16 +5,16 @@ var_export(): simple test with arrays and objects /* Prototype : mixed var_export(mixed var [, bool return]) * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ - + echo "\n\n-- Var export on a simple object --\n"; $o1 = new stdclass; $o1->p = '22'; $o2 = new stdclass; $o2->a = 1; -$o2->b = array('k'=>2); -$o2->x = $o1; +$o2->b = array('k'=>2); +$o2->x = $o1; var_export($o2); echo "\n\n-- Var export on an simple array --\n"; diff --git a/ext/standard/tests/general_functions/var_export_error1.phpt b/ext/standard/tests/general_functions/var_export_error1.phpt index d9c5eee9dc..de66874c25 100644 --- a/ext/standard/tests/general_functions/var_export_error1.phpt +++ b/ext/standard/tests/general_functions/var_export_error1.phpt @@ -5,7 +5,7 @@ Test var_export() function : error conditions /* Prototype : mixed var_export(mixed var [, bool return]) * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing var_export() : error conditions ***\n"; diff --git a/ext/standard/tests/general_functions/var_export_error2.phpt b/ext/standard/tests/general_functions/var_export_error2.phpt index a6403e610d..9ad5803fbe 100644 --- a/ext/standard/tests/general_functions/var_export_error2.phpt +++ b/ext/standard/tests/general_functions/var_export_error2.phpt @@ -5,7 +5,7 @@ Test var_export() function : error conditions - recursive object /* Prototype : mixed var_export(mixed var [, bool return]) * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ @$obj->p =& $obj; diff --git a/ext/standard/tests/general_functions/var_export_error3.phpt b/ext/standard/tests/general_functions/var_export_error3.phpt index c862691e91..284460d242 100644 --- a/ext/standard/tests/general_functions/var_export_error3.phpt +++ b/ext/standard/tests/general_functions/var_export_error3.phpt @@ -5,7 +5,7 @@ Test var_export() function : error conditions - recursive array /* Prototype : mixed var_export(mixed var [, bool return]) * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ $a[] =& $a; diff --git a/ext/standard/tests/http/bug60570.phpt b/ext/standard/tests/http/bug60570.phpt index 29c6a46f17..7cdb6e3d41 100644 --- a/ext/standard/tests/http/bug60570.phpt +++ b/ext/standard/tests/http/bug60570.phpt @@ -26,7 +26,7 @@ function do_test() { $context = stream_context_create(array('http'=>array('timeout'=>1))); file_get_contents('http://127.0.0.1:12342/', 0, $context); unset($context); - + $b = $a; $a = count(get_resources()); } diff --git a/ext/standard/tests/image/getimagesize_basic.phpt b/ext/standard/tests/image/getimagesize_basic.phpt index 63ae334066..f911ef33d2 100644 --- a/ext/standard/tests/image/getimagesize_basic.phpt +++ b/ext/standard/tests/image/getimagesize_basic.phpt @@ -16,13 +16,13 @@ $imagetype_filenames = array( //PNG file "PNG image file" => "200x100.png", - + //SWF file "SWF image file" => "200x100.swf", - + //BMP file "BMP image file" => "200x100.bmp", - + //TIFF intel byte order "TIFF intel byte order image file" => "200x100.tif", diff --git a/ext/standard/tests/image/getimagesize_error1.phpt b/ext/standard/tests/image/getimagesize_error1.phpt index 947379d145..9544a2acf1 100644 --- a/ext/standard/tests/image/getimagesize_error1.phpt +++ b/ext/standard/tests/image/getimagesize_error1.phpt @@ -5,7 +5,7 @@ Test getimagesize() function : error conditions - wrong number of args /* Prototype : proto array getimagesize(string imagefile [, array info]) * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing getimagesize() : error conditions ***\n"; diff --git a/ext/standard/tests/image/getimagesize_jpgapp.phpt b/ext/standard/tests/image/getimagesize_jpgapp.phpt index 766427b59f..d171365baf 100644 --- a/ext/standard/tests/image/getimagesize_jpgapp.phpt +++ b/ext/standard/tests/image/getimagesize_jpgapp.phpt @@ -5,7 +5,7 @@ Test getimagesize() function : basic functionality - load APP info from jpeg. /* Prototype : proto array getimagesize(string imagefile [, array info]) * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/standard/tests/image/getimagesize_tif_mm.phpt b/ext/standard/tests/image/getimagesize_tif_mm.phpt index 8cac17b3e7..a5f5bb8cc3 100644 --- a/ext/standard/tests/image/getimagesize_tif_mm.phpt +++ b/ext/standard/tests/image/getimagesize_tif_mm.phpt @@ -5,7 +5,7 @@ GetImageSize() for tiff format with big-endian (aka Motorola, aka MM) ordering /* Prototype : proto array getimagesize(string imagefile [, array info]) * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing getimagesize() : tiff_mm format ***\n"; diff --git a/ext/standard/tests/image/getimagesize_variation1.phpt b/ext/standard/tests/image/getimagesize_variation1.phpt index 78795f7636..23f2b15745 100644 --- a/ext/standard/tests/image/getimagesize_variation1.phpt +++ b/ext/standard/tests/image/getimagesize_variation1.phpt @@ -5,7 +5,7 @@ Test getimagesize() function : usage variations - unexpected type for arg 1 /* Prototype : proto array getimagesize(string imagefile [, array info]) * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c - * Alias to functions: + * Alias to functions: */ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { diff --git a/ext/standard/tests/image/getimagesize_variation2.phpt b/ext/standard/tests/image/getimagesize_variation2.phpt index 3efdd51b40..8288e28bf9 100644 --- a/ext/standard/tests/image/getimagesize_variation2.phpt +++ b/ext/standard/tests/image/getimagesize_variation2.phpt @@ -5,7 +5,7 @@ Test getimagesize() function : usage variations - unexpected type for arg 2 /* Prototype : proto array getimagesize(string imagefile [, array info]) * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c - * Alias to functions: + * Alias to functions: */ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { diff --git a/ext/standard/tests/image/getimagesize_wbmp.phpt b/ext/standard/tests/image/getimagesize_wbmp.phpt index ce2179293c..2410cff4d5 100644 --- a/ext/standard/tests/image/getimagesize_wbmp.phpt +++ b/ext/standard/tests/image/getimagesize_wbmp.phpt @@ -5,7 +5,7 @@ GetImageSize() for wbmp format /* Prototype : proto array getimagesize(string imagefile [, array info]) * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing getimagesize() : wbmp format ***\n"; diff --git a/ext/standard/tests/image/getimagesize_xbm.phpt b/ext/standard/tests/image/getimagesize_xbm.phpt index 9156d40b10..360394ae3c 100644 --- a/ext/standard/tests/image/getimagesize_xbm.phpt +++ b/ext/standard/tests/image/getimagesize_xbm.phpt @@ -5,7 +5,7 @@ GetImageSize() for xbm format /* Prototype : proto array getimagesize(string imagefile [, array info]) * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing getimagesize() : xbm format ***\n"; diff --git a/ext/standard/tests/image/getimagesizefromstring1.phpt b/ext/standard/tests/image/getimagesizefromstring1.phpt index df75be518b..1e9dc59d45 100644 --- a/ext/standard/tests/image/getimagesizefromstring1.phpt +++ b/ext/standard/tests/image/getimagesizefromstring1.phpt @@ -5,9 +5,9 @@ Compare getimagesize and getimagesizefromstring $img = __DIR__ . '/test.gif'; $i1 = getimagesize($img); - + $data = file_get_contents($img); - + $i2 = getimagesizefromstring($data); var_dump($i1); diff --git a/ext/standard/tests/image/image_type_to_extension.phpt b/ext/standard/tests/image/image_type_to_extension.phpt index a2e2758188..8418a4b8c7 100644 --- a/ext/standard/tests/image/image_type_to_extension.phpt +++ b/ext/standard/tests/image/image_type_to_extension.phpt @@ -1,7 +1,7 @@ --TEST-- image_type_to_extension() --SKIPIF-- -<?php +<?php require_once('skipif_imagetype.inc'); ?> --FILE-- diff --git a/ext/standard/tests/image/image_type_to_mime_type_basic.phpt b/ext/standard/tests/image/image_type_to_mime_type_basic.phpt index 8e3176ef41..74f27a877b 100644 --- a/ext/standard/tests/image/image_type_to_mime_type_basic.phpt +++ b/ext/standard/tests/image/image_type_to_mime_type_basic.phpt @@ -6,7 +6,7 @@ image_type_to_mime_type() /* Prototype : string image_type_to_mime_type ( int $imagetype ) * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype. * Source code: ext/standard/image.c - * Alias to functions: + * Alias to functions: */ echo "Starting image_type_to_mime_type() test\n\n"; @@ -21,12 +21,12 @@ $image_types = array ( IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM, IMAGETYPE_JPC, - IMAGETYPE_JP2, + IMAGETYPE_JP2, IMAGETYPE_JPX, - IMAGETYPE_JB2, + IMAGETYPE_JB2, IMAGETYPE_IFF, IMAGETYPE_WBMP, - IMAGETYPE_JPEG2000, + IMAGETYPE_JPEG2000, IMAGETYPE_XBM, IMAGETYPE_WEBP ); diff --git a/ext/standard/tests/image/image_type_to_mime_type_variation2.phpt b/ext/standard/tests/image/image_type_to_mime_type_variation2.phpt index 141bc576ff..11306bc19d 100644 --- a/ext/standard/tests/image/image_type_to_mime_type_variation2.phpt +++ b/ext/standard/tests/image/image_type_to_mime_type_variation2.phpt @@ -16,13 +16,13 @@ $values = array ( 1, 12345, -12345, - + //Octal values 02, 010, 030071, -030071, - + //Hexadecimal values 0x0, 0x1, diff --git a/ext/standard/tests/mail/bug66535.phpt b/ext/standard/tests/mail/bug66535.phpt index db1f449cb6..e6cef90fae 100644 --- a/ext/standard/tests/mail/bug66535.phpt +++ b/ext/standard/tests/mail/bug66535.phpt @@ -13,7 +13,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mail() : send email without additional headers ***\n"; diff --git a/ext/standard/tests/mail/bug73203.phpt b/ext/standard/tests/mail/bug73203.phpt index 79615f31b5..c3f22d36d5 100644 --- a/ext/standard/tests/mail/bug73203.phpt +++ b/ext/standard/tests/mail/bug73203.phpt @@ -9,7 +9,7 @@ verify that the call succeeds. sendmail_path=cat >/dev/null mail.add_x_header = Off --SKIPIF-- -<?php +<?php if (substr(PHP_OS, 0, 3) === 'WIN') die('skip won\'t run on Windows'); ?> --FILE-- diff --git a/ext/standard/tests/mail/ezmlm_hash_error.phpt b/ext/standard/tests/mail/ezmlm_hash_error.phpt index c5f49dd73a..f5bc578558 100644 --- a/ext/standard/tests/mail/ezmlm_hash_error.phpt +++ b/ext/standard/tests/mail/ezmlm_hash_error.phpt @@ -32,7 +32,7 @@ echo "\n-- Testing ezmlm_hash() function with invalid input - RESOURCE --\n"; $file_handle = fopen(__FILE__, "r"); $extra_arg = 10; var_dump( ezmlm_hash($file_handle) ); -fclose($file_handle); +fclose($file_handle); ?> ===DONE=== diff --git a/ext/standard/tests/mail/ezmlm_hash_variation1.phpt b/ext/standard/tests/mail/ezmlm_hash_variation1.phpt index 58957c84a9..123195e5ec 100644 --- a/ext/standard/tests/mail/ezmlm_hash_variation1.phpt +++ b/ext/standard/tests/mail/ezmlm_hash_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource diff --git a/ext/standard/tests/mail/mail_basic.phpt b/ext/standard/tests/mail/mail_basic.phpt index 70f32df40f..b0c95f35d1 100644 --- a/ext/standard/tests/mail/mail_basic.phpt +++ b/ext/standard/tests/mail/mail_basic.phpt @@ -13,7 +13,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mail() : basic functionality ***\n"; diff --git a/ext/standard/tests/mail/mail_basic2.phpt b/ext/standard/tests/mail/mail_basic2.phpt index 60ad009190..24bf2f92f1 100644 --- a/ext/standard/tests/mail/mail_basic2.phpt +++ b/ext/standard/tests/mail/mail_basic2.phpt @@ -13,7 +13,7 @@ mail.add_x_header = Off /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mail() : basic functionality ***\n"; diff --git a/ext/standard/tests/mail/mail_basic3.phpt b/ext/standard/tests/mail/mail_basic3.phpt index 3e648e5cac..70142cee1f 100644 --- a/ext/standard/tests/mail/mail_basic3.phpt +++ b/ext/standard/tests/mail/mail_basic3.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mail() : basic functionality ***\n"; diff --git a/ext/standard/tests/mail/mail_basic4.phpt b/ext/standard/tests/mail/mail_basic4.phpt index de2407a740..9b11ad00c5 100644 --- a/ext/standard/tests/mail/mail_basic4.phpt +++ b/ext/standard/tests/mail/mail_basic4.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mail() : basic functionality ***\n"; diff --git a/ext/standard/tests/mail/mail_basic5.phpt b/ext/standard/tests/mail/mail_basic5.phpt index 8d755ebb86..591d48ac53 100644 --- a/ext/standard/tests/mail/mail_basic5.phpt +++ b/ext/standard/tests/mail/mail_basic5.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mail() : basic functionality ***\n"; diff --git a/ext/standard/tests/mail/mail_basic_alt1-win32.phpt b/ext/standard/tests/mail/mail_basic_alt1-win32.phpt index fc50498347..815eca28c6 100644 --- a/ext/standard/tests/mail/mail_basic_alt1-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt1-win32.phpt @@ -1,7 +1,7 @@ --TEST-- Test mail() function : basic functionality --SKIPIF-- -<?php +<?php if( substr(PHP_OS, 0, 3) != 'WIN' ) { die('skip...Windows only test'); @@ -16,7 +16,7 @@ max_execution_time = 120 /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ error_reporting(E_ALL & ~E_STRICT); @@ -39,7 +39,7 @@ HERE; $res = mail($to, $subject, $message); if ($res !== true) { - exit("TEST FAILED : Unable to send test email\n"); + exit("TEST FAILED : Unable to send test email\n"); } else { echo "Msg sent OK\n"; } @@ -49,7 +49,7 @@ $imap_stream = imap_open($default_mailbox, $username, $password); if ($imap_stream === false) { echo "Cannot connect to IMAP server $server: " . imap_last_error() . "\n"; return false; -} +} $found = false; $repeat_count = 20; // we will repeat a max of 20 times @@ -63,22 +63,22 @@ while (!$found && $repeat_count > 0) { // Iterate over recent msgs to find the one we sent above for ($i = 1; $i <= $current_msg_count; $i++) { // get hdr details - $hdr = imap_headerinfo($imap_stream, $i); + $hdr = imap_headerinfo($imap_stream, $i); if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) { - echo "Id of msg just sent is $i\n"; - echo ".. delete it\n"; + echo "Id of msg just sent is $i\n"; + echo ".. delete it\n"; imap_delete($imap_stream, $i); $found = true; - break; + break; } } - + $repeat_count -= 1; } -if (!$found) { - echo "TEST FAILED: email not delivered\n"; +if (!$found) { + echo "TEST FAILED: email not delivered\n"; } else { echo "TEST PASSED: Msgs sent and deleted OK\n"; } diff --git a/ext/standard/tests/mail/mail_basic_alt2-win32.phpt b/ext/standard/tests/mail/mail_basic_alt2-win32.phpt index 892d92391e..13e75a6c2a 100644 --- a/ext/standard/tests/mail/mail_basic_alt2-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt2-win32.phpt @@ -1,7 +1,7 @@ --TEST-- Test mail() function : basic functionality --SKIPIF-- -<?php +<?php if( substr(PHP_OS, 0, 3) != 'WIN' ) { die('skip...Windows only test'); } @@ -15,7 +15,7 @@ max_execution_time = 120 /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ error_reporting(E_ALL & ~E_STRICT); @@ -37,7 +37,7 @@ $extra_headers = "from: user@example.com"; $res = mail($to, $subject, $message, $extra_headers); if ($res !== true) { - exit("TEST FAILED : Unable to send test email\n"); + exit("TEST FAILED : Unable to send test email\n"); } else { echo "Msg sent OK\n"; } @@ -47,7 +47,7 @@ $imap_stream = imap_open($default_mailbox, $username, $password); if ($imap_stream === false) { echo "Cannot connect to IMAP server $server: " . imap_last_error() . "\n"; return false; -} +} $found = false; $repeat_count = 20; // we will repeat a max of 20 times @@ -61,22 +61,22 @@ while (!$found && $repeat_count > 0) { // Iterate over recent msgs to find the one we sent above for ($i = 1; $i <= $current_msg_count; $i++) { // get hdr details - $hdr = imap_headerinfo($imap_stream, $i); + $hdr = imap_headerinfo($imap_stream, $i); if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) { - echo "Id of msg just sent is $i\n"; - echo ".. delete it\n"; + echo "Id of msg just sent is $i\n"; + echo ".. delete it\n"; imap_delete($imap_stream, $i); $found = true; - break; + break; } } - + $repeat_count -= 1; } -if (!$found) { - echo "TEST FAILED: email not delivered\n"; +if (!$found) { + echo "TEST FAILED: email not delivered\n"; } else { echo "TEST PASSED: Msgs sent and deleted OK\n"; } diff --git a/ext/standard/tests/mail/mail_basic_alt3-win32.phpt b/ext/standard/tests/mail/mail_basic_alt3-win32.phpt index 1caa68c068..d768fc9be5 100644 --- a/ext/standard/tests/mail/mail_basic_alt3-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt3-win32.phpt @@ -1,7 +1,7 @@ --TEST-- Test mail() function : basic functionality --SKIPIF-- -<?php +<?php if( substr(PHP_OS, 0, 3) != 'WIN' ) { die('skip...Windows only test'); } @@ -15,7 +15,7 @@ max_execution_time = 120 /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ error_reporting(E_ALL & ~E_STRICT); @@ -37,7 +37,7 @@ $extra_headers = "FRom: user@example.com"; $res = mail($to, $subject, $message, $extra_headers); if ($res !== true) { - exit("TEST FAILED : Unable to send test email\n"); + exit("TEST FAILED : Unable to send test email\n"); } else { echo "Msg sent OK\n"; } @@ -47,7 +47,7 @@ $imap_stream = imap_open($default_mailbox, $username, $password); if ($imap_stream === false) { echo "Cannot connect to IMAP server $server: " . imap_last_error() . "\n"; return false; -} +} $found = false; $repeat_count = 20; // we will repeat a max of 20 times @@ -61,22 +61,22 @@ while (!$found && $repeat_count > 0) { // Iterate over recent msgs to find the one we sent above for ($i = 1; $i <= $current_msg_count; $i++) { // get hdr details - $hdr = imap_headerinfo($imap_stream, $i); + $hdr = imap_headerinfo($imap_stream, $i); if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) { - echo "Id of msg just sent is $i\n"; - echo ".. delete it\n"; + echo "Id of msg just sent is $i\n"; + echo ".. delete it\n"; imap_delete($imap_stream, $i); $found = true; - break; + break; } } - + $repeat_count -= 1; } -if (!$found) { - echo "TEST FAILED: email not delivered\n"; +if (!$found) { + echo "TEST FAILED: email not delivered\n"; } else { echo "TEST PASSED: Msgs sent and deleted OK\n"; } diff --git a/ext/standard/tests/mail/mail_basic_alt4-win32.phpt b/ext/standard/tests/mail/mail_basic_alt4-win32.phpt index c8e45242e2..ec51737cee 100644 --- a/ext/standard/tests/mail/mail_basic_alt4-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt4-win32.phpt @@ -1,7 +1,7 @@ --TEST-- Test mail() function : basic functionality --SKIPIF-- -<?php +<?php if( substr(PHP_OS, 0, 3) != 'WIN' ) { die('skip...Windows only test'); } @@ -15,7 +15,7 @@ max_execution_time = 120 /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ error_reporting(E_ALL & ~E_STRICT); @@ -38,7 +38,7 @@ $extra_parameters = "addons"; // should be ignored $res = mail($to, $subject, $message, $extra_headers, $extra_parameters); if ($res !== true) { - exit("TEST FAILED : Unable to send test email\n"); + exit("TEST FAILED : Unable to send test email\n"); } else { echo "Msg sent OK\n"; } @@ -48,7 +48,7 @@ $imap_stream = imap_open($default_mailbox, $username, $password); if ($imap_stream === false) { echo "Cannot connect to IMAP server $server: " . imap_last_error() . "\n"; return false; -} +} $found = false; $repeat_count = 20; // we will repeat a max of 20 times @@ -62,22 +62,22 @@ while (!$found && $repeat_count > 0) { // Iterate over recent msgs to find the one we sent above for ($i = 1; $i <= $current_msg_count; $i++) { // get hdr details - $hdr = imap_headerinfo($imap_stream, $i); + $hdr = imap_headerinfo($imap_stream, $i); if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) { - echo "Id of msg just sent is $i\n"; - echo ".. delete it\n"; + echo "Id of msg just sent is $i\n"; + echo ".. delete it\n"; imap_delete($imap_stream, $i); $found = true; - break; + break; } } - + $repeat_count -= 1; } -if (!$found) { - echo "TEST FAILED: email not delivered\n"; +if (!$found) { + echo "TEST FAILED: email not delivered\n"; } else { echo "TEST PASSED: Msgs sent and deleted OK\n"; } diff --git a/ext/standard/tests/mail/mail_error.phpt b/ext/standard/tests/mail/mail_error.phpt index 871b6da0be..e71fafbd13 100644 --- a/ext/standard/tests/mail/mail_error.phpt +++ b/ext/standard/tests/mail/mail_error.phpt @@ -5,7 +5,7 @@ Test mail() function : error conditions /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mail() : error conditions ***\n"; diff --git a/ext/standard/tests/mail/mail_variation1.phpt b/ext/standard/tests/mail/mail_variation1.phpt index a8eb6bec79..d520cdc254 100644 --- a/ext/standard/tests/mail/mail_variation1.phpt +++ b/ext/standard/tests/mail/mail_variation1.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mail() : variation ***\n"; diff --git a/ext/standard/tests/mail/mail_variation2.phpt b/ext/standard/tests/mail/mail_variation2.phpt index f0e44241b1..49ede34eee 100644 --- a/ext/standard/tests/mail/mail_variation2.phpt +++ b/ext/standard/tests/mail/mail_variation2.phpt @@ -14,7 +14,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mail() : basic functionality ***\n"; diff --git a/ext/standard/tests/mail/mail_variation_alt1-win32.phpt b/ext/standard/tests/mail/mail_variation_alt1-win32.phpt index dd7fd937e2..58ebda047d 100644 --- a/ext/standard/tests/mail/mail_variation_alt1-win32.phpt +++ b/ext/standard/tests/mail/mail_variation_alt1-win32.phpt @@ -1,7 +1,7 @@ --TEST-- Test mail() function : basic functionality --SKIPIF-- -<?php +<?php if( substr(PHP_OS, 0, 3) != 'WIN' ) { die('skip...Windows only test'); } @@ -15,7 +15,7 @@ max_execution_time = 120 /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ error_reporting(E_ALL & ~E_STRICT); @@ -38,7 +38,7 @@ HERE; $res = mail($to, $subject, $message); if ($res !== true) { - exit("TEST COMPLETED : Unable to send test email\n"); + exit("TEST COMPLETED : Unable to send test email\n"); } else { echo "Msg sent OK\n"; } @@ -48,7 +48,7 @@ $imap_stream = imap_open($default_mailbox, $username, $password); if ($imap_stream === false) { echo "Cannot connect to IMAP server $server: " . imap_last_error() . "\n"; return false; -} +} $found = false; $repeat_count = 20; // we will repeat a max of 20 times @@ -62,22 +62,22 @@ while (!$found && $repeat_count > 0) { // Iterate over recent msgs to find the one we sent above for ($i = 1; $i <= $current_msg_count; $i++) { // get hdr details - $hdr = imap_headerinfo($imap_stream, $i); + $hdr = imap_headerinfo($imap_stream, $i); if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) { - echo "Id of msg just sent is $i\n"; - echo ".. delete it\n"; + echo "Id of msg just sent is $i\n"; + echo ".. delete it\n"; imap_delete($imap_stream, $i); $found = true; - break; + break; } } - + $repeat_count -= 1; } -if (!$found) { - echo "TEST FAILED: email not delivered\n"; +if (!$found) { + echo "TEST FAILED: email not delivered\n"; } else { echo "TEST PASSED: Msgs sent and deleted OK\n"; } diff --git a/ext/standard/tests/mail/mail_variation_alt2-win32.phpt b/ext/standard/tests/mail/mail_variation_alt2-win32.phpt index 817cc36af4..5462c85c24 100644 --- a/ext/standard/tests/mail/mail_variation_alt2-win32.phpt +++ b/ext/standard/tests/mail/mail_variation_alt2-win32.phpt @@ -1,7 +1,7 @@ --TEST-- Test mail() function : basic functionality --SKIPIF-- -<?php +<?php if( substr(PHP_OS, 0, 3) != 'WIN' ) { die('skip...Windows only test'); } @@ -15,7 +15,7 @@ max_execution_time = 120 /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ error_reporting(E_ALL & ~E_STRICT); @@ -38,7 +38,7 @@ HERE; $res = mail($to, $subject, $message); if ($res !== true) { - exit("TEST COMPLETED : Unable to send test email\n"); + exit("TEST COMPLETED : Unable to send test email\n"); } else { echo "Msg sent OK\n"; } @@ -48,7 +48,7 @@ $imap_stream = imap_open($default_mailbox, $username, $password); if ($imap_stream === false) { echo "Cannot connect to IMAP server $server: " . imap_last_error() . "\n"; return false; -} +} $found = false; $repeat_count = 20; // we will repeat a max of 20 times @@ -62,22 +62,22 @@ while (!$found && $repeat_count > 0) { // Iterate over recent msgs to find the one we sent above for ($i = 1; $i <= $current_msg_count; $i++) { // get hdr details - $hdr = imap_headerinfo($imap_stream, $i); + $hdr = imap_headerinfo($imap_stream, $i); if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) { - echo "Id of msg just sent is $i\n"; - echo ".. delete it\n"; + echo "Id of msg just sent is $i\n"; + echo ".. delete it\n"; imap_delete($imap_stream, $i); $found = true; - break; + break; } } - + $repeat_count -= 1; } -if (!$found) { - echo "TEST FAILED: email not delivered\n"; +if (!$found) { + echo "TEST FAILED: email not delivered\n"; } else { echo "TEST PASSED: Msgs sent and deleted OK\n"; } diff --git a/ext/standard/tests/mail/mail_variation_alt3-win32.phpt b/ext/standard/tests/mail/mail_variation_alt3-win32.phpt index 4062fae981..8a569c0c32 100644 --- a/ext/standard/tests/mail/mail_variation_alt3-win32.phpt +++ b/ext/standard/tests/mail/mail_variation_alt3-win32.phpt @@ -1,7 +1,7 @@ --TEST-- Test mail() function : basic functionality --SKIPIF-- -<?php +<?php if( substr(PHP_OS, 0, 3) != 'WIN' ) { die('skip...Windows only test'); } @@ -15,7 +15,7 @@ max_execution_time = 120 /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ error_reporting(E_ALL & ~E_STRICT); @@ -37,7 +37,7 @@ HERE; $res = mail($to, $subject, $message); if ($res !== true) { - exit("TEST COMPLETED : Unable to send test email\n"); + exit("TEST COMPLETED : Unable to send test email\n"); } else { echo "Msg sent OK\n"; } @@ -47,7 +47,7 @@ $imap_stream = imap_open($default_mailbox, $username, $password); if ($imap_stream === false) { echo "Cannot connect to IMAP server $server: " . imap_last_error() . "\n"; return false; -} +} $found = false; $repeat_count = 20; // we will repeat a max of 20 times @@ -61,22 +61,22 @@ while (!$found && $repeat_count > 0) { // Iterate over recent msgs to find the one we sent above for ($i = 1; $i <= $current_msg_count; $i++) { // get hdr details - $hdr = imap_headerinfo($imap_stream, $i); + $hdr = imap_headerinfo($imap_stream, $i); if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) { - echo "Id of msg just sent is $i\n"; - echo ".. delete it\n"; + echo "Id of msg just sent is $i\n"; + echo ".. delete it\n"; imap_delete($imap_stream, $i); $found = true; - break; + break; } } - + $repeat_count -= 1; } -if (!$found) { - echo "TEST FAILED: email not delivered\n"; +if (!$found) { + echo "TEST FAILED: email not delivered\n"; } else { echo "TEST PASSED: Msgs sent and deleted OK\n"; } diff --git a/ext/standard/tests/math/abs_basic.phpt b/ext/standard/tests/math/abs_basic.phpt index bc62b38752..881feb96d9 100644 --- a/ext/standard/tests/math/abs_basic.phpt +++ b/ext/standard/tests/math/abs_basic.phpt @@ -24,7 +24,7 @@ $values = array(23, "-2.345e1", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = abs($values[$i]); diff --git a/ext/standard/tests/math/abs_basiclong_64bit.phpt b/ext/standard/tests/math/abs_basiclong_64bit.phpt index ccb2556427..0f0cb5d55c 100644 --- a/ext/standard/tests/math/abs_basiclong_64bit.phpt +++ b/ext/standard/tests/math/abs_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(abs($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/abs_error.phpt b/ext/standard/tests/math/abs_error.phpt index 4d62259afb..8c2a9f73ce 100644 --- a/ext/standard/tests/math/abs_error.phpt +++ b/ext/standard/tests/math/abs_error.phpt @@ -10,7 +10,7 @@ Test abs() function : error conditions - incorrect number of args /* * Pass incorrect number of arguments to abs() to test behaviour */ - + echo "*** Testing abs() : error conditions ***\n"; $arg_0 = 1.0; diff --git a/ext/standard/tests/math/abs_variation.phpt b/ext/standard/tests/math/abs_variation.phpt index ed9085446b..fd671855e1 100644 --- a/ext/standard/tests/math/abs_variation.phpt +++ b/ext/standard/tests/math/abs_variation.phpt @@ -45,7 +45,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -55,7 +55,7 @@ $inputs = array( /*19*/ "abs", 'abs', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/math/acos_basic.phpt b/ext/standard/tests/math/acos_basic.phpt index 150eb975ad..a5af21e958 100644 --- a/ext/standard/tests/math/acos_basic.phpt +++ b/ext/standard/tests/math/acos_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input acos() precision = 14 --FILE-- <?php -/* +/* * proto float acos(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); diff --git a/ext/standard/tests/math/acos_basiclong_64bit.phpt b/ext/standard/tests/math/acos_basiclong_64bit.phpt index 3d811f5928..a32180cd1b 100644 --- a/ext/standard/tests/math/acos_basiclong_64bit.phpt +++ b/ext/standard/tests/math/acos_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(acos($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/acos_error.phpt b/ext/standard/tests/math/acos_error.phpt index 6cfdb8f857..6a9dd909a5 100644 --- a/ext/standard/tests/math/acos_error.phpt +++ b/ext/standard/tests/math/acos_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for acos() --FILE-- <?php -/* +/* * proto float acos(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/acos_variation.phpt b/ext/standard/tests/math/acos_variation.phpt index fa9f5e48ac..532ba94c96 100644 --- a/ext/standard/tests/math/acos_variation.phpt +++ b/ext/standard/tests/math/acos_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of acos() precision=10 --FILE-- <?php -/* +/* * proto float acos(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test acos with a different input values @@ -26,7 +26,7 @@ $values = array(23, "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = acos($values[$i]); diff --git a/ext/standard/tests/math/acosh_basic.phpt b/ext/standard/tests/math/acosh_basic.phpt index d94109d9c1..ba1a706574 100644 --- a/ext/standard/tests/math/acosh_basic.phpt +++ b/ext/standard/tests/math/acosh_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input acosh() precision = 14 --FILE-- <?php -/* +/* * proto float acosh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); diff --git a/ext/standard/tests/math/acosh_basiclong_64bit.phpt b/ext/standard/tests/math/acosh_basiclong_64bit.phpt index 80c33b224b..902c235c32 100644 --- a/ext/standard/tests/math/acosh_basiclong_64bit.phpt +++ b/ext/standard/tests/math/acosh_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(acosh($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/acosh_error.phpt b/ext/standard/tests/math/acosh_error.phpt index cb85becdb1..270796c373 100644 --- a/ext/standard/tests/math/acosh_error.phpt +++ b/ext/standard/tests/math/acosh_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for acosh() --FILE-- <?php -/* +/* * proto float acosh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/acosh_variation.phpt b/ext/standard/tests/math/acosh_variation.phpt index 6f8abb19ae..c011f4aa1b 100644 --- a/ext/standard/tests/math/acosh_variation.phpt +++ b/ext/standard/tests/math/acosh_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of acosh() precision = 10 --FILE-- <?php -/* +/* * proto float acosh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test acosh with a different input values @@ -26,7 +26,7 @@ $values = array(23, "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = acosh($values[$i]); diff --git a/ext/standard/tests/math/asin_basic.phpt b/ext/standard/tests/math/asin_basic.phpt index 183f7449bb..7c7542e0f6 100644 --- a/ext/standard/tests/math/asin_basic.phpt +++ b/ext/standard/tests/math/asin_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input asin() precision = 14 --FILE-- <?php -/* +/* * proto float asin(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); diff --git a/ext/standard/tests/math/asin_basiclong_64bit.phpt b/ext/standard/tests/math/asin_basiclong_64bit.phpt index 7e17f2daff..071ad1c39c 100644 --- a/ext/standard/tests/math/asin_basiclong_64bit.phpt +++ b/ext/standard/tests/math/asin_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(asin($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/asin_error.phpt b/ext/standard/tests/math/asin_error.phpt index a51a077b90..2428e8a5b4 100644 --- a/ext/standard/tests/math/asin_error.phpt +++ b/ext/standard/tests/math/asin_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for asin() --FILE-- <?php -/* +/* * proto float asin(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/asin_variation.phpt b/ext/standard/tests/math/asin_variation.phpt index 8259bc811d..bd2321e9c8 100644 --- a/ext/standard/tests/math/asin_variation.phpt +++ b/ext/standard/tests/math/asin_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of asin() precision = 10 --FILE-- <?php -/* +/* * proto float asin(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test asin with a different input values @@ -26,7 +26,7 @@ $values = array(23, "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = asin($values[$i]); diff --git a/ext/standard/tests/math/asinh_basic.phpt b/ext/standard/tests/math/asinh_basic.phpt index ff8a2d10ac..31643fa3c4 100644 --- a/ext/standard/tests/math/asinh_basic.phpt +++ b/ext/standard/tests/math/asinh_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input asinh() precision = 14 --FILE-- <?php -/* +/* * proto float asinh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); diff --git a/ext/standard/tests/math/asinh_basiclong_64bit.phpt b/ext/standard/tests/math/asinh_basiclong_64bit.phpt index a501d75d3c..f4ccb0d23b 100644 --- a/ext/standard/tests/math/asinh_basiclong_64bit.phpt +++ b/ext/standard/tests/math/asinh_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(asinh($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/asinh_error.phpt b/ext/standard/tests/math/asinh_error.phpt index 8a0d558783..ad6bf36014 100644 --- a/ext/standard/tests/math/asinh_error.phpt +++ b/ext/standard/tests/math/asinh_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for asinh() --FILE-- <?php -/* +/* * proto float asinh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/asinh_variation.phpt b/ext/standard/tests/math/asinh_variation.phpt index 77bf4d8998..d8fd1828c9 100644 --- a/ext/standard/tests/math/asinh_variation.phpt +++ b/ext/standard/tests/math/asinh_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of asinh() precision = 10 --FILE-- <?php -/* +/* * proto float asinh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test asinh with a different input values @@ -26,7 +26,7 @@ $values = array(23, "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = asinh($values[$i]); diff --git a/ext/standard/tests/math/atan2_basic.phpt b/ext/standard/tests/math/atan2_basic.phpt index 8312bb2890..f0055e4fdb 100644 --- a/ext/standard/tests/math/atan2_basic.phpt +++ b/ext/standard/tests/math/atan2_basic.phpt @@ -16,7 +16,7 @@ $valuesy = array(23, null, true, false); - + $valuesx = array(23, -23, 2.345e1, @@ -28,14 +28,14 @@ $valuesx = array(23, "2.345e1", null, true, - false); + false); for ($i = 0; $i < count($valuesy); $i++) { - for ($j = 0; $j < count($valuesx); $j++) { + for ($j = 0; $j < count($valuesx); $j++) { $res = atan2($valuesy[$i], $valuesx[$j]); echo "Y:$valuesy[$i] X:$valuesx[$j] "; var_dump($res); - } + } } ?> --EXPECT-- diff --git a/ext/standard/tests/math/atan2_basiclong_64bit.phpt b/ext/standard/tests/math/atan2_basiclong_64bit.phpt index e0548a08ee..f646585f30 100644 --- a/ext/standard/tests/math/atan2_basiclong_64bit.phpt +++ b/ext/standard/tests/math/atan2_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,11 +23,11 @@ $otherVals = array(0, 1, -1, 7, 9, 65, -44, MAX_32Bit, MIN_32Bit, MAX_64Bit, MIN foreach ($longVals as $longVal) { foreach($otherVals as $otherVal) { - echo "--- testing: $longVal, $otherVal ---\n"; + echo "--- testing: $longVal, $otherVal ---\n"; var_dump(atan2($longVal, $otherVal)); } } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/atan2_variation1.phpt b/ext/standard/tests/math/atan2_variation1.phpt index 15aef71359..ab8cf72a8d 100644 --- a/ext/standard/tests/math/atan2_variation1.phpt +++ b/ext/standard/tests/math/atan2_variation1.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12, - -12, + -12, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -63,10 +63,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data /*23*/ new classA(), - + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/atan2_variation2.phpt b/ext/standard/tests/math/atan2_variation2.phpt index 2de0bb2eec..9d61a09972 100644 --- a/ext/standard/tests/math/atan2_variation2.phpt +++ b/ext/standard/tests/math/atan2_variation2.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12, - -12, + -12, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -63,10 +63,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data /*23*/ new classA(), - + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/atan_basic.phpt b/ext/standard/tests/math/atan_basic.phpt index f4a2bedf76..180263fe59 100644 --- a/ext/standard/tests/math/atan_basic.phpt +++ b/ext/standard/tests/math/atan_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input atan() precision = 14 --FILE-- <?php -/* +/* * proto float atan(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); diff --git a/ext/standard/tests/math/atan_basiclong_64bit.phpt b/ext/standard/tests/math/atan_basiclong_64bit.phpt index ffdfe24372..15d9a000ae 100644 --- a/ext/standard/tests/math/atan_basiclong_64bit.phpt +++ b/ext/standard/tests/math/atan_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(atan($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/atan_error.phpt b/ext/standard/tests/math/atan_error.phpt index 61b35b05d6..0a57818088 100644 --- a/ext/standard/tests/math/atan_error.phpt +++ b/ext/standard/tests/math/atan_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for atan() --FILE-- <?php -/* +/* * proto float atan(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/atan_variation.phpt b/ext/standard/tests/math/atan_variation.phpt index 797d88d2d2..81174e0322 100644 --- a/ext/standard/tests/math/atan_variation.phpt +++ b/ext/standard/tests/math/atan_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of atan() precision = 10 --FILE-- <?php -/* +/* * proto float atan(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test atan with a different input values @@ -26,7 +26,7 @@ $values = array(23, "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = atan($values[$i]); diff --git a/ext/standard/tests/math/atanh_basic.phpt b/ext/standard/tests/math/atanh_basic.phpt index 7e7144e239..87580ef181 100644 --- a/ext/standard/tests/math/atanh_basic.phpt +++ b/ext/standard/tests/math/atanh_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input atanh() precision = 14 --FILE-- <?php -/* +/* * proto float atanh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); diff --git a/ext/standard/tests/math/atanh_basiclong_64bit.phpt b/ext/standard/tests/math/atanh_basiclong_64bit.phpt index d7608cad1d..426ca51f2a 100644 --- a/ext/standard/tests/math/atanh_basiclong_64bit.phpt +++ b/ext/standard/tests/math/atanh_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(atanh($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/atanh_error.phpt b/ext/standard/tests/math/atanh_error.phpt index e442825b0e..c62dadf027 100644 --- a/ext/standard/tests/math/atanh_error.phpt +++ b/ext/standard/tests/math/atanh_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for atanh() --FILE-- <?php -/* +/* * proto float atanh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/atanh_variation.phpt b/ext/standard/tests/math/atanh_variation.phpt index 984d399a85..0dbbba851f 100644 --- a/ext/standard/tests/math/atanh_variation.phpt +++ b/ext/standard/tests/math/atanh_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of atanh() precision = 10 --FILE-- <?php -/* +/* * proto float atanh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test atanh with a different input values @@ -26,7 +26,7 @@ $values = array(23, "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = atanh($values[$i]); diff --git a/ext/standard/tests/math/base_convert_basic.phpt b/ext/standard/tests/math/base_convert_basic.phpt index 0da1d1f77c..1643bf153f 100644 --- a/ext/standard/tests/math/base_convert_basic.phpt +++ b/ext/standard/tests/math/base_convert_basic.phpt @@ -13,19 +13,19 @@ $values = array(10, "10", "27", "39", - "5F", + "5F", "3XYZ" - ); + ); for ($f= 0; $f < count($frombase); $f++) { echo "\n...from base is ", $frombase[$f], "\n"; for ($t= 0; $t < count($tobase); $t++) { - echo "......to base is ", $tobase[$t], "\n"; - for ($i =0; $i < count($values); $i++){ + echo "......to base is ", $tobase[$t], "\n"; + for ($i =0; $i < count($values); $i++){ $res = base_convert($values[$i],$frombase[$f],$tobase[$t]); echo ".........value= ", $values[$i], " res = ", $res, "\n"; - } - } + } + } } ?> diff --git a/ext/standard/tests/math/base_convert_variation1.phpt b/ext/standard/tests/math/base_convert_variation1.phpt index afa0c5bb8a..a285ece2a2 100644 --- a/ext/standard/tests/math/base_convert_variation1.phpt +++ b/ext/standard/tests/math/base_convert_variation1.phpt @@ -27,7 +27,7 @@ $inputs = array( /*1*/ 0, 1, 12, - -12, + -12, 2147483647, // float data @@ -46,7 +46,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -56,7 +56,7 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // undefined data /*23*/ @$undefined_var, diff --git a/ext/standard/tests/math/base_convert_variation2.phpt b/ext/standard/tests/math/base_convert_variation2.phpt index 14593ffe76..9051323eec 100644 --- a/ext/standard/tests/math/base_convert_variation2.phpt +++ b/ext/standard/tests/math/base_convert_variation2.phpt @@ -24,7 +24,7 @@ $inputs = array( /*1*/ 0, 1, -1, - -12, + -12, 2147483647, // float data @@ -43,7 +43,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -53,7 +53,7 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // undefined data /*23*/ @$undefined_var, diff --git a/ext/standard/tests/math/base_convert_variation3.phpt b/ext/standard/tests/math/base_convert_variation3.phpt index bd4f052ca6..220105f2fb 100644 --- a/ext/standard/tests/math/base_convert_variation3.phpt +++ b/ext/standard/tests/math/base_convert_variation3.phpt @@ -24,7 +24,7 @@ $inputs = array( /*1*/ 0, 1, -1, - -12, + -12, 2147483647, // float data @@ -43,7 +43,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -53,7 +53,7 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // undefined data /*23*/ @$undefined_var, diff --git a/ext/standard/tests/math/bindec_basic.phpt b/ext/standard/tests/math/bindec_basic.phpt index d746b8a1ca..24a91bc0c0 100644 --- a/ext/standard/tests/math/bindec_basic.phpt +++ b/ext/standard/tests/math/bindec_basic.phpt @@ -26,7 +26,7 @@ $values = array(111000111, 011237, true, false, - null); + null); for ($i = 0; $i < count($values); $i++) { $res = bindec($values[$i]); diff --git a/ext/standard/tests/math/bindec_basic_64bit.phpt b/ext/standard/tests/math/bindec_basic_64bit.phpt index 3641f0bc41..79ae0a56d6 100644 --- a/ext/standard/tests/math/bindec_basic_64bit.phpt +++ b/ext/standard/tests/math/bindec_basic_64bit.phpt @@ -26,7 +26,7 @@ $values = array(111000111, 011237, true, false, - null); + null); for ($i = 0; $i < count($values); $i++) { $res = bindec($values[$i]); diff --git a/ext/standard/tests/math/bindec_basiclong_64bit.phpt b/ext/standard/tests/math/bindec_basiclong_64bit.phpt index 3cc57d5dc4..5a556b7d2b 100644 --- a/ext/standard/tests/math/bindec_basiclong_64bit.phpt +++ b/ext/standard/tests/math/bindec_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -28,7 +28,7 @@ foreach ($binLongStrs as $strVal) { echo "--- testing: $strVal ---\n"; var_dump(bindec($strVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/bindec_error.phpt b/ext/standard/tests/math/bindec_error.phpt index aa6ac9cdd1..8bd52332c4 100644 --- a/ext/standard/tests/math/bindec_error.phpt +++ b/ext/standard/tests/math/bindec_error.phpt @@ -10,7 +10,7 @@ Test bindec() function : error conditions - incorrect input /* * Pass incorrect input to bindec() to test behaviour */ - + echo "*** Testing bindec() : error conditions ***\n"; // get a class diff --git a/ext/standard/tests/math/bindec_variation1.phpt b/ext/standard/tests/math/bindec_variation1.phpt index 1e188bab34..9efadf6e5c 100644 --- a/ext/standard/tests/math/bindec_variation1.phpt +++ b/ext/standard/tests/math/bindec_variation1.phpt @@ -48,7 +48,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -58,7 +58,7 @@ $inputs = array( /*19*/ "abcxyz", 'abcxyz', $heredoc, - + // undefined data /*22*/ @$undefined_var, diff --git a/ext/standard/tests/math/bindec_variation1_64bit.phpt b/ext/standard/tests/math/bindec_variation1_64bit.phpt index 0a37c4c2f9..ab667126da 100644 --- a/ext/standard/tests/math/bindec_variation1_64bit.phpt +++ b/ext/standard/tests/math/bindec_variation1_64bit.phpt @@ -48,7 +48,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -58,7 +58,7 @@ $inputs = array( /*19*/ "abcxyz", 'abcxyz', $heredoc, - + // undefined data /*22*/ @$undefined_var, diff --git a/ext/standard/tests/math/bug25665.phpt b/ext/standard/tests/math/bug25665.phpt index 469236c943..120604aff2 100644 --- a/ext/standard/tests/math/bug25665.phpt +++ b/ext/standard/tests/math/bug25665.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #25665 (var_dump () hangs on Nan and INF) --SKIPIF-- -<?php +<?php $OS = strtoupper(PHP_OS); if ($OS == 'SUNOS' || $OS == 'SOLARIS') die("SKIP Solaris acos() returns wrong value"); ?> diff --git a/ext/standard/tests/math/ceil_basic.phpt b/ext/standard/tests/math/ceil_basic.phpt index 922d0b14f0..b71178ca19 100644 --- a/ext/standard/tests/math/ceil_basic.phpt +++ b/ext/standard/tests/math/ceil_basic.phpt @@ -34,7 +34,7 @@ $values = array(0, true, false, null, - ); + ); for ($i = 0; $i < count($values); $i++) { $res = ceil($values[$i]); diff --git a/ext/standard/tests/math/ceil_basiclong_64bit.phpt b/ext/standard/tests/math/ceil_basiclong_64bit.phpt index b4c23d85cd..42d9f6b413 100644 --- a/ext/standard/tests/math/ceil_basiclong_64bit.phpt +++ b/ext/standard/tests/math/ceil_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(ceil($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/ceil_variation1.phpt b/ext/standard/tests/math/ceil_variation1.phpt index 35a9e1d4a3..05f308a4a0 100644 --- a/ext/standard/tests/math/ceil_variation1.phpt +++ b/ext/standard/tests/math/ceil_variation1.phpt @@ -39,7 +39,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /* 7*/ "", '', @@ -49,7 +49,7 @@ $inputs = array( /*10*/ "abcxyz", 'abcxyz}', $heredoc, - + // object data /*13*/ new classA(), diff --git a/ext/standard/tests/math/cos_basic.phpt b/ext/standard/tests/math/cos_basic.phpt index f0cfa66ee5..8ad7010ce1 100644 --- a/ext/standard/tests/math/cos_basic.phpt +++ b/ext/standard/tests/math/cos_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input cos() precision = 14 --FILE-- <?php -/* +/* * proto float cos(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); diff --git a/ext/standard/tests/math/cos_basiclong_64bit.phpt b/ext/standard/tests/math/cos_basiclong_64bit.phpt index c9f041783b..12355a7d86 100644 --- a/ext/standard/tests/math/cos_basiclong_64bit.phpt +++ b/ext/standard/tests/math/cos_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(cos($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/cos_error.phpt b/ext/standard/tests/math/cos_error.phpt index 40901991e0..21d4692a7a 100644 --- a/ext/standard/tests/math/cos_error.phpt +++ b/ext/standard/tests/math/cos_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for cos() --FILE-- <?php -/* +/* * proto float cos(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/cos_variation.phpt b/ext/standard/tests/math/cos_variation.phpt index 418bbf658f..ec6fb48642 100644 --- a/ext/standard/tests/math/cos_variation.phpt +++ b/ext/standard/tests/math/cos_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of cos() precision = 10 --FILE-- <?php -/* +/* * proto float cos(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test cos with a different input values @@ -26,7 +26,7 @@ $values = array(23, "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = cos($values[$i]); diff --git a/ext/standard/tests/math/cosh_basic.phpt b/ext/standard/tests/math/cosh_basic.phpt index 0a637ca8e5..e6cfd868a0 100644 --- a/ext/standard/tests/math/cosh_basic.phpt +++ b/ext/standard/tests/math/cosh_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input cosh() precision = 14 --FILE-- <?php -/* +/* * proto float cosh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); diff --git a/ext/standard/tests/math/cosh_basiclong_64bit.phpt b/ext/standard/tests/math/cosh_basiclong_64bit.phpt index 0916839381..f065b47213 100644 --- a/ext/standard/tests/math/cosh_basiclong_64bit.phpt +++ b/ext/standard/tests/math/cosh_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(cosh($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/cosh_error.phpt b/ext/standard/tests/math/cosh_error.phpt index afed24fe3b..c540f72a20 100644 --- a/ext/standard/tests/math/cosh_error.phpt +++ b/ext/standard/tests/math/cosh_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for cosh() --FILE-- <?php -/* +/* * proto float cosh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/cosh_variation.phpt b/ext/standard/tests/math/cosh_variation.phpt index 7a6cff2fd9..f4f7e89fc1 100644 --- a/ext/standard/tests/math/cosh_variation.phpt +++ b/ext/standard/tests/math/cosh_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of cosh() precision = 10 --FILE-- <?php -/* +/* * proto float cosh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test cosh with a different input values @@ -26,7 +26,7 @@ $values = array(23, "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = cosh($values[$i]); diff --git a/ext/standard/tests/math/decbin_basic.phpt b/ext/standard/tests/math/decbin_basic.phpt index 00ed582559..4cab650ecc 100644 --- a/ext/standard/tests/math/decbin_basic.phpt +++ b/ext/standard/tests/math/decbin_basic.phpt @@ -15,7 +15,7 @@ $values = array(10, true, false, null, - ); + ); for ($i = 0; $i < count($values); $i++) { $res = decbin($values[$i]); diff --git a/ext/standard/tests/math/decbin_basiclong_64bit.phpt b/ext/standard/tests/math/decbin_basiclong_64bit.phpt index 3dc61c4e28..a2e9185ab5 100644 --- a/ext/standard/tests/math/decbin_basiclong_64bit.phpt +++ b/ext/standard/tests/math/decbin_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(decbin($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/decbin_variation1.phpt b/ext/standard/tests/math/decbin_variation1.phpt index b357c279b3..53ebbe184e 100644 --- a/ext/standard/tests/math/decbin_variation1.phpt +++ b/ext/standard/tests/math/decbin_variation1.phpt @@ -39,7 +39,7 @@ $inputs = array( 12345, -2345, 4294967295, // largest decimal - 4294967296, + 4294967296, // float data /*7*/ 10.5, @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', @@ -70,7 +70,7 @@ $inputs = array( // object data /*24*/ new classA(), - + // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/decbin_variation1_64bit.phpt b/ext/standard/tests/math/decbin_variation1_64bit.phpt index e82ee3e88c..92312e4053 100644 --- a/ext/standard/tests/math/decbin_variation1_64bit.phpt +++ b/ext/standard/tests/math/decbin_variation1_64bit.phpt @@ -39,7 +39,7 @@ $inputs = array( 12345, -2345, 18446744073709551615, // largest decimal - 18446744073709551616, + 18446744073709551616, // float data /*7*/ 10.5, @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', @@ -70,7 +70,7 @@ $inputs = array( // object data /*24*/ new classA(), - + // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/dechex_basic.phpt b/ext/standard/tests/math/dechex_basic.phpt index c842bf7984..851cff44c4 100644 --- a/ext/standard/tests/math/dechex_basic.phpt +++ b/ext/standard/tests/math/dechex_basic.phpt @@ -15,7 +15,7 @@ $values = array(10, true, false, null, - ); + ); for ($i = 0; $i < count($values); $i++) { $res = dechex($values[$i]); diff --git a/ext/standard/tests/math/dechex_basiclong_64bit.phpt b/ext/standard/tests/math/dechex_basiclong_64bit.phpt index 40b0879246..135a422f66 100644 --- a/ext/standard/tests/math/dechex_basiclong_64bit.phpt +++ b/ext/standard/tests/math/dechex_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(dechex($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/dechex_error.phpt b/ext/standard/tests/math/dechex_error.phpt index 7ed0c4598c..4c3fd6f858 100644 --- a/ext/standard/tests/math/dechex_error.phpt +++ b/ext/standard/tests/math/dechex_error.phpt @@ -9,7 +9,7 @@ Test dechex() - wrong params dechex() echo "*** Testing dechex() : error conditions ***\n"; -echo "\nIncorrect number of arguments\n"; +echo "\nIncorrect number of arguments\n"; dechex(); dechex(23,2,true); diff --git a/ext/standard/tests/math/dechex_variation1.phpt b/ext/standard/tests/math/dechex_variation1.phpt index 5bcd2b5c5d..0575c7fcd5 100644 --- a/ext/standard/tests/math/dechex_variation1.phpt +++ b/ext/standard/tests/math/dechex_variation1.phpt @@ -37,9 +37,9 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 4294967295, // largest decimal - 4294967296, + 4294967296, // float data /*7*/ 10.5, @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', @@ -70,7 +70,7 @@ $inputs = array( // object data /*24*/ new classA(), - + // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/dechex_variation1_64bit.phpt b/ext/standard/tests/math/dechex_variation1_64bit.phpt index a513264df2..b97285ba94 100644 --- a/ext/standard/tests/math/dechex_variation1_64bit.phpt +++ b/ext/standard/tests/math/dechex_variation1_64bit.phpt @@ -37,10 +37,10 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 18446744073709551615, // largest decimal - 18446744073709551616, - + 18446744073709551616, + // float data /*7*/ 10.5, -10.5, @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', @@ -70,7 +70,7 @@ $inputs = array( // object data /*24*/ new classA(), - + // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/decoct_basic.phpt b/ext/standard/tests/math/decoct_basic.phpt index a3dd741b41..35d2bc5091 100644 --- a/ext/standard/tests/math/decoct_basic.phpt +++ b/ext/standard/tests/math/decoct_basic.phpt @@ -15,7 +15,7 @@ $values = array(10, true, false, null, - ); + ); for ($i = 0; $i < count($values); $i++) { $res = decoct($values[$i]); diff --git a/ext/standard/tests/math/decoct_basiclong_64bit.phpt b/ext/standard/tests/math/decoct_basiclong_64bit.phpt index d7434176db..f1812b9062 100644 --- a/ext/standard/tests/math/decoct_basiclong_64bit.phpt +++ b/ext/standard/tests/math/decoct_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(decoct($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/decoct_variation1.phpt b/ext/standard/tests/math/decoct_variation1.phpt index 49ba57f54b..a991bef48e 100644 --- a/ext/standard/tests/math/decoct_variation1.phpt +++ b/ext/standard/tests/math/decoct_variation1.phpt @@ -38,9 +38,9 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 4294967295, // largest decimal - 4294967296, + 4294967296, // float data /*7*/ 10.5, @@ -58,7 +58,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', @@ -68,10 +68,10 @@ $inputs = array( /*21*/ "abcxyz", 'abcxyz', $heredoc, - + // object data /*24*/ new classA(), - + // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/decoct_variation1_64bit.phpt b/ext/standard/tests/math/decoct_variation1_64bit.phpt index 40afafa10a..bc17cbe684 100644 --- a/ext/standard/tests/math/decoct_variation1_64bit.phpt +++ b/ext/standard/tests/math/decoct_variation1_64bit.phpt @@ -38,9 +38,9 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 18446744073709551615, // largest decimal - 18446744073709551616, + 18446744073709551616, // float data /*7*/ 10.5, @@ -58,7 +58,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', @@ -68,10 +68,10 @@ $inputs = array( /*21*/ "abcxyz", 'abcxyz', $heredoc, - + // object data /*24*/ new classA(), - + // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/deg2rad_basic.phpt b/ext/standard/tests/math/deg2rad_basic.phpt index 64771b9980..3b756281fa 100644 --- a/ext/standard/tests/math/deg2rad_basic.phpt +++ b/ext/standard/tests/math/deg2rad_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input deg2rad() precision = 14 --FILE-- <?php -/* +/* * proto float deg2rad(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); diff --git a/ext/standard/tests/math/deg2rad_basiclong_64bit.phpt b/ext/standard/tests/math/deg2rad_basiclong_64bit.phpt index c64627661d..3a14b11825 100644 --- a/ext/standard/tests/math/deg2rad_basiclong_64bit.phpt +++ b/ext/standard/tests/math/deg2rad_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(deg2rad($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/deg2rad_error.phpt b/ext/standard/tests/math/deg2rad_error.phpt index 517680a7c3..4bdad8cdb8 100644 --- a/ext/standard/tests/math/deg2rad_error.phpt +++ b/ext/standard/tests/math/deg2rad_error.phpt @@ -4,10 +4,10 @@ Test wrong number of arguments for deg2rad() precision = 14 --FILE-- <?php -/* +/* * proto float deg2rad(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/deg2rad_variation.phpt b/ext/standard/tests/math/deg2rad_variation.phpt index 737be67772..58131c67d3 100644 --- a/ext/standard/tests/math/deg2rad_variation.phpt +++ b/ext/standard/tests/math/deg2rad_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of deg2rad() precision = 10 --FILE-- <?php -/* +/* * proto float deg2rad(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test deg2rad with a different input values @@ -26,7 +26,7 @@ $values = array(23, "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = deg2rad($values[$i]); diff --git a/ext/standard/tests/math/exp_basic.phpt b/ext/standard/tests/math/exp_basic.phpt index 21f7413d82..870fa285ea 100644 --- a/ext/standard/tests/math/exp_basic.phpt +++ b/ext/standard/tests/math/exp_basic.phpt @@ -16,7 +16,7 @@ $values = array(10, true, false, null, - ); + ); $iterator = 1; foreach($values as $value) { diff --git a/ext/standard/tests/math/exp_basiclong_64bit.phpt b/ext/standard/tests/math/exp_basiclong_64bit.phpt index 5156d055a4..75518548e3 100644 --- a/ext/standard/tests/math/exp_basiclong_64bit.phpt +++ b/ext/standard/tests/math/exp_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(exp($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/exp_variation1.phpt b/ext/standard/tests/math/exp_variation1.phpt index 150e0cee8a..07e051b179 100644 --- a/ext/standard/tests/math/exp_variation1.phpt +++ b/ext/standard/tests/math/exp_variation1.phpt @@ -35,7 +35,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -54,7 +54,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -64,10 +64,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data /*23*/ new classA(), - + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/expm1_basic.phpt b/ext/standard/tests/math/expm1_basic.phpt index 7853aeb20c..8d0bb7ca02 100644 --- a/ext/standard/tests/math/expm1_basic.phpt +++ b/ext/standard/tests/math/expm1_basic.phpt @@ -23,7 +23,7 @@ $values = array(10, true, false, null, - ); + ); // loop through each element of $values to check the behaviour of expm1() $iterator = 1; diff --git a/ext/standard/tests/math/expm1_basiclong_64bit.phpt b/ext/standard/tests/math/expm1_basiclong_64bit.phpt index 6963976777..9046764d02 100644 --- a/ext/standard/tests/math/expm1_basiclong_64bit.phpt +++ b/ext/standard/tests/math/expm1_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(expm1($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/expm1_variation1.phpt b/ext/standard/tests/math/expm1_variation1.phpt index a342d25a7c..8cba8b1eaf 100644 --- a/ext/standard/tests/math/expm1_variation1.phpt +++ b/ext/standard/tests/math/expm1_variation1.phpt @@ -37,7 +37,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, // float data /*5*/ 10.5, @@ -55,7 +55,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -65,14 +65,14 @@ $inputs = array( /*19*/ "abcxyz", 'abcxyz', $heredoc, - + // array data array(), array(1,2,4), - + // object data /*24*/ new classA(), - + // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/floor_basic.phpt b/ext/standard/tests/math/floor_basic.phpt index 034f55f00e..5076292472 100644 --- a/ext/standard/tests/math/floor_basic.phpt +++ b/ext/standard/tests/math/floor_basic.phpt @@ -30,12 +30,12 @@ $values = array(0, true, false, null, - ); - + ); + foreach($values as $value) { echo "\n-- floor $value --\n"; var_dump(floor($value)); -}; +}; ?> ===Done=== diff --git a/ext/standard/tests/math/floor_basiclong_64bit.phpt b/ext/standard/tests/math/floor_basiclong_64bit.phpt index 65a50fc083..6b768ef90c 100644 --- a/ext/standard/tests/math/floor_basiclong_64bit.phpt +++ b/ext/standard/tests/math/floor_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(floor($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/floor_variation1.phpt b/ext/standard/tests/math/floor_variation1.phpt index fcb895164a..aef4c742b9 100644 --- a/ext/standard/tests/math/floor_variation1.phpt +++ b/ext/standard/tests/math/floor_variation1.phpt @@ -39,7 +39,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /* 7*/ "", '', @@ -49,7 +49,7 @@ $inputs = array( /*10*/ "abcxyz", 'abcxyz}', $heredoc, - + // object data /*13*/ new classA(), diff --git a/ext/standard/tests/math/floorceil.phpt b/ext/standard/tests/math/floorceil.phpt index 2f7d82c6e6..f9594ce22c 100644 --- a/ext/standard/tests/math/floorceil.phpt +++ b/ext/standard/tests/math/floorceil.phpt @@ -2,22 +2,22 @@ Tests for floor en ceil --FILE-- <?php - $a = ceil (-0); $b = ceil (-1); $c = ceil (-1.5); + $a = ceil (-0); $b = ceil (-1); $c = ceil (-1.5); $d = ceil (-1.8); $e = ceil (-2.7); var_dump ($a, $b, $c, $d, $e); - + $a = ceil (0); $b = ceil (0.5); $c = ceil (1); $d = ceil (1.5); $e = ceil (1.8); $f = ceil (2.7); var_dump ($a, $b, $c, $d, $e, $f); - + $a = floor (-0); $b = floor (-0.5); $c = floor (-1); $d = floor (-1.5); $e = floor (-1.8); $f = floor (-2.7); var_dump ($a, $b, $c, $d, $e, $f); - + $a = floor (0); $b = floor (0.5); $c = floor (1); $d = floor (1.5); $e = floor (1.8); $f = floor (2.7); var_dump ($a, $b, $c, $d, $e, $f); -?> +?> --EXPECT-- float(0) float(-1) @@ -41,4 +41,4 @@ float(0) float(1) float(1) float(1) -float(2) +float(2) diff --git a/ext/standard/tests/math/fmod_basic.phpt b/ext/standard/tests/math/fmod_basic.phpt index 003a49498e..afba080cf3 100644 --- a/ext/standard/tests/math/fmod_basic.phpt +++ b/ext/standard/tests/math/fmod_basic.phpt @@ -15,8 +15,8 @@ $values1 = array(234, "23.45e1", null, true, - false); - + false); + $values2 = array(2, -2, 2.3e1, @@ -28,14 +28,14 @@ $values2 = array(2, "2.3e1", null, true, - false); + false); for ($i = 0; $i < count($values1); $i++) { - echo "\niteration ", $i, "\n"; - + echo "\niteration ", $i, "\n"; + for ($j = 0; $j < count($values2); $j++) { $res = fmod($values1[$i], $values2[$j]); var_dump($res); - } + } } ?> --EXPECT-- diff --git a/ext/standard/tests/math/fmod_basiclong_64bit.phpt b/ext/standard/tests/math/fmod_basiclong_64bit.phpt index 1502b651e2..6513e31159 100644 --- a/ext/standard/tests/math/fmod_basiclong_64bit.phpt +++ b/ext/standard/tests/math/fmod_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,11 +23,11 @@ $otherVals = array(0, 1, -1, 7, 9, 65, -44, MAX_32Bit, MIN_32Bit, MAX_64Bit, MIN foreach ($longVals as $longVal) { foreach($otherVals as $otherVal) { - echo "--- testing: $longVal, $otherVal ---\n"; + echo "--- testing: $longVal, $otherVal ---\n"; var_dump(fmod($longVal, $otherVal)); } } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/fmod_variation1.phpt b/ext/standard/tests/math/fmod_variation1.phpt index 0f0d826ac9..b10a6b9844 100644 --- a/ext/standard/tests/math/fmod_variation1.phpt +++ b/ext/standard/tests/math/fmod_variation1.phpt @@ -32,7 +32,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -51,7 +51,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -61,10 +61,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data /*23*/ new classA(), - + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/fmod_variation2.phpt b/ext/standard/tests/math/fmod_variation2.phpt index 12fae1a758..fd8f1c62fa 100644 --- a/ext/standard/tests/math/fmod_variation2.phpt +++ b/ext/standard/tests/math/fmod_variation2.phpt @@ -32,7 +32,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -51,7 +51,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -61,10 +61,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data /*23*/ new classA(), - + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/hexdec_basic.phpt b/ext/standard/tests/math/hexdec_basic.phpt index 796c4e9bae..b99b2b0832 100644 --- a/ext/standard/tests/math/hexdec_basic.phpt +++ b/ext/standard/tests/math/hexdec_basic.phpt @@ -23,7 +23,7 @@ $values = array(0x123abc, '011237', true, false, - null); + null); for ($i = 0; $i < count($values); $i++) { $res = hexdec($values[$i]); var_dump($res); diff --git a/ext/standard/tests/math/hexdec_basic_64bit.phpt b/ext/standard/tests/math/hexdec_basic_64bit.phpt index 8c2942fb71..c4884742f2 100644 --- a/ext/standard/tests/math/hexdec_basic_64bit.phpt +++ b/ext/standard/tests/math/hexdec_basic_64bit.phpt @@ -25,13 +25,13 @@ $values = array(0x123abc, '011237', true, false, - null); + null); foreach($values as $value) { echo "\n-- hexdec $value --\n"; var_dump(hexdec($value)); -}; - +}; + ?> ===Done=== --EXPECT-- diff --git a/ext/standard/tests/math/hexdec_basiclong_64bit.phpt b/ext/standard/tests/math/hexdec_basiclong_64bit.phpt index 29c684a155..b8bf548801 100644 --- a/ext/standard/tests/math/hexdec_basiclong_64bit.phpt +++ b/ext/standard/tests/math/hexdec_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -28,7 +28,7 @@ foreach ($hexLongStrs as $strVal) { echo "--- testing: $strVal ---\n"; var_dump(hexdec($strVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/hexdec_variation1.phpt b/ext/standard/tests/math/hexdec_variation1.phpt index 2b3f1b6ab3..1712a5750f 100644 --- a/ext/standard/tests/math/hexdec_variation1.phpt +++ b/ext/standard/tests/math/hexdec_variation1.phpt @@ -32,9 +32,9 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 4294967295, // largest decimal - 4294967296, + 4294967296, // float data /*7*/ 10.5, @@ -52,7 +52,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', diff --git a/ext/standard/tests/math/hexdec_variation1_64bit.phpt b/ext/standard/tests/math/hexdec_variation1_64bit.phpt index 65beb2d91b..c279addf06 100644 --- a/ext/standard/tests/math/hexdec_variation1_64bit.phpt +++ b/ext/standard/tests/math/hexdec_variation1_64bit.phpt @@ -32,9 +32,9 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 4294967295, // largest decimal - 4294967296, + 4294967296, // float data /*7*/ 10.5, @@ -52,7 +52,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', diff --git a/ext/standard/tests/math/hypot_basic.phpt b/ext/standard/tests/math/hypot_basic.phpt index c280a23bb2..c47aabcd8a 100644 --- a/ext/standard/tests/math/hypot_basic.phpt +++ b/ext/standard/tests/math/hypot_basic.phpt @@ -25,7 +25,7 @@ $valuesy = array(23, null, true, false); - + $valuesx = array(33, -33, 3.345e1, @@ -38,14 +38,14 @@ $valuesx = array(33, "33abc", null, true, - false); + false); for ($i = 0; $i < count($valuesy); $i++) { - for ($j = 0; $j < count($valuesx); $j++) { + for ($j = 0; $j < count($valuesx); $j++) { echo "\nY:$valuesy[$i] X:$valuesx[$j] "; $res = hypot($valuesy[$i], $valuesx[$j]); var_dump($res); - } + } } ?> ===Done=== diff --git a/ext/standard/tests/math/hypot_basiclong_64bit.phpt b/ext/standard/tests/math/hypot_basiclong_64bit.phpt index 241fa9c4e9..3bbfcb4afc 100644 --- a/ext/standard/tests/math/hypot_basiclong_64bit.phpt +++ b/ext/standard/tests/math/hypot_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,11 +23,11 @@ $otherVals = array(0, 1, -1, 7, 9, 65, -44, MAX_32Bit, MIN_32Bit, MAX_64Bit, MIN foreach ($longVals as $longVal) { foreach($otherVals as $otherVal) { - echo "--- testing: $longVal, $otherVal ---\n"; + echo "--- testing: $longVal, $otherVal ---\n"; var_dump(hypot($longVal, $otherVal)); } } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/hypot_error.phpt b/ext/standard/tests/math/hypot_error.phpt index b357a3a809..b816cd58a0 100644 --- a/ext/standard/tests/math/hypot_error.phpt +++ b/ext/standard/tests/math/hypot_error.phpt @@ -6,7 +6,7 @@ Test hypot() - wrong params test hypot() * Description: Calculate the length of the hypotenuse of a right-angle triangle. * Source code: ext/standard/math.c */ - + echo "*** Testing hypot() : error conditions ***\n"; echo "\n-- Testing hypot() function with less than expected no. of arguments --\n"; diff --git a/ext/standard/tests/math/hypot_variation1.phpt b/ext/standard/tests/math/hypot_variation1.phpt index b083822c10..f8491167cc 100644 --- a/ext/standard/tests/math/hypot_variation1.phpt +++ b/ext/standard/tests/math/hypot_variation1.phpt @@ -33,7 +33,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -52,7 +52,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -62,10 +62,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data /*23*/ new classA(), - + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/hypot_variation2.phpt b/ext/standard/tests/math/hypot_variation2.phpt index 393e5eb9d1..9685ff234d 100644 --- a/ext/standard/tests/math/hypot_variation2.phpt +++ b/ext/standard/tests/math/hypot_variation2.phpt @@ -33,7 +33,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -52,7 +52,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -62,10 +62,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data /*23*/ new classA(), - + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/is_finite_basic.phpt b/ext/standard/tests/math/is_finite_basic.phpt index 3b80c969d9..679b702319 100644 --- a/ext/standard/tests/math/is_finite_basic.phpt +++ b/ext/standard/tests/math/is_finite_basic.phpt @@ -15,11 +15,11 @@ $values = array(234, true, false, pow(0, -2), - acos(1.01)); + acos(1.01)); ; for ($i = 0; $i < count($values); $i++) { $res = is_finite($values[$i]); - var_dump($res); + var_dump($res); } ?> --EXPECT-- diff --git a/ext/standard/tests/math/is_finite_basiclong_64bit.phpt b/ext/standard/tests/math/is_finite_basiclong_64bit.phpt index bbc43f7349..201d8473fa 100644 --- a/ext/standard/tests/math/is_finite_basiclong_64bit.phpt +++ b/ext/standard/tests/math/is_finite_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(is_finite($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/is_finite_variation1.phpt b/ext/standard/tests/math/is_finite_variation1.phpt index 4f6288f5df..bf4f3e41e1 100644 --- a/ext/standard/tests/math/is_finite_variation1.phpt +++ b/ext/standard/tests/math/is_finite_variation1.phpt @@ -32,7 +32,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -51,7 +51,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -61,10 +61,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data /*23*/ new classA(), - + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/is_infinite_basic.phpt b/ext/standard/tests/math/is_infinite_basic.phpt index 2ae5679285..2a02dfb9bb 100644 --- a/ext/standard/tests/math/is_infinite_basic.phpt +++ b/ext/standard/tests/math/is_infinite_basic.phpt @@ -15,11 +15,11 @@ $values = array(234, true, false, pow(0, -2), - acos(1.01)); + acos(1.01)); ; for ($i = 0; $i < count($values); $i++) { $res = is_infinite($values[$i]); - var_dump($res); + var_dump($res); } ?> --EXPECT-- diff --git a/ext/standard/tests/math/is_infinite_basiclong_64bit.phpt b/ext/standard/tests/math/is_infinite_basiclong_64bit.phpt index ab15ec71f0..ca53b77f0c 100644 --- a/ext/standard/tests/math/is_infinite_basiclong_64bit.phpt +++ b/ext/standard/tests/math/is_infinite_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(is_infinite($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/is_infinite_variation1.phpt b/ext/standard/tests/math/is_infinite_variation1.phpt index e7228dd7c5..d04a91b552 100644 --- a/ext/standard/tests/math/is_infinite_variation1.phpt +++ b/ext/standard/tests/math/is_infinite_variation1.phpt @@ -32,7 +32,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -51,7 +51,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -61,10 +61,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data /*23*/ new classA(), - + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/is_nan_basic.phpt b/ext/standard/tests/math/is_nan_basic.phpt index a7998e1314..8a37912f80 100644 --- a/ext/standard/tests/math/is_nan_basic.phpt +++ b/ext/standard/tests/math/is_nan_basic.phpt @@ -15,14 +15,14 @@ $values = array(234, true, false, pow(0, -2), - acos(1.01)); - + acos(1.01)); + for ($i = 0; $i < count($values); $i++) { $res = is_nan($values[$i]); - var_dump($res); + var_dump($res); } - + ?> --EXPECT-- diff --git a/ext/standard/tests/math/is_nan_basiclong_64bit.phpt b/ext/standard/tests/math/is_nan_basiclong_64bit.phpt index 6f66d6b71e..ca85db1660 100644 --- a/ext/standard/tests/math/is_nan_basiclong_64bit.phpt +++ b/ext/standard/tests/math/is_nan_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(is_nan($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/is_nan_variation1.phpt b/ext/standard/tests/math/is_nan_variation1.phpt index 3106d30d74..fed29a8901 100644 --- a/ext/standard/tests/math/is_nan_variation1.phpt +++ b/ext/standard/tests/math/is_nan_variation1.phpt @@ -32,7 +32,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -51,7 +51,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -61,10 +61,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data /*23*/ new classA(), - + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/lcg_value_basic.phpt b/ext/standard/tests/math/lcg_value_basic.phpt index 8fc95190c6..16ef44c47d 100644 --- a/ext/standard/tests/math/lcg_value_basic.phpt +++ b/ext/standard/tests/math/lcg_value_basic.phpt @@ -9,7 +9,7 @@ echo "MATHS test script started\n"; echo "\n lcg_value tests...\n"; for ($i = 0; $i < 100; $i++) { $res = lcg_value(); - + if (!is_float($res) || $res < 0 || $res > 1) { break; } @@ -17,28 +17,28 @@ for ($i = 0; $i < 100; $i++) { if ($i != 100) { echo "FAILED\n"; -} else { +} else { echo "PASSED\n"; -} +} echo "\n lcg_value error cases..\n"; $res = lcg_value(23); if (is_null($res)) { echo "PASSED\n"; -} else { +} else { echo "FAILED\n"; -} +} $res = lcg_value(10,false); if (is_null($res)) { echo "PASSED\n"; -} else { +} else { echo "FAILED\n"; -} +} echo "MATHS test script completed\n"; - + ?> --EXPECTF-- diff --git a/ext/standard/tests/math/log.phpt b/ext/standard/tests/math/log.phpt index 31c5e2ae85..4df77e643c 100644 --- a/ext/standard/tests/math/log.phpt +++ b/ext/standard/tests/math/log.phpt @@ -6,8 +6,8 @@ echo "On failure, please mail result to php-dev@lists.php.net\n"; for ($x = 0, $count= 0; $x < 200; $x++) { $x2 = (int) exp(log($x)); // e ^ log(x) should be close in range to x - if (($x2 < ($x + 2)) && ($x2 > ($x - 2))) { - $count++; + if (($x2 < ($x + 2)) && ($x2 > ($x - 2))) { + $count++; } else { print "$x : $x2\n"; } @@ -19,8 +19,8 @@ for ($base = 2; $base < 11; $base++) { for ($x = 0, $count= 0; $x < 50; $x++) { $x2 = (int) pow($base, log($x, $base)); // base ^ log(x) should be close in range to x - if (($x2 < ($x + 2)) && ($x2 > ($x - 2))) { - $count++; + if (($x2 < ($x + 2)) && ($x2 > ($x - 2))) { + $count++; } else { print "base $base: $x : $x2\n"; } diff --git a/ext/standard/tests/math/log10_basic.phpt b/ext/standard/tests/math/log10_basic.phpt index 0877df23d7..3ea14b59ac 100644 --- a/ext/standard/tests/math/log10_basic.phpt +++ b/ext/standard/tests/math/log10_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input log10() precision = 14 --FILE-- <?php -/* +/* * proto float log10(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); diff --git a/ext/standard/tests/math/log10_basiclong_64bit.phpt b/ext/standard/tests/math/log10_basiclong_64bit.phpt index be1b7eff7d..2eb2d544b6 100644 --- a/ext/standard/tests/math/log10_basiclong_64bit.phpt +++ b/ext/standard/tests/math/log10_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(log10($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/log10_error.phpt b/ext/standard/tests/math/log10_error.phpt index e3bc604fd2..f4e5da8f48 100644 --- a/ext/standard/tests/math/log10_error.phpt +++ b/ext/standard/tests/math/log10_error.phpt @@ -4,10 +4,10 @@ Test wrong number of arguments for log10() precision = 14 --FILE-- <?php -/* +/* * proto float log10(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/log10_variation.phpt b/ext/standard/tests/math/log10_variation.phpt index ca41a0dbd5..40099689ef 100644 --- a/ext/standard/tests/math/log10_variation.phpt +++ b/ext/standard/tests/math/log10_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of log10() precision = 10 --FILE-- <?php -/* +/* * proto float log10(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test log10 with a different input values @@ -26,7 +26,7 @@ $values = array(23, "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = log10($values[$i]); diff --git a/ext/standard/tests/math/log1p_basic.phpt b/ext/standard/tests/math/log1p_basic.phpt index b6d14a26e7..4270ad6920 100644 --- a/ext/standard/tests/math/log1p_basic.phpt +++ b/ext/standard/tests/math/log1p_basic.phpt @@ -23,14 +23,14 @@ $values = array(23, "2.345e1", null, true, - false); + false); echo "\n LOG1p tests\n"; foreach($values as $value) { echo "\n-- log1p $value --\n"; var_dump(log1p($value)); -}; +}; ?> diff --git a/ext/standard/tests/math/log1p_basiclong_64bit.phpt b/ext/standard/tests/math/log1p_basiclong_64bit.phpt index a0b32bdce9..05580ff731 100644 --- a/ext/standard/tests/math/log1p_basiclong_64bit.phpt +++ b/ext/standard/tests/math/log1p_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(log1p($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/log1p_error.phpt b/ext/standard/tests/math/log1p_error.phpt index e0b01a19ac..62549c4765 100644 --- a/ext/standard/tests/math/log1p_error.phpt +++ b/ext/standard/tests/math/log1p_error.phpt @@ -7,7 +7,7 @@ Test log1p() - Error conditions * when the value of number is close to zero * Source code: ext/standard/math.c */ - + echo "*** Testing log1p() : error conditions ***\n"; echo "\n-- Testing log1p() function with less than expected no. of arguments --\n"; diff --git a/ext/standard/tests/math/log1p_variation1.phpt b/ext/standard/tests/math/log1p_variation1.phpt index 8cd41526f5..138471418a 100644 --- a/ext/standard/tests/math/log1p_variation1.phpt +++ b/ext/standard/tests/math/log1p_variation1.phpt @@ -35,7 +35,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, -2147483648, @@ -55,7 +55,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', @@ -65,10 +65,10 @@ $inputs = array( /*21*/ "abcxyz", 'abcxyz', $heredoc, - + // object data /*24*/ new classA(), - + // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/log_basic.phpt b/ext/standard/tests/math/log_basic.phpt index 1b0b628d51..a928af6013 100644 --- a/ext/standard/tests/math/log_basic.phpt +++ b/ext/standard/tests/math/log_basic.phpt @@ -15,7 +15,7 @@ $values = array(23, "2.345e1", null, true, - false); + false); echo "\n LOG tests...no base\n"; for ($i = 0; $i < count($values); $i++) { diff --git a/ext/standard/tests/math/log_basiclong_64bit.phpt b/ext/standard/tests/math/log_basiclong_64bit.phpt index 9a8f8a6f1d..5259899323 100644 --- a/ext/standard/tests/math/log_basiclong_64bit.phpt +++ b/ext/standard/tests/math/log_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(log($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/log_variation1.phpt b/ext/standard/tests/math/log_variation1.phpt index c1cde4bcc9..9d350f212c 100644 --- a/ext/standard/tests/math/log_variation1.phpt +++ b/ext/standard/tests/math/log_variation1.phpt @@ -32,7 +32,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -51,7 +51,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -61,10 +61,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data /*23*/ new classA(), - + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/log_variation2.phpt b/ext/standard/tests/math/log_variation2.phpt index 9f5c7313fa..33cb38ee7b 100644 --- a/ext/standard/tests/math/log_variation2.phpt +++ b/ext/standard/tests/math/log_variation2.phpt @@ -32,7 +32,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -51,7 +51,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -61,10 +61,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data /*23*/ new classA(), - + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/mt_rand_basic.phpt b/ext/standard/tests/math/mt_rand_basic.phpt index 5ffa059c3f..6dedc78be1 100644 --- a/ext/standard/tests/math/mt_rand_basic.phpt +++ b/ext/standard/tests/math/mt_rand_basic.phpt @@ -7,7 +7,7 @@ $default_max = mt_getrandmax(); echo "\nmt_rand() tests with default min and max value (i.e 0 thru ", $default_max, ")\n"; for ($i = 0; $i < 100; $i++) { $res = mt_rand(); - + // By default RAND_MAX is 32768 although no constant is defined for it for user space apps if (!is_int($res) || $res < 0 || $res > $default_max) { break; @@ -16,9 +16,9 @@ for ($i = 0; $i < 100; $i++) { if ($i != 100) { echo "FAILED: res = ", $res, " min = 0 max = ", $default_max, "\n"; -} else { - echo "PASSED: range min = 0 max = ", $default_max, "\n"; -} +} else { + echo "PASSED: range min = 0 max = ", $default_max, "\n"; +} echo "\nmt_rand() tests with defined min and max value\n"; @@ -28,28 +28,28 @@ $min = array(10, 10.5e3, 0x10, 0400); - + $max = array(100, 1000, 19.5, 10.5e5, 0x10000, - 0700); + 0700); for ($x = 0; $x < count($min); $x++) { for ($i = 0; $i < 100; $i++) { $res = mt_rand($min[$x], $max[$x]); - + if (!is_int($res) || $res < intval($min[$x]) || $res > intval($max[$x])) { - echo "FAILED: res = ", $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; + echo "FAILED: res = ", $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; break; } } if ($i == 100) { - echo "PASSED: range min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; + echo "PASSED: range min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; } -} +} echo "\nNon-numeric cases\n"; $min = array(true, @@ -57,7 +57,7 @@ $min = array(true, null, "10", "10.5"); - + // Expected numerical equivalent of above non-numerics $minval = array(1, 0, @@ -67,16 +67,16 @@ $minval = array(1, for ($x = 0; $x < count($min); $x++) { for ($i = 0; $i < 100; $i++) { $res = mt_rand($min[$x], 100); - + if (!is_int($res) || $res < intval($minval[$x]) || $res > 100) { - echo "FAILED: res = ", $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; + echo "FAILED: res = ", $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; break; } } - + if ($i == 100) { - echo "PASSED range min = ", intval($min[$x]), " max = 100\n"; - } + echo "PASSED range min = ", intval($min[$x]), " max = 100\n"; + } } ?> --EXPECT-- diff --git a/ext/standard/tests/math/mt_rand_variation1.phpt b/ext/standard/tests/math/mt_rand_variation1.phpt index 38df739baf..545cdb0b43 100644 --- a/ext/standard/tests/math/mt_rand_variation1.phpt +++ b/ext/standard/tests/math/mt_rand_variation1.phpt @@ -32,7 +32,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -51,7 +51,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -61,10 +61,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data /*23*/ new classA(), - + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/mt_rand_variation2.phpt b/ext/standard/tests/math/mt_rand_variation2.phpt index f49d1293f7..b258dca2ad 100644 --- a/ext/standard/tests/math/mt_rand_variation2.phpt +++ b/ext/standard/tests/math/mt_rand_variation2.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -63,10 +63,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data /*23*/ new classA(), - + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/mt_srand_variation1.phpt b/ext/standard/tests/math/mt_srand_variation1.phpt index 891152b8a8..bb96764a16 100644 --- a/ext/standard/tests/math/mt_srand_variation1.phpt +++ b/ext/standard/tests/math/mt_srand_variation1.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -63,10 +63,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data /*23*/ new classA(), - + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/number_format_basic.phpt b/ext/standard/tests/math/number_format_basic.phpt index 330a71b4a7..db1e40e831 100644 --- a/ext/standard/tests/math/number_format_basic.phpt +++ b/ext/standard/tests/math/number_format_basic.phpt @@ -13,7 +13,7 @@ $values = array(1234.5678, "12.3456789e1", null, true, - false); + false); echo "\n number_format tests.....default\n"; for ($i = 0; $i < count($values); $i++) { diff --git a/ext/standard/tests/math/number_format_multichar.phpt b/ext/standard/tests/math/number_format_multichar.phpt index 2141cc20a4..90ef3ea634 100644 --- a/ext/standard/tests/math/number_format_multichar.phpt +++ b/ext/standard/tests/math/number_format_multichar.phpt @@ -13,7 +13,7 @@ $values = array(1234.5678, "12.3456789e1", null, true, - false); + false); echo " number_format tests.....multiple character decimal point\n"; for ($i = 0; $i < count($values); $i++) { diff --git a/ext/standard/tests/math/octdec_basic.phpt b/ext/standard/tests/math/octdec_basic.phpt index ff584f2514..dfa9e9024c 100644 --- a/ext/standard/tests/math/octdec_basic.phpt +++ b/ext/standard/tests/math/octdec_basic.phpt @@ -22,7 +22,7 @@ $values = array(01234567, 31.1013e5, true, false, - null); + null); for ($i = 0; $i < count($values); $i++) { $res = octdec($values[$i]); diff --git a/ext/standard/tests/math/octdec_basic_64bit.phpt b/ext/standard/tests/math/octdec_basic_64bit.phpt index c77ca722bb..a652f30623 100644 --- a/ext/standard/tests/math/octdec_basic_64bit.phpt +++ b/ext/standard/tests/math/octdec_basic_64bit.phpt @@ -25,7 +25,7 @@ $values = array(01234567, 31.1013e5, true, false, - null); + null); for ($i = 0; $i < count($values); $i++) { $res = octdec($values[$i]); diff --git a/ext/standard/tests/math/octdec_basiclong_64bit.phpt b/ext/standard/tests/math/octdec_basiclong_64bit.phpt index 651b09db39..4a97a6f414 100644 --- a/ext/standard/tests/math/octdec_basiclong_64bit.phpt +++ b/ext/standard/tests/math/octdec_basiclong_64bit.phpt @@ -6,15 +6,15 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); define("MIN_32Bit", -2147483647 - 1); $octLongStrs = array( - '777777777777777777777', - '1777777777777777777777', + '777777777777777777777', + '1777777777777777777777', '17777777777', '37777777777', '377777777777777777777777', @@ -28,7 +28,7 @@ foreach ($octLongStrs as $strVal) { echo "--- testing: $strVal ---\n"; var_dump(octdec($strVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/octdec_error.phpt b/ext/standard/tests/math/octdec_error.phpt index ba5f2116bb..3ba10a5562 100644 --- a/ext/standard/tests/math/octdec_error.phpt +++ b/ext/standard/tests/math/octdec_error.phpt @@ -14,7 +14,7 @@ class classA { } -echo "\n-- Incorrect number of arguments --\n"; +echo "\n-- Incorrect number of arguments --\n"; octdec(); octdec('0123567',true); diff --git a/ext/standard/tests/math/octdec_variation1.phpt b/ext/standard/tests/math/octdec_variation1.phpt index 117119600b..57edb35425 100644 --- a/ext/standard/tests/math/octdec_variation1.phpt +++ b/ext/standard/tests/math/octdec_variation1.phpt @@ -28,9 +28,9 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 4294967295, // largest decimal - 4294967296, + 4294967296, // float data /*7*/ 10.5, @@ -48,7 +48,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', @@ -58,7 +58,7 @@ $inputs = array( /*21*/ "abcxyz", 'abcxyz', $heredoc, - + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/pow_basic.phpt b/ext/standard/tests/math/pow_basic.phpt index b7d96ca23b..c9e13770a1 100644 --- a/ext/standard/tests/math/pow_basic.phpt +++ b/ext/standard/tests/math/pow_basic.phpt @@ -20,7 +20,7 @@ $bases = array(23, "23.45", "2.345e1", PHP_INT_MAX, - -PHP_INT_MAX - 1); + -PHP_INT_MAX - 1); $exponents = array(0, 1, @@ -34,8 +34,8 @@ $exponents = array(0, 500, -500, 2147483647, - -2147483648); - + -2147483648); + foreach($bases as $base) { echo "\n\nBase = $base"; foreach($exponents as $exponent) { diff --git a/ext/standard/tests/math/pow_basic2.phpt b/ext/standard/tests/math/pow_basic2.phpt index fc55caccad..a1cb124767 100644 --- a/ext/standard/tests/math/pow_basic2.phpt +++ b/ext/standard/tests/math/pow_basic2.phpt @@ -8,7 +8,7 @@ precision=14 $large_exp = 20000; echo "\n-- The following all result in INF --\n"; -var_dump(pow(24, $large_exp)); +var_dump(pow(24, $large_exp)); var_dump(pow(0.24, -$large_exp)); var_dump(pow(-0.24, -$large_exp)); @@ -16,7 +16,7 @@ echo "\n\n-- The following all result in 0 --\n"; var_dump(pow(0.24, $large_exp)); var_dump(pow(-0.24, $large_exp)); var_dump(pow(24, -$large_exp)); -var_dump(pow(-24, -$large_exp)); +var_dump(pow(-24, -$large_exp)); echo "\n\n-- The following all result in -0 --\n"; var_dump(pow(-0.24, $large_exp+1)); diff --git a/ext/standard/tests/math/pow_basic_64bit.phpt b/ext/standard/tests/math/pow_basic_64bit.phpt index fd583a0243..1493ea5bc5 100644 --- a/ext/standard/tests/math/pow_basic_64bit.phpt +++ b/ext/standard/tests/math/pow_basic_64bit.phpt @@ -20,7 +20,7 @@ $bases = array(23, "23.45", "2.345e1", PHP_INT_MAX, - -PHP_INT_MAX - 1); + -PHP_INT_MAX - 1); $exponents = array(0, 1, @@ -34,8 +34,8 @@ $exponents = array(0, 500, -500, 2147483647, - -2147483648); - + -2147483648); + foreach($bases as $base) { echo "\n\nBase = $base"; foreach($exponents as $exponent) { diff --git a/ext/standard/tests/math/pow_basiclong_64bit.phpt b/ext/standard/tests/math/pow_basiclong_64bit.phpt index dfff0f6785..722b01c0c7 100644 --- a/ext/standard/tests/math/pow_basiclong_64bit.phpt +++ b/ext/standard/tests/math/pow_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,11 +23,11 @@ $otherVals = array(0, 1, -1, 7, 9, 65, -44, MAX_32Bit, MIN_32Bit, MAX_64Bit, MIN foreach ($longVals as $longVal) { foreach($otherVals as $otherVal) { - echo "--- testing: $longVal, $otherVal ---\n"; + echo "--- testing: $longVal, $otherVal ---\n"; var_dump(pow($longVal, $otherVal)); } } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/pow_variation1.phpt b/ext/standard/tests/math/pow_variation1.phpt index 3b1befe16b..2b98844fea 100644 --- a/ext/standard/tests/math/pow_variation1.phpt +++ b/ext/standard/tests/math/pow_variation1.phpt @@ -38,7 +38,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, PHP_INT_MAX, // float data @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -67,10 +67,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data /*23*/ new classA(), - + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/pow_variation1_64bit.phpt b/ext/standard/tests/math/pow_variation1_64bit.phpt index 35f9942490..8e2497e85c 100644 --- a/ext/standard/tests/math/pow_variation1_64bit.phpt +++ b/ext/standard/tests/math/pow_variation1_64bit.phpt @@ -38,7 +38,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, PHP_INT_MAX, // float data @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -67,10 +67,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data /*23*/ new classA(), - + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/pow_variation2.phpt b/ext/standard/tests/math/pow_variation2.phpt index d93a952dbe..7c4d7a0460 100644 --- a/ext/standard/tests/math/pow_variation2.phpt +++ b/ext/standard/tests/math/pow_variation2.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -63,10 +63,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data /*23*/ new classA(), - + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/rad2deg_basic.phpt b/ext/standard/tests/math/rad2deg_basic.phpt index 0256ffbd90..e79e591cf7 100644 --- a/ext/standard/tests/math/rad2deg_basic.phpt +++ b/ext/standard/tests/math/rad2deg_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input rad2deg() precision = 14 --FILE-- <?php -/* +/* * proto float rad2deg(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); diff --git a/ext/standard/tests/math/rad2deg_basiclong_64bit.phpt b/ext/standard/tests/math/rad2deg_basiclong_64bit.phpt index 4f43ef1368..b3d973387e 100644 --- a/ext/standard/tests/math/rad2deg_basiclong_64bit.phpt +++ b/ext/standard/tests/math/rad2deg_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(rad2deg($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/rad2deg_error.phpt b/ext/standard/tests/math/rad2deg_error.phpt index 32b2f4dcb6..e49eea2703 100644 --- a/ext/standard/tests/math/rad2deg_error.phpt +++ b/ext/standard/tests/math/rad2deg_error.phpt @@ -4,10 +4,10 @@ Test wrong number of arguments for rad2deg() precision = 14 --FILE-- <?php -/* +/* * proto float rad2deg(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/rad2deg_variation.phpt b/ext/standard/tests/math/rad2deg_variation.phpt index 935636cd59..d9c81143aa 100644 --- a/ext/standard/tests/math/rad2deg_variation.phpt +++ b/ext/standard/tests/math/rad2deg_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of rad2deg() precision = 10 --FILE-- <?php -/* +/* * proto float rad2deg(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test rad2deg with a different input values @@ -26,7 +26,7 @@ $values = array(23, "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = rad2deg($values[$i]); diff --git a/ext/standard/tests/math/rand_basic.phpt b/ext/standard/tests/math/rand_basic.phpt index 8dc9fb862c..a9fb7b399a 100644 --- a/ext/standard/tests/math/rand_basic.phpt +++ b/ext/standard/tests/math/rand_basic.phpt @@ -7,7 +7,7 @@ $default_max = getrandmax(); echo "\nrand() tests with default min and max value (i.e 0 thru ", $default_max, ")\n"; for ($i = 0; $i < 100; $i++) { $res = rand(); - + // By default RAND_MAX is 32768 although no constant is defined for it for user space apps if (!is_int($res) || $res < 0 || $res > $default_max) { break; @@ -16,9 +16,9 @@ for ($i = 0; $i < 100; $i++) { if ($i != 100) { echo "FAILED: res = ", $res, " min = 0 max = ", $default_max, "\n"; -} else { +} else { echo "PASSED: range min = 0 max = ", $default_max, "\n"; -} +} echo "\nrand() tests with defined min and max value\n"; @@ -28,28 +28,28 @@ $min = array(10, 10.5e3, 0x10, 0400); - + $max = array(100, 1000, 19.5, 10.5e5, 0x10000, - 0700); + 0700); for ($x = 0; $x < count($min); $x++) { for ($i = 0; $i < 100; $i++) { $res = rand($min[$x], $max[$x]); - + if (!is_int($res) || $res < intval($min[$x]) || $res > intval($max[$x])) { - echo "FAILED: res = ", $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; + echo "FAILED: res = ", $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; break; } } if ($i == 100) { - echo "PASSED: range min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; + echo "PASSED: range min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; } -} +} echo "\nNon-numeric cases\n"; $min = array(true, @@ -57,7 +57,7 @@ $min = array(true, null, "10", "10.5"); - + // Eexepcted numerical equivalent of above non-numerics $minval = array(1, 0, @@ -67,16 +67,16 @@ $minval = array(1, for ($x = 0; $x < count($min); $x++) { for ($i = 0; $i < 100; $i++) { $res = rand($min[$x], 100); - + if (!is_int($res) || $res < intval($minval[$x]) || $res > 100) { - echo "FAILED: res = ", $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; + echo "FAILED: res = ", $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; break; } } - + if ($i == 100) { - echo "PASSED range min = ", intval($min[$x]), " max = 100\n"; - } + echo "PASSED range min = ", intval($min[$x]), " max = 100\n"; + } } ?> --EXPECTF-- diff --git a/ext/standard/tests/math/rand_variation1.phpt b/ext/standard/tests/math/rand_variation1.phpt index d688524b6e..a84292e598 100644 --- a/ext/standard/tests/math/rand_variation1.phpt +++ b/ext/standard/tests/math/rand_variation1.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -63,10 +63,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data /*23*/ new classA(), - + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/rand_variation2.phpt b/ext/standard/tests/math/rand_variation2.phpt index ed9c9a61c3..7c11e39bc9 100644 --- a/ext/standard/tests/math/rand_variation2.phpt +++ b/ext/standard/tests/math/rand_variation2.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -63,10 +63,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data /*23*/ new classA(), - + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/round_basic.phpt b/ext/standard/tests/math/round_basic.phpt index 72ab13fc3e..1d9d6bf8d5 100644 --- a/ext/standard/tests/math/round_basic.phpt +++ b/ext/standard/tests/math/round_basic.phpt @@ -19,9 +19,9 @@ $values = array(123456789, -4.567E3, 0x234567, 067777777, - "1.234567", + "1.234567", "2.3456789e8"); - + $precision = array(2, 8, 0x3, @@ -33,7 +33,7 @@ $precision = array(2, "2.1e1", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { echo "round: $values[$i]\n"; @@ -41,7 +41,7 @@ for ($i = 0; $i < count($values); $i++) { $res = round($values[$i], $precision[$j]); echo "...with precision $precision[$j]-> "; var_dump($res); - } + } } ?> ===Done=== diff --git a/ext/standard/tests/math/round_basiclong_64bit.phpt b/ext/standard/tests/math/round_basiclong_64bit.phpt index 19db12ed81..fbae95437f 100644 --- a/ext/standard/tests/math/round_basiclong_64bit.phpt +++ b/ext/standard/tests/math/round_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(round($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/round_error.phpt b/ext/standard/tests/math/round_error.phpt index 28a6d5cf79..eb80722d92 100644 --- a/ext/standard/tests/math/round_error.phpt +++ b/ext/standard/tests/math/round_error.phpt @@ -7,11 +7,11 @@ Test round() function : error conditions - incorrect number of args * after the decimal point) * Source code: ext/standard/math.c */ - + /* * Pass incorrect number of arguments to round() to test behaviour */ - + echo "*** Testing round() : error conditions ***\n"; echo "\n-- Wrong nmumber of arguments --\n"; diff --git a/ext/standard/tests/math/round_variation1.phpt b/ext/standard/tests/math/round_variation1.phpt index c1883a5c1b..48070e967f 100644 --- a/ext/standard/tests/math/round_variation1.phpt +++ b/ext/standard/tests/math/round_variation1.phpt @@ -35,7 +35,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -54,7 +54,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -64,10 +64,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data /*23*/ new classA(), - + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/round_variation2.phpt b/ext/standard/tests/math/round_variation2.phpt index aec4c7f27b..3ace9f3966 100644 --- a/ext/standard/tests/math/round_variation2.phpt +++ b/ext/standard/tests/math/round_variation2.phpt @@ -35,7 +35,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -54,7 +54,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -64,10 +64,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data /*23*/ new classA(), - + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/sin_basic.phpt b/ext/standard/tests/math/sin_basic.phpt index 2b55ad7355..27579cd289 100644 --- a/ext/standard/tests/math/sin_basic.phpt +++ b/ext/standard/tests/math/sin_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input sin() precision = 14 --FILE-- <?php -/* +/* * proto float sin(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); @@ -64,7 +64,7 @@ var_dump(sin($twoseventy)); if (allowed_rounding_error(sin($twoseventy),-1.0)) { echo "Pass\n"; } -else { +else { echo "Fail\n"; } diff --git a/ext/standard/tests/math/sin_basiclong_64bit.phpt b/ext/standard/tests/math/sin_basiclong_64bit.phpt index 55b859a6fd..f335b3bd62 100644 --- a/ext/standard/tests/math/sin_basiclong_64bit.phpt +++ b/ext/standard/tests/math/sin_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(sin($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/sin_error.phpt b/ext/standard/tests/math/sin_error.phpt index 41a4b2e7af..c6b9f086cd 100644 --- a/ext/standard/tests/math/sin_error.phpt +++ b/ext/standard/tests/math/sin_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for sin() --FILE-- <?php -/* +/* * proto float sin(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/sin_variation.phpt b/ext/standard/tests/math/sin_variation.phpt index 5d4b5583cc..9f79ca1c3c 100644 --- a/ext/standard/tests/math/sin_variation.phpt +++ b/ext/standard/tests/math/sin_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of sin() precision = 10 --FILE-- <?php -/* +/* * proto float sin(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test sin with a different input values @@ -26,7 +26,7 @@ $values = array(23, "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = sin($values[$i]); diff --git a/ext/standard/tests/math/sinh_basic.phpt b/ext/standard/tests/math/sinh_basic.phpt index 79bef6314c..2bcf42f9fd 100644 --- a/ext/standard/tests/math/sinh_basic.phpt +++ b/ext/standard/tests/math/sinh_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input sinh() precision = 14 --FILE-- <?php -/* +/* * proto float sinh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); diff --git a/ext/standard/tests/math/sinh_basiclong_64bit.phpt b/ext/standard/tests/math/sinh_basiclong_64bit.phpt index 52068146ea..a52a48a8db 100644 --- a/ext/standard/tests/math/sinh_basiclong_64bit.phpt +++ b/ext/standard/tests/math/sinh_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(sinh($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/sinh_error.phpt b/ext/standard/tests/math/sinh_error.phpt index 70decf252f..3f7ba923c3 100644 --- a/ext/standard/tests/math/sinh_error.phpt +++ b/ext/standard/tests/math/sinh_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for sinh() --FILE-- <?php -/* +/* * proto float sinh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/sinh_variation.phpt b/ext/standard/tests/math/sinh_variation.phpt index 860f809b88..a212a09975 100644 --- a/ext/standard/tests/math/sinh_variation.phpt +++ b/ext/standard/tests/math/sinh_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of sinh() precision = 10 --FILE-- <?php -/* +/* * proto float sinh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test sinh with a different input values @@ -26,7 +26,7 @@ $values = array(23, "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = sinh($values[$i]); diff --git a/ext/standard/tests/math/sqrt_basic.phpt b/ext/standard/tests/math/sqrt_basic.phpt index 076a113016..ef665a0216 100644 --- a/ext/standard/tests/math/sqrt_basic.phpt +++ b/ext/standard/tests/math/sqrt_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input sqrt() precision = 14 --FILE-- <?php -/* +/* * proto float sqrt(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 9.0; diff --git a/ext/standard/tests/math/sqrt_basiclong_64bit.phpt b/ext/standard/tests/math/sqrt_basiclong_64bit.phpt index 99091e2c4b..44fe578548 100644 --- a/ext/standard/tests/math/sqrt_basiclong_64bit.phpt +++ b/ext/standard/tests/math/sqrt_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(sqrt($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/sqrt_error.phpt b/ext/standard/tests/math/sqrt_error.phpt index 66d6d27355..ac66091838 100644 --- a/ext/standard/tests/math/sqrt_error.phpt +++ b/ext/standard/tests/math/sqrt_error.phpt @@ -4,10 +4,10 @@ Test wrong number of arguments for sqrt() precision = 14 --FILE-- <?php -/* +/* * proto float sqrt(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/sqrt_variation.phpt b/ext/standard/tests/math/sqrt_variation.phpt index e5629ee55c..a35730552d 100644 --- a/ext/standard/tests/math/sqrt_variation.phpt +++ b/ext/standard/tests/math/sqrt_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of sqrt() precision = 14 --FILE-- <?php -/* +/* * proto float sqrt(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test sqrt with a different input values @@ -27,7 +27,7 @@ $values = array(23, "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = sqrt($values[$i]); diff --git a/ext/standard/tests/math/srand_error.phpt b/ext/standard/tests/math/srand_error.phpt index 92140af82a..420698d0b1 100644 --- a/ext/standard/tests/math/srand_error.phpt +++ b/ext/standard/tests/math/srand_error.phpt @@ -6,11 +6,11 @@ Test srand() function : error conditions - incorrect number of args * Description: Seed the random number generator. * Source code: ext/standard/rand.c */ - + /* * Pass incorrect number of arguments to srand() to test behaviour */ - + echo "*** Testing srand() : error conditions ***\n"; var_dump(srand(500, 0, true)); diff --git a/ext/standard/tests/math/srand_variation1.phpt b/ext/standard/tests/math/srand_variation1.phpt index 3a681e647a..8b73eafc20 100644 --- a/ext/standard/tests/math/srand_variation1.phpt +++ b/ext/standard/tests/math/srand_variation1.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -63,10 +63,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data /*23*/ new classA(), - + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/tan_basic.phpt b/ext/standard/tests/math/tan_basic.phpt index e2934fb388..b804a662de 100644 --- a/ext/standard/tests/math/tan_basic.phpt +++ b/ext/standard/tests/math/tan_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input tan() precision = 14 --FILE-- <?php -/* +/* * proto float tan(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); @@ -23,7 +23,7 @@ if (allowed_rounding_error(tan($sixty),1.7320508075689)) { else { echo "Fail\n"; } - + echo "tan 30 = "; var_dump(tan($thirty)); if (allowed_rounding_error(tan($thirty),0.57735026918963)) { diff --git a/ext/standard/tests/math/tan_basiclong_64bit.phpt b/ext/standard/tests/math/tan_basiclong_64bit.phpt index 3c8abe9d27..bdc97b0732 100644 --- a/ext/standard/tests/math/tan_basiclong_64bit.phpt +++ b/ext/standard/tests/math/tan_basiclong_64bit.phpt @@ -8,7 +8,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -25,7 +25,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(tan($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/tan_error.phpt b/ext/standard/tests/math/tan_error.phpt index b3d4cf83c1..f36e633b16 100644 --- a/ext/standard/tests/math/tan_error.phpt +++ b/ext/standard/tests/math/tan_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for tan() --FILE-- <?php -/* +/* * proto float tan(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/tan_variation.phpt b/ext/standard/tests/math/tan_variation.phpt index b88d66acdf..6f54f95234 100644 --- a/ext/standard/tests/math/tan_variation.phpt +++ b/ext/standard/tests/math/tan_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of tan() precision = 10 --FILE-- <?php -/* +/* * proto float tan(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test tan with a different input values @@ -26,7 +26,7 @@ $values = array(23, "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = tan($values[$i]); diff --git a/ext/standard/tests/math/tanh_basic.phpt b/ext/standard/tests/math/tanh_basic.phpt index 6b6a9dff7d..30eacca4cc 100644 --- a/ext/standard/tests/math/tanh_basic.phpt +++ b/ext/standard/tests/math/tanh_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input tanh() precision = 14 --FILE-- <?php -/* +/* * proto float tanh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); diff --git a/ext/standard/tests/math/tanh_basiclong_64bit.phpt b/ext/standard/tests/math/tanh_basiclong_64bit.phpt index 02e6c102fe..f3563f81fc 100644 --- a/ext/standard/tests/math/tanh_basiclong_64bit.phpt +++ b/ext/standard/tests/math/tanh_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(tanh($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/tanh_error.phpt b/ext/standard/tests/math/tanh_error.phpt index cc92cb4aca..1e38a6cdcf 100644 --- a/ext/standard/tests/math/tanh_error.phpt +++ b/ext/standard/tests/math/tanh_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for tanh() --FILE-- <?php -/* +/* * proto float tanh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/tanh_variation.phpt b/ext/standard/tests/math/tanh_variation.phpt index 0c9371e938..e15b70cc0f 100644 --- a/ext/standard/tests/math/tanh_variation.phpt +++ b/ext/standard/tests/math/tanh_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of tanh() precision = 10 --FILE-- <?php -/* +/* * proto float tanh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test tanh with a different input values @@ -26,7 +26,7 @@ $values = array(23, "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = tanh($values[$i]); diff --git a/ext/standard/tests/misc/get_browser_basic.phpt b/ext/standard/tests/misc/get_browser_basic.phpt index 69db7345a5..eb480680ee 100644 --- a/ext/standard/tests/misc/get_browser_basic.phpt +++ b/ext/standard/tests/misc/get_browser_basic.phpt @@ -20,7 +20,7 @@ browscap={PWD}/browscap.ini * Returns an object by default; if return_array is true, returns an array. * * Source code: ext/standard/browscap.c - * Alias to functions: + * Alias to functions: */ $browsers = include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'browsernames.inc'; diff --git a/ext/standard/tests/misc/get_browser_error.phpt b/ext/standard/tests/misc/get_browser_error.phpt index d5e7abdd34..c9c367bb1a 100644 --- a/ext/standard/tests/misc/get_browser_error.phpt +++ b/ext/standard/tests/misc/get_browser_error.phpt @@ -20,7 +20,7 @@ browscap={PWD}/browscap.ini * Returns an object by default; if return_array is true, returns an array. * * Source code: ext/standard/browscap.c - * Alias to functions: + * Alias to functions: */ $browsers = include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'browsernames.inc'; diff --git a/ext/standard/tests/misc/get_browser_variation1.phpt b/ext/standard/tests/misc/get_browser_variation1.phpt index 6cc77e6765..7bde709888 100644 --- a/ext/standard/tests/misc/get_browser_variation1.phpt +++ b/ext/standard/tests/misc/get_browser_variation1.phpt @@ -20,7 +20,7 @@ browscap={PWD}/browscap.ini * Returns an object by default; if return_array is true, returns an array. * * Source code: ext/standard/browscap.c - * Alias to functions: + * Alias to functions: */ $browsers = include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'browsernames.inc'; diff --git a/ext/standard/tests/misc/time_nanosleep_error3.phpt b/ext/standard/tests/misc/time_nanosleep_error3.phpt index b6365f364f..d10ef922d0 100644 --- a/ext/standard/tests/misc/time_nanosleep_error3.phpt +++ b/ext/standard/tests/misc/time_nanosleep_error3.phpt @@ -1,7 +1,7 @@ --TEST-- time_nanosleep — Delay for a number of seconds and nanoseconds --SKIPIF-- -<?php +<?php if (strpos(strtoupper(PHP_OS), 'WIN') !== false) die("skip Test is not valid for Windows"); if (!function_exists('time_nanosleep')) die("skip"); ?> diff --git a/ext/standard/tests/network/closelog_basic.phpt b/ext/standard/tests/network/closelog_basic.phpt index 06798a5c1d..0430582181 100644 --- a/ext/standard/tests/network/closelog_basic.phpt +++ b/ext/standard/tests/network/closelog_basic.phpt @@ -5,7 +5,7 @@ Test closelog() function : basic functionality /* Prototype : bool closelog(void) * Description: Close connection to system logger * Source code: ext/standard/syslog.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing closelog() : basic functionality ***\n"; diff --git a/ext/standard/tests/network/closelog_error.phpt b/ext/standard/tests/network/closelog_error.phpt index 442f9a6249..5dac063cf6 100644 --- a/ext/standard/tests/network/closelog_error.phpt +++ b/ext/standard/tests/network/closelog_error.phpt @@ -5,7 +5,7 @@ Test closelog() function : error conditions /* Prototype : bool closelog(void) * Description: Close connection to system logger * Source code: ext/standard/syslog.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing closelog() : error conditions ***\n"; diff --git a/ext/standard/tests/network/fsockopen_basic.phpt b/ext/standard/tests/network/fsockopen_basic.phpt index 227762f899..5131651db8 100644 --- a/ext/standard/tests/network/fsockopen_basic.phpt +++ b/ext/standard/tests/network/fsockopen_basic.phpt @@ -5,7 +5,7 @@ Test fsockopen() function : basic functionality /* Prototype : proto resource fsockopen(string hostname, int port [, int errno [, string errstr [, float timeout]]]) * Description: Open Internet or Unix domain socket connection * Source code: ext/standard/fsock.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fsockopen() : basic functionality ***\n"; diff --git a/ext/standard/tests/network/fsockopen_error.phpt b/ext/standard/tests/network/fsockopen_error.phpt index 3b13b8cf39..dbbbb6765c 100644 --- a/ext/standard/tests/network/fsockopen_error.phpt +++ b/ext/standard/tests/network/fsockopen_error.phpt @@ -5,7 +5,7 @@ Test fsockopen() function : error conditions /* Prototype : proto resource fsockopen(string hostname, int port [, int errno [, string errstr [, float timeout]]]) * Description: Open Internet or Unix domain socket connection * Source code: ext/standard/fsock.c - * Alias to functions: + * Alias to functions: */ diff --git a/ext/standard/tests/network/gethostbyaddr_error.phpt b/ext/standard/tests/network/gethostbyaddr_error.phpt index 8909a30328..68a0cc7147 100644 --- a/ext/standard/tests/network/gethostbyaddr_error.phpt +++ b/ext/standard/tests/network/gethostbyaddr_error.phpt @@ -5,7 +5,7 @@ Test gethostbyaddr() function : error conditions /* Prototype : proto string gethostbyaddr(string ip_address) * Description: Get the Internet host name corresponding to a given IP address * Source code: ext/standard/dns.c - * Alias to functions: + * Alias to functions: */ diff --git a/ext/standard/tests/network/gethostbynamel_error.phpt b/ext/standard/tests/network/gethostbynamel_error.phpt index 7aa00e537e..0ce348187e 100644 --- a/ext/standard/tests/network/gethostbynamel_error.phpt +++ b/ext/standard/tests/network/gethostbynamel_error.phpt @@ -5,7 +5,7 @@ Test gethostbynamel() function : error conditions /* Prototype : proto array gethostbynamel(string hostname) * Description: Return a list of IP addresses that a given hostname resolves to. * Source code: ext/standard/dns.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gethostbynamel() : error conditions ***\n"; diff --git a/ext/standard/tests/network/inet.phpt b/ext/standard/tests/network/inet.phpt index 1bbcae4ef8..a1e70a0020 100644 --- a/ext/standard/tests/network/inet.phpt +++ b/ext/standard/tests/network/inet.phpt @@ -1,9 +1,9 @@ --TEST-- inet_ntop() & inet_pton() tests --SKIPIF-- -<?php -if (!function_exists("inet_ntop")) die("skip no inet_ntop()"); -if (!function_exists("inet_pton")) die("skip no inet_pton()"); +<?php +if (!function_exists("inet_ntop")) die("skip no inet_ntop()"); +if (!function_exists("inet_pton")) die("skip no inet_pton()"); ?> --FILE-- <?php @@ -37,7 +37,7 @@ foreach ($array as $val) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(9) "127.0.0.1" string(13) "255.255.255.0" diff --git a/ext/standard/tests/network/inet_ipv6.phpt b/ext/standard/tests/network/inet_ipv6.phpt index 3b9782f994..55323688de 100644 --- a/ext/standard/tests/network/inet_ipv6.phpt +++ b/ext/standard/tests/network/inet_ipv6.phpt @@ -1,9 +1,9 @@ --TEST-- inet_ntop() & inet_pton() IPv6 tests --SKIPIF-- -<?php -if (!function_exists("inet_ntop")) die("skip no inet_ntop()"); -if (!function_exists("inet_pton")) die("skip no inet_pton()"); +<?php +if (!function_exists("inet_ntop")) die("skip no inet_ntop()"); +if (!function_exists("inet_pton")) die("skip no inet_pton()"); $packed = str_repeat(chr(0), 15) . chr(1); if (@inet_ntop($packed) === false) { @@ -33,7 +33,7 @@ foreach ($a as $address) { echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(3) "::1" string(3) "::2" string(4) "::35" diff --git a/ext/standard/tests/network/ip.phpt b/ext/standard/tests/network/ip.phpt index 6c00824410..5237c89776 100644 --- a/ext/standard/tests/network/ip.phpt +++ b/ext/standard/tests/network/ip.phpt @@ -34,7 +34,7 @@ var_dump(long2ip(array())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(2130706433) string(9) "127.0.0.1" int(167772161) diff --git a/ext/standard/tests/network/ip2long_error.phpt b/ext/standard/tests/network/ip2long_error.phpt index 65e7315595..7c4722d3c7 100644 --- a/ext/standard/tests/network/ip2long_error.phpt +++ b/ext/standard/tests/network/ip2long_error.phpt @@ -5,7 +5,7 @@ Test ip2long() function : error conditions /* Prototype : int ip2long(string ip_address) * Description: Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ip2long() : error conditions ***\n"; diff --git a/ext/standard/tests/network/ip2long_variation1.phpt b/ext/standard/tests/network/ip2long_variation1.phpt index b228c9bd14..58494a1f17 100644 --- a/ext/standard/tests/network/ip2long_variation1.phpt +++ b/ext/standard/tests/network/ip2long_variation1.phpt @@ -5,7 +5,7 @@ Test ip2long() function : usage variation 1 /* Prototype : int ip2long(string ip_address) * Description: Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ip2long() : usage variation ***\n"; @@ -94,7 +94,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $res, ); diff --git a/ext/standard/tests/network/ip2long_variation2.phpt b/ext/standard/tests/network/ip2long_variation2.phpt index 0ca156a67b..e6414ee902 100644 --- a/ext/standard/tests/network/ip2long_variation2.phpt +++ b/ext/standard/tests/network/ip2long_variation2.phpt @@ -8,7 +8,7 @@ Test ip2long() function : usage variation 2, 32 bit /* Prototype : int ip2long(string ip_address) * Description: Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ $ips = array( diff --git a/ext/standard/tests/network/ip_x86_64.phpt b/ext/standard/tests/network/ip_x86_64.phpt index 7dc726e8c2..3c530b8371 100644 --- a/ext/standard/tests/network/ip_x86_64.phpt +++ b/ext/standard/tests/network/ip_x86_64.phpt @@ -34,7 +34,7 @@ var_dump(long2ip(array())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(2130706433) string(9) "127.0.0.1" int(167772161) diff --git a/ext/standard/tests/network/long2ip_error.phpt b/ext/standard/tests/network/long2ip_error.phpt index d56397cdd5..f217d71f88 100644 --- a/ext/standard/tests/network/long2ip_error.phpt +++ b/ext/standard/tests/network/long2ip_error.phpt @@ -5,7 +5,7 @@ Test long2ip() function : error conditions /* Prototype : string long2ip(int proper_address) * Description: Converts an (IPv4) Internet network address into a string in Internet standard dotted format * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing long2ip() : error conditions ***\n"; diff --git a/ext/standard/tests/network/long2ip_variation1.phpt b/ext/standard/tests/network/long2ip_variation1.phpt index 6fc4f57ee4..fbed4cf146 100644 --- a/ext/standard/tests/network/long2ip_variation1.phpt +++ b/ext/standard/tests/network/long2ip_variation1.phpt @@ -4,13 +4,13 @@ Test long2ip() function : usage variation <?php if(substr(PHP_OS, 0, 3) == "WIN") die("skip don't run on Windows"); -?> +?> --FILE-- <?php /* Prototype : string long2ip(int proper_address) * Description: Converts an (IPv4) Internet network address into a string in Internet standard dotted format * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing long2ip() : usage variation ***\n"; @@ -97,7 +97,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $res, ); diff --git a/ext/standard/tests/network/shutdown.phpt b/ext/standard/tests/network/shutdown.phpt index 1ce77fb80e..1e79b059b1 100644 --- a/ext/standard/tests/network/shutdown.phpt +++ b/ext/standard/tests/network/shutdown.phpt @@ -6,7 +6,7 @@ stream_socket_shutdown() test on IPv4 TCP Loopback ?> --FILE-- <?php - + for ($i=0; $i<100; $i++) { $port = rand(10000, 65000); /* Setup socket server */ @@ -15,7 +15,7 @@ stream_socket_shutdown() test on IPv4 TCP Loopback break; } } - + if (!$server) { die('Unable to create AF_INET socket [server]'); } diff --git a/ext/standard/tests/network/syslog_basic.phpt b/ext/standard/tests/network/syslog_basic.phpt index 30f21cfb7a..973fa95844 100644 --- a/ext/standard/tests/network/syslog_basic.phpt +++ b/ext/standard/tests/network/syslog_basic.phpt @@ -5,7 +5,7 @@ Test syslog() function : basic functionality /* Prototype : bool syslog(int priority, string message) * Description: Generate a system log message * Source code: ext/standard/syslog.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing syslog() : basic functionality ***\n"; diff --git a/ext/standard/tests/network/syslog_error.phpt b/ext/standard/tests/network/syslog_error.phpt index a99fd5314a..d42be51556 100644 --- a/ext/standard/tests/network/syslog_error.phpt +++ b/ext/standard/tests/network/syslog_error.phpt @@ -5,7 +5,7 @@ Test syslog() function : error conditions /* Prototype : bool syslog(int priority, string message) * Description: Generate a system log message * Source code: ext/standard/syslog.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing syslog() : error conditions ***\n"; diff --git a/ext/standard/tests/network/tcp6loop.phpt b/ext/standard/tests/network/tcp6loop.phpt index 30b1d7bcd2..c8223633ca 100644 --- a/ext/standard/tests/network/tcp6loop.phpt +++ b/ext/standard/tests/network/tcp6loop.phpt @@ -3,7 +3,7 @@ Streams Based IPv6 TCP Loopback test --SKIPIF-- <?php /* If IPv6 is supported on the platform this will error out with code 111 - Connection refused. - If IPv6 is NOT supported, $errno will be set to something else (indicating parse/getaddrinfo error) + 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 ($errno != 111) die('skip IPv6 not supported.'); diff --git a/ext/standard/tests/network/udgloop.phpt b/ext/standard/tests/network/udgloop.phpt index a61d082c18..61f8f25135 100644 --- a/ext/standard/tests/network/udgloop.phpt +++ b/ext/standard/tests/network/udgloop.phpt @@ -3,7 +3,7 @@ Streams Based Unix Domain Datagram Loopback test --SKIPIF-- <?php # vim:ft=php: if (array_search("udg",stream_get_transports()) === false) - die('SKIP No support for UNIX domain sockets.'); + die('SKIP No support for UNIX domain sockets.'); ?> --FILE-- <?php diff --git a/ext/standard/tests/network/unixloop.phpt b/ext/standard/tests/network/unixloop.phpt index abb103b0d1..83bfbb0667 100644 --- a/ext/standard/tests/network/unixloop.phpt +++ b/ext/standard/tests/network/unixloop.phpt @@ -3,7 +3,7 @@ Streams Based Unix Domain Loopback test --SKIPIF-- <?php # vim:ft=php: if (array_search("unix",stream_get_transports()) === false) - die('SKIP No support for UNIX domain sockets.'); + die('SKIP No support for UNIX domain sockets.'); ?> --FILE-- <?php diff --git a/ext/standard/tests/serialize/001.phpt b/ext/standard/tests/serialize/001.phpt index e83b9af002..5551956e92 100644 --- a/ext/standard/tests/serialize/001.phpt +++ b/ext/standard/tests/serialize/001.phpt @@ -3,7 +3,7 @@ serialize()/unserialize()/var_dump() --INI-- serialize_precision=100 --FILE-- -<?php +<?php class t { function __construct() diff --git a/ext/standard/tests/serialize/002.phpt b/ext/standard/tests/serialize/002.phpt index 3085d1cf4f..635e728968 100644 --- a/ext/standard/tests/serialize/002.phpt +++ b/ext/standard/tests/serialize/002.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #25378 (unserialize() crashes with invalid data) --FILE-- -<?php +<?php var_dump(unserialize('b:0;')); var_dump(unserialize('b:1;')); var_dump(unserialize('i:823;')); diff --git a/ext/standard/tests/serialize/003.phpt b/ext/standard/tests/serialize/003.phpt index edbcb1f0f0..5011412809 100644 --- a/ext/standard/tests/serialize/003.phpt +++ b/ext/standard/tests/serialize/003.phpt @@ -4,7 +4,7 @@ unserialize() floats with E notation (#18654) precision=12 serialize_precision=100 --FILE-- -<?php +<?php foreach(array(1e2, 5.2e25, 85.29e-23, 9e-9) AS $value) { echo ($ser = serialize($value))."\n"; var_dump(unserialize($ser)); diff --git a/ext/standard/tests/serialize/005.phpt b/ext/standard/tests/serialize/005.phpt index 9123e4020e..b152b91aad 100644 --- a/ext/standard/tests/serialize/005.phpt +++ b/ext/standard/tests/serialize/005.phpt @@ -46,17 +46,17 @@ class TestOld { echo __METHOD__ . "()\n"; } - + function unserialize($serialized) { echo __METHOD__ . "()\n"; } - + function __wakeup() { echo __METHOD__ . "()\n"; } - + function __sleep() { echo __METHOD__ . "()\n"; @@ -79,17 +79,17 @@ class TestNew implements Serializable return "2"; } } - + function unserialize($serialized) { echo __METHOD__ . "()\n"; } - + function __wakeup() { echo __METHOD__ . "()\n"; } - + function __sleep() { echo __METHOD__ . "()\n"; diff --git a/ext/standard/tests/serialize/bug14293.phpt b/ext/standard/tests/serialize/bug14293.phpt index 8e7b8a9d7d..73636ba56d 100644 --- a/ext/standard/tests/serialize/bug14293.phpt +++ b/ext/standard/tests/serialize/bug14293.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #14293 (serialize() and __sleep()) --FILE-- -<?php +<?php class t { function __construct() @@ -13,7 +13,7 @@ class t { echo "__sleep called\n"; return array('a','b'); - } + } } $t = new t(); diff --git a/ext/standard/tests/serialize/bug21957.phpt b/ext/standard/tests/serialize/bug21957.phpt index 2084503d24..070eda3f4c 100644 --- a/ext/standard/tests/serialize/bug21957.phpt +++ b/ext/standard/tests/serialize/bug21957.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #21957 (serialize() mangles objects with __sleep) --FILE-- -<?php +<?php class test { public $a, $b; diff --git a/ext/standard/tests/serialize/bug23298.phpt b/ext/standard/tests/serialize/bug23298.phpt index a5305cf37c..fe56fccc45 100644 --- a/ext/standard/tests/serialize/bug23298.phpt +++ b/ext/standard/tests/serialize/bug23298.phpt @@ -3,7 +3,7 @@ Bug #23298 (serialize() and floats/doubles) --INI-- serialize_precision=100 --FILE-- -<?php +<?php ini_set('precision', 12); $foo = 1.428571428571428647642857142; $bar = unserialize(serialize($foo)); diff --git a/ext/standard/tests/serialize/bug24063.phpt b/ext/standard/tests/serialize/bug24063.phpt index 3cca101cbb..38c9d6ed24 100644 --- a/ext/standard/tests/serialize/bug24063.phpt +++ b/ext/standard/tests/serialize/bug24063.phpt @@ -4,7 +4,7 @@ Bug #24063 (serialize() missing 0 after the . on scientific notation) serialize_precision=100 precision=12 --FILE-- -<?php +<?php $v = 1; for ($i = 1; $i < 10; $i++) { $v /= 10; diff --git a/ext/standard/tests/serialize/bug25378.phpt b/ext/standard/tests/serialize/bug25378.phpt index e95a427006..70bfbb46a3 100644 --- a/ext/standard/tests/serialize/bug25378.phpt +++ b/ext/standard/tests/serialize/bug25378.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #25378 (unserialize() crashes with invalid data) --FILE-- -<?php +<?php var_dump(unserialize("s:-1:\"\";")); var_dump(unserialize("i:823")); var_dump(unserialize("O:8:\"stdClass :0:{}")); diff --git a/ext/standard/tests/serialize/bug26762.phpt b/ext/standard/tests/serialize/bug26762.phpt index 74aeb46e80..ad6c0e0b41 100644 --- a/ext/standard/tests/serialize/bug26762.phpt +++ b/ext/standard/tests/serialize/bug26762.phpt @@ -1,11 +1,11 @@ --TEST-- Bug #26762 (unserialize() produces lowercase classnames) --SKIPIF-- -<?php +<?php if (class_exists('autoload_root')) die('skip Autoload test classes exist already'); ?> --FILE-- -<?php +<?php ini_set('unserialize_callback_func','check'); diff --git a/ext/standard/tests/serialize/bug30234.phpt b/ext/standard/tests/serialize/bug30234.phpt index aee42b28a1..1a46fc7851 100644 --- a/ext/standard/tests/serialize/bug30234.phpt +++ b/ext/standard/tests/serialize/bug30234.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #30234 (__autoload() not invoked for interfaces) --SKIPIF-- -<?php +<?php if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); ?> --FILE-- diff --git a/ext/standard/tests/serialize/bug31402.phpt b/ext/standard/tests/serialize/bug31402.phpt index 404d57eb3e..566e959554 100644 --- a/ext/standard/tests/serialize/bug31402.phpt +++ b/ext/standard/tests/serialize/bug31402.phpt @@ -3,7 +3,7 @@ Bug #31402 (unserialize() generates references when it should not) --INI-- error_reporting=E_ALL --FILE-- -<?php +<?php class TestX { var $i; diff --git a/ext/standard/tests/serialize/bug49649.phpt b/ext/standard/tests/serialize/bug49649.phpt index 2e0a505930..d6acb80764 100644 --- a/ext/standard/tests/serialize/bug49649.phpt +++ b/ext/standard/tests/serialize/bug49649.phpt @@ -7,11 +7,11 @@ Bug #49649 (unserialize() doesn't handle changes in property visibility) - to pu *class Foo *{ * private $private = 1; - * + * * protected $protected = 2; - * + * * public $public = 3; - * + * * public $notThere = 'old'; * } * diff --git a/ext/standard/tests/serialize/bug49649_1.phpt b/ext/standard/tests/serialize/bug49649_1.phpt index 1ca840a9b6..fb6d6dba52 100644 --- a/ext/standard/tests/serialize/bug49649_1.phpt +++ b/ext/standard/tests/serialize/bug49649_1.phpt @@ -7,11 +7,11 @@ Bug #49649 (unserialize() doesn't handle changes in property visibility) - to pr *class Foo *{ * private $private = 1; - * + * * protected $protected = 2; - * + * * public $public = 3; - * + * * public $notThere = 'old'; * } * diff --git a/ext/standard/tests/serialize/bug49649_2.phpt b/ext/standard/tests/serialize/bug49649_2.phpt index e9fe4290de..fe5b43a6ad 100644 --- a/ext/standard/tests/serialize/bug49649_2.phpt +++ b/ext/standard/tests/serialize/bug49649_2.phpt @@ -7,11 +7,11 @@ Bug #49649 (unserialize() doesn't handle changes in property visibility) - to pr *class Foo *{ * private $private = 1; - * + * * protected $protected = 2; - * + * * public $public = 3; - * + * * public $notThere = 'old'; * } * diff --git a/ext/standard/tests/serialize/bug62373.phpt b/ext/standard/tests/serialize/bug62373.phpt index 666c33ebdb..996e4c024c 100644 --- a/ext/standard/tests/serialize/bug62373.phpt +++ b/ext/standard/tests/serialize/bug62373.phpt @@ -14,7 +14,7 @@ for ($i = 0; $i < $period * 3; $i++) { $s = unserialize(serialize(array($b, $a))); if ($s[0] === $s[1]) { echo "OOPS\n"; - break; + break; } $dummy[] = $a; } diff --git a/ext/standard/tests/serialize/bug64354_1.phpt b/ext/standard/tests/serialize/bug64354_1.phpt index ae6f0383d2..499b66466f 100644 --- a/ext/standard/tests/serialize/bug64354_1.phpt +++ b/ext/standard/tests/serialize/bug64354_1.phpt @@ -10,13 +10,13 @@ spl_autoload_register( try { var_dump(unserialize('O:1:"A":0:{}')); -} catch (Exception $e) { +} catch (Exception $e) { var_dump($e->getMessage()); } try { var_dump(unserialize('a:2:{i:0;O:1:"A":0:{}i:1;O:1:"A":0:{}}')); -} catch (Exception $e) { +} catch (Exception $e) { var_dump($e->getMessage()); } ?> diff --git a/ext/standard/tests/serialize/bug64354_2.phpt b/ext/standard/tests/serialize/bug64354_2.phpt index a9a252d09a..6753051321 100644 --- a/ext/standard/tests/serialize/bug64354_2.phpt +++ b/ext/standard/tests/serialize/bug64354_2.phpt @@ -16,7 +16,7 @@ spl_autoload_register( try { var_dump(unserialize('a:2:{i:0;O:1:"A":0:{}i:1;O:1:"B":0:{}}')); -} catch (Exception $e) { +} catch (Exception $e) { var_dump($e->getMessage()); } ?> diff --git a/ext/standard/tests/serialize/bug64354_3.phpt b/ext/standard/tests/serialize/bug64354_3.phpt index c7eea59be5..24ee346e4c 100644 --- a/ext/standard/tests/serialize/bug64354_3.phpt +++ b/ext/standard/tests/serialize/bug64354_3.phpt @@ -21,7 +21,7 @@ $data = array(new A, new B); try { serialize($data); -} catch (Exception $e) { +} catch (Exception $e) { var_dump($e->getMessage()); } ?> diff --git a/ext/standard/tests/serialize/bug68545.phpt b/ext/standard/tests/serialize/bug68545.phpt index e7250b37bc..c33155d269 100644 --- a/ext/standard/tests/serialize/bug68545.phpt +++ b/ext/standard/tests/serialize/bug68545.phpt @@ -1,8 +1,8 @@ --TEST-- Bug #68545 NULL pointer dereference in unserialize.c:var_push_dtor --FILE-- -<?php -var_dump(unserialize('a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";s:3:"bar";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"b22";s:3:"bar";s:3:"bar";s:3:"foo";s:3:"bar";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";s:3:"bar";s:3:"bar";')); +<?php +var_dump(unserialize('a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";s:3:"bar";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"b22";s:3:"bar";s:3:"bar";s:3:"foo";s:3:"bar";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";s:3:"bar";s:3:"bar";')); ?> ===DONE=== --EXPECTF-- diff --git a/ext/standard/tests/serialize/bug69425.phpt b/ext/standard/tests/serialize/bug69425.phpt index e39f855f23..c7f4265789 100644 --- a/ext/standard/tests/serialize/bug69425.phpt +++ b/ext/standard/tests/serialize/bug69425.phpt @@ -7,7 +7,7 @@ Bug #69425: Use After Free in unserialize() class test { var $ryat; - + function __wakeup() { $this->ryat = 1; diff --git a/ext/standard/tests/serialize/bug70219.phpt b/ext/standard/tests/serialize/bug70219.phpt index a002bdfbb0..ddd2f317df 100644 --- a/ext/standard/tests/serialize/bug70219.phpt +++ b/ext/standard/tests/serialize/bug70219.phpt @@ -28,7 +28,7 @@ for ($i = 0; $i < 5; $i++) { $v[$i] = 'hi'.$i; } -var_dump($data); +var_dump($data); ?> --EXPECTF-- Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s on line %d diff --git a/ext/standard/tests/serialize/bug70436.phpt b/ext/standard/tests/serialize/bug70436.phpt index 8b0df73d60..1bbf3b98ab 100644 --- a/ext/standard/tests/serialize/bug70436.phpt +++ b/ext/standard/tests/serialize/bug70436.phpt @@ -6,12 +6,12 @@ Bug #70436: Use After Free Vulnerability in unserialize() class obj implements Serializable { var $data; - + function serialize() { return serialize($this->data); } - + function unserialize($data) { $this->data = unserialize($data); @@ -35,12 +35,12 @@ var_dump($data); function ptr2str($ptr) { $out = ''; - + for ($i = 0; $i < 8; $i++) { $out .= chr($ptr & 0xff); $ptr >>= 8; } - + return $out; } ?> diff --git a/ext/standard/tests/serialize/bug70513.phpt b/ext/standard/tests/serialize/bug70513.phpt index 2ac4ef6626..cbdbdb8222 100644 --- a/ext/standard/tests/serialize/bug70513.phpt +++ b/ext/standard/tests/serialize/bug70513.phpt @@ -8,7 +8,7 @@ Bug #70513: GMP Deserialization Type Confusion Vulnerability class obj { var $ryat; - + function __wakeup() { $this->ryat = 1; diff --git a/ext/standard/tests/serialize/incomplete_class.phpt b/ext/standard/tests/serialize/incomplete_class.phpt index 7e6aa7b39f..948a31e166 100644 --- a/ext/standard/tests/serialize/incomplete_class.phpt +++ b/ext/standard/tests/serialize/incomplete_class.phpt @@ -13,7 +13,7 @@ var_dump($o->test2); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- object(__PHP_Incomplete_Class)#%d (0) { } diff --git a/ext/standard/tests/serialize/serialization_arrays_001.phpt b/ext/standard/tests/serialize/serialization_arrays_001.phpt index 4b142344f9..3de28f3326 100644 --- a/ext/standard/tests/serialize/serialization_arrays_001.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_001.phpt @@ -3,16 +3,16 @@ Test serialize() & unserialize() functions: arrays (circular references) --INI-- serialize_precision=100 --FILE-- -<?php +<?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ echo "\n--- Testing Circular reference of an array ---\n"; diff --git a/ext/standard/tests/serialize/serialization_arrays_002.phpt b/ext/standard/tests/serialize/serialization_arrays_002.phpt index b7348b969b..f03041f6a9 100644 --- a/ext/standard/tests/serialize/serialization_arrays_002.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_002.phpt @@ -3,21 +3,21 @@ serialization: arrays with references amonst elements --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ function check(&$a) { var_dump($a); $ser = serialize($a); var_dump($ser); - + $b = unserialize($ser); var_dump($b); $b[0] = "b0.changed"; @@ -25,7 +25,7 @@ function check(&$a) { $b[1] = "b1.changed"; var_dump($b); $b[2] = "b2.changed"; - var_dump($b); + var_dump($b); } echo "\n\n--- No references:\n"; diff --git a/ext/standard/tests/serialize/serialization_arrays_003.phpt b/ext/standard/tests/serialize/serialization_arrays_003.phpt index 08f5ead4e5..55e34f3762 100644 --- a/ext/standard/tests/serialize/serialization_arrays_003.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_003.phpt @@ -3,21 +3,21 @@ serialization: arrays with references to an external variable --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ function check(&$a) { var_dump($a); $ser = serialize($a); var_dump($ser); - + $b = unserialize($ser); var_dump($b); $b[0] = "b0.changed"; @@ -25,7 +25,7 @@ function check(&$a) { $b[1] = "b1.changed"; var_dump($b); $b[2] = "b2.changed"; - var_dump($b); + var_dump($b); } echo "\n\n--- 0 refs external:\n"; diff --git a/ext/standard/tests/serialize/serialization_arrays_004.phpt b/ext/standard/tests/serialize/serialization_arrays_004.phpt index 7ebacce98d..02726d20ea 100644 --- a/ext/standard/tests/serialize/serialization_arrays_004.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_004.phpt @@ -3,21 +3,21 @@ serialization: arrays with references to the containing array --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ function check(&$a) { var_dump($a); $ser = serialize($a); var_dump($ser); - + $b = unserialize($ser); var_dump($b); $b[0] = "b0.changed"; @@ -25,7 +25,7 @@ function check(&$a) { $b[1] = "b1.changed"; var_dump($b); $b[2] = "b2.changed"; - var_dump($b); + var_dump($b); } echo "\n\n--- 1 refs container:\n"; diff --git a/ext/standard/tests/serialize/serialization_arrays_005.phpt b/ext/standard/tests/serialize/serialization_arrays_005.phpt index a22c04b8be..f941a5caec 100644 --- a/ext/standard/tests/serialize/serialization_arrays_005.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_005.phpt @@ -3,23 +3,23 @@ serialization: arrays with references, nested --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ function check(&$a) { var_dump($a); $ser = serialize($a); var_dump($ser); - + $b = unserialize($ser); - + // Change each element and dump result. foreach($b as $k=>$v) { if (is_array($v)){ diff --git a/ext/standard/tests/serialize/serialization_error_001.phpt b/ext/standard/tests/serialize/serialization_error_001.phpt index 014128b19f..4d615fddc6 100644 --- a/ext/standard/tests/serialize/serialization_error_001.phpt +++ b/ext/standard/tests/serialize/serialization_error_001.phpt @@ -3,14 +3,14 @@ Test serialize() & unserialize() functions: error conditions - wrong number of a --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing serialize()/unserialize() : error conditions ***\n"; diff --git a/ext/standard/tests/serialize/serialization_objects_003.phpt b/ext/standard/tests/serialize/serialization_objects_003.phpt index 5e6773a2ae..30bb34fafb 100644 --- a/ext/standard/tests/serialize/serialization_objects_003.phpt +++ b/ext/standard/tests/serialize/serialization_objects_003.phpt @@ -3,16 +3,16 @@ Test serialize() & unserialize() functions: objects (abstract classes) --INI-- serialize_precision=100 --FILE-- -<?php +<?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ echo "\n--- Testing Abstract Class ---\n"; @@ -27,7 +27,7 @@ abstract class Name abstract protected function getClassName(); public function printClassName () { return $this->getClassName(); - } + } } // implement abstract class class extendName extends Name diff --git a/ext/standard/tests/serialize/serialization_objects_004.phpt b/ext/standard/tests/serialize/serialization_objects_004.phpt index ec3713e844..bc58ce29e9 100644 --- a/ext/standard/tests/serialize/serialization_objects_004.phpt +++ b/ext/standard/tests/serialize/serialization_objects_004.phpt @@ -3,14 +3,14 @@ Test serialize() & unserialize() functions: objects - ensure that COW references --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ $x = new stdClass; diff --git a/ext/standard/tests/serialize/serialization_objects_005.phpt b/ext/standard/tests/serialize/serialization_objects_005.phpt index fd58b0323a..9619a2949e 100644 --- a/ext/standard/tests/serialize/serialization_objects_005.phpt +++ b/ext/standard/tests/serialize/serialization_objects_005.phpt @@ -3,14 +3,14 @@ Check behaviour of incomplete class --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ $serialized = 'O:1:"C":1:{s:1:"p";i:1;}'; diff --git a/ext/standard/tests/serialize/serialization_objects_006.phpt b/ext/standard/tests/serialize/serialization_objects_006.phpt index 918e59d0aa..345ce0a77e 100644 --- a/ext/standard/tests/serialize/serialization_objects_006.phpt +++ b/ext/standard/tests/serialize/serialization_objects_006.phpt @@ -3,14 +3,14 @@ Behaviour of incomplete class is preserved even when it was not created by unser --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ $a = new __PHP_Incomplete_Class; diff --git a/ext/standard/tests/serialize/serialization_objects_007.phpt b/ext/standard/tests/serialize/serialization_objects_007.phpt index 2837e1ec46..4de50afd6b 100644 --- a/ext/standard/tests/serialize/serialization_objects_007.phpt +++ b/ext/standard/tests/serialize/serialization_objects_007.phpt @@ -3,14 +3,14 @@ Ensure __autoload is called twice if unserialize_callback_func is defined. --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ spl_autoload_register(function ($name) { @@ -20,7 +20,7 @@ spl_autoload_register(function ($name) { ini_set('unserialize_callback_func','check'); function check($name) { - echo "in check($name)\n"; + echo "in check($name)\n"; } $o = unserialize('O:3:"FOO":0:{}'); diff --git a/ext/standard/tests/serialize/serialization_objects_008.phpt b/ext/standard/tests/serialize/serialization_objects_008.phpt index b963872f28..6d1c0e038d 100644 --- a/ext/standard/tests/serialize/serialization_objects_008.phpt +++ b/ext/standard/tests/serialize/serialization_objects_008.phpt @@ -1,16 +1,16 @@ --TEST-- Bad unserialize_callback_func --FILE-- -<?php +<?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ ini_set('unserialize_callback_func','Nonexistent'); diff --git a/ext/standard/tests/serialize/serialization_objects_009.phpt b/ext/standard/tests/serialize/serialization_objects_009.phpt index 595692d2f0..8ec0588784 100644 --- a/ext/standard/tests/serialize/serialization_objects_009.phpt +++ b/ext/standard/tests/serialize/serialization_objects_009.phpt @@ -3,14 +3,14 @@ Custom unserialization of classes with no custom unserializer. --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ $ser = 'C:1:"C":6:{dasdas}'; diff --git a/ext/standard/tests/serialize/serialization_objects_010.phpt b/ext/standard/tests/serialize/serialization_objects_010.phpt index 9c7926a0d4..e03440fb7a 100644 --- a/ext/standard/tests/serialize/serialization_objects_010.phpt +++ b/ext/standard/tests/serialize/serialization_objects_010.phpt @@ -3,21 +3,21 @@ Serialize() must return a string or NULL --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ Class C implements Serializable { - public function serialize() { + public function serialize() { return $this; } - + public function unserialize($blah) { } } diff --git a/ext/standard/tests/serialize/serialization_objects_011.phpt b/ext/standard/tests/serialize/serialization_objects_011.phpt index 1dc48390c2..bd1e75449f 100644 --- a/ext/standard/tests/serialize/serialization_objects_011.phpt +++ b/ext/standard/tests/serialize/serialization_objects_011.phpt @@ -3,50 +3,50 @@ Object serialization / unserialization with inherited and hidden properties. --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ Class A { private $APriv = "A.APriv"; protected $AProt = "A.AProt"; public $APub = "A.APub"; - + function audit() { - return isset($this->APriv, $this->AProt, $this->APub); - } + return isset($this->APriv, $this->AProt, $this->APub); + } } Class B extends A { private $BPriv = "B.BPriv"; protected $BProt = "B.BProt"; public $BPub = "B.BPub"; - + function audit() { return parent::audit() && isset($this->AProt, $this->APub, - $this->BPriv, $this->BProt, $this->BPub); - } + $this->BPriv, $this->BProt, $this->BPub); + } } Class C extends B { private $APriv = "C.APriv"; protected $AProt = "C.AProt"; public $APub = "C.APub"; - + private $CPriv = "C.CPriv"; protected $CProt = "C.BProt"; public $CPub = "C.CPub"; - + function audit() { return parent::audit() && isset($this->APriv, $this->AProt, $this->APub, $this->BProt, $this->BPub, - $this->CPriv, $this->CProt, $this->CPub); + $this->CPriv, $this->CProt, $this->CPub); } } @@ -58,11 +58,11 @@ function prettyPrint($obj) { $ser = serialize($obj); $serPrintable = str_replace("\0", '\0', $ser); var_dump($serPrintable); - + echo "Unserialized:\n"; $uobj = unserialize($ser); var_dump($uobj); - + echo "Sanity check: "; var_dump($uobj->audit()); } diff --git a/ext/standard/tests/serialize/serialization_objects_012.phpt b/ext/standard/tests/serialize/serialization_objects_012.phpt index f994d8e260..90d9e8f99d 100644 --- a/ext/standard/tests/serialize/serialization_objects_012.phpt +++ b/ext/standard/tests/serialize/serialization_objects_012.phpt @@ -3,14 +3,14 @@ Object serialization / unserialization: real references and COW references --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ echo "\n\nArray containing same object twice:\n"; @@ -20,7 +20,7 @@ $a[1] = $a[0]; var_dump($a); $ser = serialize($a); -var_dump($ser); +var_dump($ser); $ua = unserialize($ser); var_dump($ua); @@ -37,7 +37,7 @@ $a[1] = &$a[0]; var_dump($a); $ser = serialize($a); -var_dump($ser); +var_dump($ser); $ua = unserialize($ser); var_dump($ua); @@ -50,11 +50,11 @@ echo "\n\nObject containing same object twice:"; $obj = new stdclass; $contaner = new stdclass; $contaner->a = $obj; -$contaner->b = $contaner->a; +$contaner->b = $contaner->a; var_dump($contaner); $ser = serialize($contaner); -var_dump($ser); +var_dump($ser); $ucontainer = unserialize($ser); var_dump($ucontainer); @@ -68,11 +68,11 @@ echo "\n\nObject containing object and reference to that object:\n"; $obj = new stdclass; $contaner = new stdclass; $contaner->a = $obj; -$contaner->b = &$contaner->a; +$contaner->b = &$contaner->a; var_dump($contaner); $ser = serialize($contaner); -var_dump($ser); +var_dump($ser); $ucontainer = unserialize($ser); var_dump($ucontainer); diff --git a/ext/standard/tests/serialize/serialization_objects_013.phpt b/ext/standard/tests/serialize/serialization_objects_013.phpt index c48be9ea79..eaaf05e7c5 100644 --- a/ext/standard/tests/serialize/serialization_objects_013.phpt +++ b/ext/standard/tests/serialize/serialization_objects_013.phpt @@ -3,21 +3,21 @@ Object serialization / unserialization: references amongst properties --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ function check(&$obj) { var_dump($obj); $ser = serialize($obj); var_dump($ser); - + $uobj = unserialize($ser); var_dump($uobj); $uobj->a = "obj->a.changed"; @@ -25,7 +25,7 @@ function check(&$obj) { $uobj->b = "obj->b.changed"; var_dump($uobj); $uobj->c = "obj->c.changed"; - var_dump($uobj); + var_dump($uobj); } echo "\n\n--- a refs b:\n"; diff --git a/ext/standard/tests/serialize/serialization_objects_014.phpt b/ext/standard/tests/serialize/serialization_objects_014.phpt index 0b60413d25..d4cfc770db 100644 --- a/ext/standard/tests/serialize/serialization_objects_014.phpt +++ b/ext/standard/tests/serialize/serialization_objects_014.phpt @@ -3,21 +3,21 @@ Object serialization / unserialization: references to external values --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ function check(&$obj) { var_dump($obj); $ser = serialize($obj); var_dump($ser); - + $uobj = unserialize($ser); var_dump($uobj); $uobj->a = "obj->a.changed"; @@ -25,7 +25,7 @@ function check(&$obj) { $uobj->b = "obj->b.changed"; var_dump($uobj); $uobj->c = "obj->c.changed"; - var_dump($uobj); + var_dump($uobj); } echo "\n\n--- a refs external:\n"; diff --git a/ext/standard/tests/serialize/serialization_objects_015.phpt b/ext/standard/tests/serialize/serialization_objects_015.phpt index b47920e879..9e9e6ae07d 100644 --- a/ext/standard/tests/serialize/serialization_objects_015.phpt +++ b/ext/standard/tests/serialize/serialization_objects_015.phpt @@ -7,7 +7,7 @@ function check(&$obj) { var_dump($obj); $ser = serialize($obj); var_dump($ser); - + $uobj = unserialize($ser); var_dump($uobj); $uobj->a = "obj->a.changed"; @@ -15,7 +15,7 @@ function check(&$obj) { $uobj->b = "obj->b.changed"; var_dump($uobj); $uobj->c = "obj->c.changed"; - var_dump($uobj); + var_dump($uobj); } echo "\n\n--- a refs container:\n"; diff --git a/ext/standard/tests/serialize/serialization_precision_001.phpt b/ext/standard/tests/serialize/serialization_precision_001.phpt index 0be0c68a89..11b86cdf70 100644 --- a/ext/standard/tests/serialize/serialization_precision_001.phpt +++ b/ext/standard/tests/serialize/serialization_precision_001.phpt @@ -5,14 +5,14 @@ serialize_precision=10 --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ var_dump(serialize(0.1)); diff --git a/ext/standard/tests/serialize/serialization_precision_002.phpt b/ext/standard/tests/serialize/serialization_precision_002.phpt index 91091e72a2..d17865f329 100644 --- a/ext/standard/tests/serialize/serialization_precision_002.phpt +++ b/ext/standard/tests/serialize/serialization_precision_002.phpt @@ -5,14 +5,14 @@ serialize_precision=75 --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ var_dump(serialize(0.1)); diff --git a/ext/standard/tests/serialize/serialization_resources_001.phpt b/ext/standard/tests/serialize/serialization_resources_001.phpt index dbb7d3d3e9..089ad13fa7 100644 --- a/ext/standard/tests/serialize/serialization_resources_001.phpt +++ b/ext/standard/tests/serialize/serialization_resources_001.phpt @@ -1,16 +1,16 @@ --TEST-- Test serialize() & unserialize() functions: resources --FILE-- -<?php +<?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ echo "\n--- Testing Resource ---\n"; diff --git a/ext/standard/tests/setrawcookie_basic_001.phpt b/ext/standard/tests/setrawcookie_basic_001.phpt index 0cf36b635a..7b9c108bab 100644 --- a/ext/standard/tests/setrawcookie_basic_001.phpt +++ b/ext/standard/tests/setrawcookie_basic_001.phpt @@ -4,7 +4,7 @@ Test setrawcookie basic functionality PHP TestFEst 2017 - PHPDublin, PHPSP - Joao P V Martins <jp.joao@gmail.com> --FILE-- <?php -var_dump(setrawcookie('cookie_name', rawurlencode('cookie_content'))); +var_dump(setrawcookie('cookie_name', rawurlencode('cookie_content'))); ?> --EXPECT-- bool(true) diff --git a/ext/standard/tests/streams/bug40459.phpt b/ext/standard/tests/streams/bug40459.phpt index 902a1f9111..ce06a3f804 100644 --- a/ext/standard/tests/streams/bug40459.phpt +++ b/ext/standard/tests/streams/bug40459.phpt @@ -48,7 +48,7 @@ class testwrapper { echo $this->constructorCalled ? 'yes' : 'no'; return TRUE; } - function stream_metadata() + function stream_metadata() { echo $this->constructorCalled ? 'yes' : 'no'; return TRUE; diff --git a/ext/standard/tests/streams/bug46024.phpt b/ext/standard/tests/streams/bug46024.phpt index 8aae912809..548768283c 100644 --- a/ext/standard/tests/streams/bug46024.phpt +++ b/ext/standard/tests/streams/bug46024.phpt @@ -4,7 +4,7 @@ Bug #46024 stream_select() doesn't return the correct number <?php if (!getenv('TEST_PHP_EXECUTABLE')) die("skip TEST_PHP_EXECUTABLE not defined"); ?> --FILE-- <?php -$php = realpath(getenv('TEST_PHP_EXECUTABLE')); +$php = realpath(getenv('TEST_PHP_EXECUTABLE')); $pipes = array(); $proc = proc_open( "$php -n -i" diff --git a/ext/standard/tests/streams/bug60455_02.phpt b/ext/standard/tests/streams/bug60455_02.phpt index 0ddf346eba..c68a1a07ab 100644 --- a/ext/standard/tests/streams/bug60455_02.phpt +++ b/ext/standard/tests/streams/bug60455_02.phpt @@ -10,13 +10,13 @@ class TestStream { function stream_read($count) { if ($this->s++ == 0) return "a\n"; - + return ""; } function stream_eof() { return $this->s >= 2; } - + } stream_wrapper_register("test", "TestStream"); diff --git a/ext/standard/tests/streams/bug60455_03.phpt b/ext/standard/tests/streams/bug60455_03.phpt index 2429d31008..131da852b7 100644 --- a/ext/standard/tests/streams/bug60455_03.phpt +++ b/ext/standard/tests/streams/bug60455_03.phpt @@ -22,7 +22,7 @@ class TestStream { function stream_eof() { return $this->s >= $this->eofth; } - + } stream_wrapper_register("test", "TestStream"); diff --git a/ext/standard/tests/streams/bug60455_04.phpt b/ext/standard/tests/streams/bug60455_04.phpt index 3a82298dbc..123a8653d3 100644 --- a/ext/standard/tests/streams/bug60455_04.phpt +++ b/ext/standard/tests/streams/bug60455_04.phpt @@ -11,13 +11,13 @@ class TestStream { function stream_read($count) { if ($this->s++ == 0) return "a\n"; - + return ""; } function stream_eof() { return $this->s >= 2; } - + } stream_wrapper_register("test", "TestStream"); diff --git a/ext/standard/tests/streams/bug60602.phpt b/ext/standard/tests/streams/bug60602.phpt index f0a3cf83e8..82917ecbd6 100644 --- a/ext/standard/tests/streams/bug60602.phpt +++ b/ext/standard/tests/streams/bug60602.phpt @@ -17,7 +17,7 @@ $p = proc_open($cmd, $descs, $pipes, '.', $environment); if (is_resource($p)) { $data = ''; - while (1) { + while (1) { $w = $e = NULL; $n = stream_select($pipes, $w, $e, 300); diff --git a/ext/standard/tests/streams/bug61019.phpt b/ext/standard/tests/streams/bug61019.phpt index 45b207ea9e..84e818f9aa 100644 --- a/ext/standard/tests/streams/bug61019.phpt +++ b/ext/standard/tests/streams/bug61019.phpt @@ -23,17 +23,17 @@ if(is_resource($process)) $stdin_stream=""; $stderr_stream=""; - echo "External command executed\n"; + echo "External command executed\n"; do { $process_state=proc_get_status($process); - $tmp_stdin=stream_get_contents($pipes[1]); - if($tmp_stdin) + $tmp_stdin=stream_get_contents($pipes[1]); + if($tmp_stdin) { $stdin_stream=$stdin_stream.$tmp_stdin; } $tmp_stderr=stream_get_contents($pipes[2]); - if($tmp_stderr) + if($tmp_stderr) { $stderr_stream=$stderr_stream.$tmp_stderr; } @@ -42,13 +42,13 @@ if(is_resource($process)) echo "External command exit: ".$process_state['exitcode']."\n"; //read outstanding data - $tmp_stdin=stream_get_contents($pipes[1]); - if($tmp_stdin) + $tmp_stdin=stream_get_contents($pipes[1]); + if($tmp_stdin) { $stdin_stream=$stdin_stream.$tmp_stdin; } $tmp_stderr=stream_get_contents($pipes[2]); - if($tmp_stderr) + if($tmp_stderr) { $stderr_stream=$stderr_stream.$tmp_stderr; } @@ -57,7 +57,7 @@ if(is_resource($process)) fclose ($pipes[1]); fclose ($pipes[2]); - proc_close($process); + proc_close($process); echo "STDOUT: ".$stdin_stream."\n"; echo "STDERR: ".$stderr_stream."\n"; diff --git a/ext/standard/tests/streams/bug61115-1.phpt b/ext/standard/tests/streams/bug61115-1.phpt index 99e2f7929c..892b0f80e5 100644 --- a/ext/standard/tests/streams/bug61115-1.phpt +++ b/ext/standard/tests/streams/bug61115-1.phpt @@ -5,7 +5,7 @@ Bug #61115: Stream related segfault on fatal error in php_stream_context_del_lin if (getenv("USE_ZEND_ALLOC") === "0") { die("skip Zend MM disabled"); } -?> +?> --FILE-- <?php diff --git a/ext/standard/tests/streams/bug64166_2.phpt b/ext/standard/tests/streams/bug64166_2.phpt index 9d6655d5c1..b4224662ee 100644 --- a/ext/standard/tests/streams/bug64166_2.phpt +++ b/ext/standard/tests/streams/bug64166_2.phpt @@ -13,7 +13,7 @@ function test_64166($data) { 'line-length' => 74 )); $str = ""; - while(($c = fread($fd, 1))!= "") $str .= $c; + while(($c = fread($fd, 1))!= "") $str .= $c; var_dump($str); stream_filter_remove($res); diff --git a/ext/standard/tests/streams/bug64433.phpt b/ext/standard/tests/streams/bug64433.phpt index f973768f81..bd04a5e6b2 100644 --- a/ext/standard/tests/streams/bug64433.phpt +++ b/ext/standard/tests/streams/bug64433.phpt @@ -2,7 +2,7 @@ Bug #60180 ($_SERVER["PHP_SELF"] incorrect) --SKIPIF-- <?php -if(!file_exists(dirname(__FILE__)."/../../../../sapi/cli/tests/php_cli_server.inc")) +if(!file_exists(dirname(__FILE__)."/../../../../sapi/cli/tests/php_cli_server.inc")) die("skip could not found cli server script"); $res = @include dirname(__FILE__)."/../../../../sapi/cli/tests/php_cli_server.inc"; if(!$res) { diff --git a/ext/standard/tests/streams/bug64770.phpt b/ext/standard/tests/streams/bug64770.phpt index 24817e620f..bb904d7446 100644 --- a/ext/standard/tests/streams/bug64770.phpt +++ b/ext/standard/tests/streams/bug64770.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #64770 stream_select() fails with pipes from proc_open() +Bug #64770 stream_select() fails with pipes from proc_open() --FILE-- <?php @@ -17,7 +17,7 @@ $p = proc_open($cmd, $descs, $pipes, '.', NULL, $other_opts); if (is_resource($p)) { $data = ''; - while (1) { + while (1) { $w = $e = NULL; $n = stream_select($pipes, $w, $e, 300); diff --git a/ext/standard/tests/streams/bug67626.phpt b/ext/standard/tests/streams/bug67626.phpt index fefe6c1f0a..7a47456bdf 100644 --- a/ext/standard/tests/streams/bug67626.phpt +++ b/ext/standard/tests/streams/bug67626.phpt @@ -5,18 +5,18 @@ Bug #67626: Exceptions not properly handled in user stream handlers class MyStream { public function stream_open() { return true; } - + public function stream_read() { throw new Exception('stream_read_exception'); return 'read'; } - + public function stream_eof() { return true; } - + public function stream_write() { throw new Exception('stream_write_exception'); diff --git a/ext/standard/tests/streams/bug72857.phpt b/ext/standard/tests/streams/bug72857.phpt index 97d145b595..e91e6fa4ea 100644 --- a/ext/standard/tests/streams/bug72857.phpt +++ b/ext/standard/tests/streams/bug72857.phpt @@ -8,7 +8,7 @@ Bug #72857 stream_socket_recvfrom read access violation $v3=STREAM_PEEK; $v4="A"; - var_dump(stream_socket_recvfrom($fp0,$v2,$v3,$v4), $v4); + var_dump(stream_socket_recvfrom($fp0,$v2,$v3,$v4), $v4); fclose($fp0); unlink($fname); diff --git a/ext/standard/tests/streams/proc_open_bug69900.phpt b/ext/standard/tests/streams/proc_open_bug69900.phpt index a3fdfa6c55..8049fb68ff 100644 --- a/ext/standard/tests/streams/proc_open_bug69900.phpt +++ b/ext/standard/tests/streams/proc_open_bug69900.phpt @@ -33,7 +33,7 @@ for($i = 0; $i < 10; $i++){ $s = fgets($pipes[1]); $t1 = microtime(1); - echo $s; + echo $s; echo "fgets() took ", (($t1 - $t0)*1000 > $max_ms ? 'more' : 'less'), " than $max_ms ms\n"; } diff --git a/ext/standard/tests/streams/set_file_buffer.phpt b/ext/standard/tests/streams/set_file_buffer.phpt index 04d0fb121d..79df5a441a 100644 --- a/ext/standard/tests/streams/set_file_buffer.phpt +++ b/ext/standard/tests/streams/set_file_buffer.phpt @@ -10,16 +10,16 @@ class test_wrapper { function stream_open($path, $mode, $openedpath) { return true; } - + function stream_eof() { return false; } - + function stream_write($data) { echo "size: ", strlen($data), "\n"; return strlen($data); } - + function stream_set_option($option, $arg1, $arg2) { echo "option: ", $option, ", ", $arg1, ", ", $arg2, "\n"; return false; diff --git a/ext/standard/tests/streams/stream_context_tcp_nodelay_server.phpt b/ext/standard/tests/streams/stream_context_tcp_nodelay_server.phpt index 6606a15052..ed7f7fb0ac 100644 --- a/ext/standard/tests/streams/stream_context_tcp_nodelay_server.phpt +++ b/ext/standard/tests/streams/stream_context_tcp_nodelay_server.phpt @@ -38,7 +38,7 @@ $clientCode = <<<'CODE' CODE; include sprintf( - "%s/../../../openssl/tests/ServerClientTestCase.inc", + "%s/../../../openssl/tests/ServerClientTestCase.inc", dirname(__FILE__)); ServerClientTestCase::getInstance()->run($serverCode, $clientCode); ?> diff --git a/ext/standard/tests/streams/stream_get_line_NUL_delimiter.phpt b/ext/standard/tests/streams/stream_get_line_NUL_delimiter.phpt index 32756d7618..8cdd5c1779 100644 --- a/ext/standard/tests/streams/stream_get_line_NUL_delimiter.phpt +++ b/ext/standard/tests/streams/stream_get_line_NUL_delimiter.phpt @@ -10,13 +10,13 @@ class TestStream { function stream_read($count) { if ($this->s++ == 0) return "a\0"; - + return ""; } function stream_eof() { return $this->s >= 2; } - + } stream_wrapper_register("test", "TestStream"); diff --git a/ext/standard/tests/streams/stream_get_meta_data_process_basic.phpt b/ext/standard/tests/streams/stream_get_meta_data_process_basic.phpt index b7ab37c7c5..02a6ae8cc8 100644 --- a/ext/standard/tests/streams/stream_get_meta_data_process_basic.phpt +++ b/ext/standard/tests/streams/stream_get_meta_data_process_basic.phpt @@ -2,8 +2,8 @@ Testing stream_get_meta_data() on a process stream. --FILE-- <?php - -$output_file = __FILE__.'.tmp'; + +$output_file = __FILE__.'.tmp'; $cmd = "echo here is some output"; $mode = 'rb'; $handle = popen($cmd, $mode); diff --git a/ext/standard/tests/streams/stream_socket_enable_crypto.phpt b/ext/standard/tests/streams/stream_socket_enable_crypto.phpt index 3e1aedcd82..4b0d9a1923 100644 --- a/ext/standard/tests/streams/stream_socket_enable_crypto.phpt +++ b/ext/standard/tests/streams/stream_socket_enable_crypto.phpt @@ -19,7 +19,7 @@ if (is_resource($sock)) { var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv23_CLIENT)); var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv3_CLIENT)); var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv2_CLIENT)); - var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)); + var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)); var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv23_SERVER)); var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv2_SERVER)); var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv3_SERVER)); diff --git a/ext/standard/tests/strings/004.phpt b/ext/standard/tests/strings/004.phpt index e1414db46c..9a0ea18861 100644 --- a/ext/standard/tests/strings/004.phpt +++ b/ext/standard/tests/strings/004.phpt @@ -15,7 +15,7 @@ for ($i = 0; $i < $times; $i++) { $p = range(1,4); shuffle($p); $s = join('', $p); - if (empty($a[$s])) $a[$s] = 0; + if (empty($a[$s])) $a[$s] = 0; $a[$s]++; } diff --git a/ext/standard/tests/strings/005.phpt b/ext/standard/tests/strings/005.phpt index ebfbe221d8..8595bbfaac 100644 --- a/ext/standard/tests/strings/005.phpt +++ b/ext/standard/tests/strings/005.phpt @@ -16,7 +16,7 @@ var_dump(error_reporting()); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- hello int(8192) bool(false) diff --git a/ext/standard/tests/strings/006.phpt b/ext/standard/tests/strings/006.phpt index afb5d24dbf..7665aa20f5 100644 --- a/ext/standard/tests/strings/006.phpt +++ b/ext/standard/tests/strings/006.phpt @@ -12,7 +12,7 @@ var_dump(ob_get_contents()); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- Warning: highlight_file(AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA): failed to open stream: %s006.php on line %d Warning: highlight_file(): Failed opening 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' for highlighting in %s006.php on line %d diff --git a/ext/standard/tests/strings/007-win32.phpt b/ext/standard/tests/strings/007-win32.phpt index b16c566eaa..7d06f018a5 100644 --- a/ext/standard/tests/strings/007-win32.phpt +++ b/ext/standard/tests/strings/007-win32.phpt @@ -13,7 +13,7 @@ var_dump(ob_get_contents()); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- Warning: php_strip_whitespace(%s): failed to open stream: No such file or directory in %s on line %d string(0) "" bool(false) diff --git a/ext/standard/tests/strings/007.phpt b/ext/standard/tests/strings/007.phpt index 804b455167..a0fd8acdf4 100644 --- a/ext/standard/tests/strings/007.phpt +++ b/ext/standard/tests/strings/007.phpt @@ -13,7 +13,7 @@ var_dump(ob_get_contents()); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- Warning: php_strip_whitespace(%s): failed to open stream: File name too long in %s007.php on line %d string(0) "" bool(false) diff --git a/ext/standard/tests/strings/addcslashes_002.phpt b/ext/standard/tests/strings/addcslashes_002.phpt index fa5b3028fb..256d39f11a 100644 --- a/ext/standard/tests/strings/addcslashes_002.phpt +++ b/ext/standard/tests/strings/addcslashes_002.phpt @@ -21,7 +21,7 @@ class string1 $obj = new string1; var_dump( addcslashes($obj, "b") ); -echo "Done\n"; +echo "Done\n"; ?> --EXPECT-- diff --git a/ext/standard/tests/strings/addcslashes_004.phpt b/ext/standard/tests/strings/addcslashes_004.phpt index db2b6f8858..a787845506 100644 --- a/ext/standard/tests/strings/addcslashes_004.phpt +++ b/ext/standard/tests/strings/addcslashes_004.phpt @@ -13,7 +13,7 @@ var_dump( addcslashes() ); var_dump( addcslashes("foo[]") ); var_dump( addcslashes('foo[]', "o", "foo") ); -echo "Done\n"; +echo "Done\n"; ?> --EXPECTF-- diff --git a/ext/standard/tests/strings/addslashes_variation1.phpt b/ext/standard/tests/strings/addslashes_variation1.phpt index 6dfeb7e69b..1120cdf494 100644 --- a/ext/standard/tests/strings/addslashes_variation1.phpt +++ b/ext/standard/tests/strings/addslashes_variation1.phpt @@ -22,7 +22,7 @@ unset($unset_var); class sample { public function __toString() { return "obj'ct"; - } + } } // Defining resource @@ -36,43 +36,43 @@ $values = array ( 1, 12345, -2345, - + // float values /*5*/ 10.5, -10.5, 10.1234567e10, 10.7654321E-10, .5, - + // array values /*10*/ array(), array(0), array(1), array(1, 2), array('color' => 'red', 'item' => 'pen'), - + // boolean values /*15*/ true, false, TRUE, FALSE, - + // empty string /*19*/ "", '', - + // undefined variable /*21*/ $undefined_var, - + // unset variable /*22*/ $unset_var, - + // objects /*23*/ new sample(), - + // resource /*24*/ $file_handle, - + /*25*/ NULL, null ); diff --git a/ext/standard/tests/strings/addslashes_variation2.phpt b/ext/standard/tests/strings/addslashes_variation2.phpt index 792c2c30b6..260b1f0653 100644 --- a/ext/standard/tests/strings/addslashes_variation2.phpt +++ b/ext/standard/tests/strings/addslashes_variation2.phpt @@ -21,21 +21,21 @@ EOT; $heredoc_null_string =<<<EOT EOT; - + // initialising the string array -$str_array = array( +$str_array = array( // string without any characters that can be backslashed 'Hello world', - + // string with single quotes - "how're you doing?", + "how're you doing?", "don't disturb u'r neighbours", "don't disturb u'r neighbours''", '', '\'', "'", - + // string with double quotes 'he said, "he will be on leave"', 'he said, ""he will be on leave"', @@ -44,7 +44,7 @@ $str_array = array( "\"", '"', "hello\"", - + // string with backslash characters 'Is your name Ram\Krishna?', '\\0.0.0.0', diff --git a/ext/standard/tests/strings/basename_variation.phpt b/ext/standard/tests/strings/basename_variation.phpt index a0e8ebc744..e958a2c8f4 100644 --- a/ext/standard/tests/strings/basename_variation.phpt +++ b/ext/standard/tests/strings/basename_variation.phpt @@ -62,7 +62,7 @@ $file_path_variations = array ( /* path with spaces */ array(" "), array(' '), - + /* empty paths */ array(""), array(''), @@ -76,8 +76,8 @@ function check_basename( $path_arrays ) { if( 1 == count($path) ) { // no suffix provided var_dump( basename($path[0]) ); } else { // path as well as suffix provided, - var_dump( basename($path[0], $path[1]) ); - } + var_dump( basename($path[0], $path[1]) ); + } } } diff --git a/ext/standard/tests/strings/bin2hex_basic.phpt b/ext/standard/tests/strings/bin2hex_basic.phpt index 5d667a7ff6..7a0f3dde0d 100644 --- a/ext/standard/tests/strings/bin2hex_basic.phpt +++ b/ext/standard/tests/strings/bin2hex_basic.phpt @@ -17,20 +17,20 @@ $strings = array ( /*1*/ "Here is a simple string", "\t This String contains \t\t some control characters\r\n", "\x90\x91\x00\x93\x94\x90\x91\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f", - + //single quoted strings /*4*/ 'Here is a simple string', '\t This String contains \t\t some control characters\r\n', '\x90\x91\x00\x93\x94\x90\x91\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f', -); +); // loop through with each element of the $strings array to test bin2hex() function $count = 1; foreach($strings as $string) { - echo "-- Iteration $count --\n"; + echo "-- Iteration $count --\n"; var_dump(bin2hex($string)); $count ++; -} +} ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/strings/bin2hex_variation1.phpt b/ext/standard/tests/strings/bin2hex_variation1.phpt index e73ff5de6a..2b8513879c 100644 --- a/ext/standard/tests/strings/bin2hex_variation1.phpt +++ b/ext/standard/tests/strings/bin2hex_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -31,36 +31,36 @@ $inputs = array ( /*1*/ 0, 1, 123456, - + // float values /*4*/ 10.5, -20.5, 10.1234567e10, - + // array values /*7*/ array(), array(0), array(1, 2), - + // boolean values /*10*/true, false, TRUE, FALSE, - + // null values /*14*/NULL, null, - + // objects /*16*/new sample(), - + // resource /*17*/$file_handle, - + // undefined variable /*18*/@$undefined_var, - + // unset variable /*19*/@$unset_var ); diff --git a/ext/standard/tests/strings/bug22207.phpt b/ext/standard/tests/strings/bug22207.phpt index 32a15d73cd..956acd2103 100644 --- a/ext/standard/tests/strings/bug22207.phpt +++ b/ext/standard/tests/strings/bug22207.phpt @@ -2,7 +2,7 @@ Bug #22207 (missing 0 when using the e notation in *printf functions) --FILE-- <?php - printf("%10.5e\n", 1.1); + printf("%10.5e\n", 1.1); var_dump(sprintf("%10.5e\n", 1.1)); ?> --EXPECT-- diff --git a/ext/standard/tests/strings/bug22224.phpt b/ext/standard/tests/strings/bug22224.phpt index c30f222f32..0ab00a6c42 100644 --- a/ext/standard/tests/strings/bug22224.phpt +++ b/ext/standard/tests/strings/bug22224.phpt @@ -14,7 +14,7 @@ class foo $a = new foo(); - + $arr = array(0=>&$a, 1=>&$a); var_dump(implode(",",$arr)); var_dump($arr) diff --git a/ext/standard/tests/strings/bug26817.phpt b/ext/standard/tests/strings/bug26817.phpt index 228348708c..2e31d30be9 100644 --- a/ext/standard/tests/strings/bug26817.phpt +++ b/ext/standard/tests/strings/bug26817.phpt @@ -2,7 +2,7 @@ Bug #26817 (http_build_query() did not handle private & protected object properties) --FILE-- <?php -class test { +class test { protected $foo; private $bar; public $test; diff --git a/ext/standard/tests/strings/bug33076.phpt b/ext/standard/tests/strings/bug33076.phpt index dafb8161b0..95525ff2e8 100644 --- a/ext/standard/tests/strings/bug33076.phpt +++ b/ext/standard/tests/strings/bug33076.phpt @@ -9,6 +9,6 @@ var_dump($value); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(6) "bzexbz" Done diff --git a/ext/standard/tests/strings/bug36944.phpt b/ext/standard/tests/strings/bug36944.phpt index 2a43d060e2..a9f117fe3f 100644 --- a/ext/standard/tests/strings/bug36944.phpt +++ b/ext/standard/tests/strings/bug36944.phpt @@ -13,7 +13,7 @@ var_dump(strncasecmp("test ", "E", 0)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: Length must be greater than or equal to 0 in %s on line %d bool(false) int(%d) diff --git a/ext/standard/tests/strings/bug37262.phpt b/ext/standard/tests/strings/bug37262.phpt index ffdc994f46..b964c4a659 100644 --- a/ext/standard/tests/strings/bug37262.phpt +++ b/ext/standard/tests/strings/bug37262.phpt @@ -5,6 +5,6 @@ Bug #37262 (var_export() does not escape \0 character) $func = create_function('$a', 'return $a;'); var_export($func); ?> ---EXPECTF-- +--EXPECTF-- Deprecated: Function create_function() is deprecated in %s on line %d '' . "\0" . 'lambda_%d' diff --git a/ext/standard/tests/strings/bug38322.phpt b/ext/standard/tests/strings/bug38322.phpt index fd7165894c..88b4caf471 100644 --- a/ext/standard/tests/strings/bug38322.phpt +++ b/ext/standard/tests/strings/bug38322.phpt @@ -8,6 +8,6 @@ var_dump(sscanf("a ",'%1$s',$str)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- int(1) Done diff --git a/ext/standard/tests/strings/bug38770.phpt b/ext/standard/tests/strings/bug38770.phpt index 1821639aca..76ec33572b 100644 --- a/ext/standard/tests/strings/bug38770.phpt +++ b/ext/standard/tests/strings/bug38770.phpt @@ -13,7 +13,7 @@ foreach (array('N','l') as $v) { echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- Array ( [1] => 4294937296 diff --git a/ext/standard/tests/strings/bug39032.phpt b/ext/standard/tests/strings/bug39032.phpt index 1628b9df7d..f01df3ff4c 100644 --- a/ext/standard/tests/strings/bug39032.phpt +++ b/ext/standard/tests/strings/bug39032.phpt @@ -10,7 +10,7 @@ var_dump(strcspn(chr(1),"qweqwe")); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- int(1) int(0) int(1) diff --git a/ext/standard/tests/strings/bug39350.phpt b/ext/standard/tests/strings/bug39350.phpt index 53d58b7099..8cc51e9592 100644 --- a/ext/standard/tests/strings/bug39350.phpt +++ b/ext/standard/tests/strings/bug39350.phpt @@ -9,5 +9,5 @@ implode('', array("")); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- Done diff --git a/ext/standard/tests/strings/bug39873.phpt b/ext/standard/tests/strings/bug39873.phpt index e73f3c8516..527b7d3c92 100644 --- a/ext/standard/tests/strings/bug39873.phpt +++ b/ext/standard/tests/strings/bug39873.phpt @@ -9,7 +9,7 @@ if (!setlocale(LC_ALL, "ita","it","Italian","it_IT","it_IT.ISO8859-1","it_IT.ISO --FILE-- <?php setlocale(LC_ALL, "ita","it","Italian","it_IT","it_IT.ISO8859-1","it_IT.ISO_8859-1"); - $num = 0+"1234.56"; + $num = 0+"1234.56"; echo number_format($num,2); echo "\n"; ?> diff --git a/ext/standard/tests/strings/bug40637.phpt b/ext/standard/tests/strings/bug40637.phpt index bdd5a0f816..3f6fc834d8 100644 --- a/ext/standard/tests/strings/bug40637.phpt +++ b/ext/standard/tests/strings/bug40637.phpt @@ -8,6 +8,6 @@ var_dump(strip_tags($html)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(4) "Text" Done diff --git a/ext/standard/tests/strings/bug40704.phpt b/ext/standard/tests/strings/bug40704.phpt index 82e91b5c87..b2f6cf89cc 100644 --- a/ext/standard/tests/strings/bug40704.phpt +++ b/ext/standard/tests/strings/bug40704.phpt @@ -8,6 +8,6 @@ var_dump(strip_tags($html)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(26) "Bug ' Trigger Missing Text" Done diff --git a/ext/standard/tests/strings/bug40754.phpt b/ext/standard/tests/strings/bug40754.phpt index b30042e939..26ea5bc770 100644 --- a/ext/standard/tests/strings/bug40754.phpt +++ b/ext/standard/tests/strings/bug40754.phpt @@ -26,7 +26,7 @@ var_dump(chunk_split("abcde", $v, "abc")); var_dump(substr("abcde", $v, $v)); ?> ---EXPECTF-- +--EXPECTF-- string(4) "bcde" string(6) "abcdex" bool(false) diff --git a/ext/standard/tests/strings/bug45166.phpt b/ext/standard/tests/strings/bug45166.phpt index 60449e04f0..eb32e739e0 100644 --- a/ext/standard/tests/strings/bug45166.phpt +++ b/ext/standard/tests/strings/bug45166.phpt @@ -2,7 +2,7 @@ Bug #45166 (substr() ) --FILE-- <?php - echo substr('cd', -3) . "\n"; + echo substr('cd', -3) . "\n"; ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/strings/bug48709.phpt b/ext/standard/tests/strings/bug48709.phpt index 999a2c6513..6a93b8dae4 100644 --- a/ext/standard/tests/strings/bug48709.phpt +++ b/ext/standard/tests/strings/bug48709.phpt @@ -13,8 +13,8 @@ $exceptions = array( 'x', // s 'wh', // w 'wa' // w -); - +); + foreach ($exceptions as $letter) { printf("%s => %s\n", $letter, metaphone($letter)); } diff --git a/ext/standard/tests/strings/bug54721.phpt b/ext/standard/tests/strings/bug54721.phpt index 3851df1542..f21d65fddf 100644 --- a/ext/standard/tests/strings/bug54721.phpt +++ b/ext/standard/tests/strings/bug54721.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #54721 (Different Hashes on Windows, BSD and Linux on wrong Salt size) --FILE-- -<?php +<?php echo crypt("", '$1$dW0.is5.$10CH101gGOr1677ZYd517.') . "\n"; echo crypt("b", '$1$dW0.is5.$10CH101gGOr1677ZYd517.') . "\n"; echo crypt("bu", '$1$dW0.is5.$10CH101gGOr1677ZYd517.') . "\n"; diff --git a/ext/standard/tests/strings/bug55871.phpt b/ext/standard/tests/strings/bug55871.phpt index 0044f50ce7..0c8fd4c6e6 100644 --- a/ext/standard/tests/strings/bug55871.phpt +++ b/ext/standard/tests/strings/bug55871.phpt @@ -17,7 +17,7 @@ class test2 { } class test3 { - public function __toString() { + public function __toString() { $GLOBALS['my_var'] .= "AAAAAAAA"; return ''; } diff --git a/ext/standard/tests/strings/bug64879.phpt b/ext/standard/tests/strings/bug64879.phpt index ac19ce6a04..6135fbbb52 100644 --- a/ext/standard/tests/strings/bug64879.phpt +++ b/ext/standard/tests/strings/bug64879.phpt @@ -3,10 +3,10 @@ Bug #64879: quoted_printable_encode() wrong size calculation (CVE-2013-2110) --FILE-- <?php -quoted_printable_encode(str_repeat("\xf4", 1000)); -quoted_printable_encode(str_repeat("\xf4", 100000)); +quoted_printable_encode(str_repeat("\xf4", 1000)); +quoted_printable_encode(str_repeat("\xf4", 100000)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- Done diff --git a/ext/standard/tests/strings/bug65230.phpt b/ext/standard/tests/strings/bug65230.phpt index c92e558c49..87f9ed4459 100644 --- a/ext/standard/tests/strings/bug65230.phpt +++ b/ext/standard/tests/strings/bug65230.phpt @@ -11,7 +11,7 @@ date.timezone=Europe/Berlin --FILE-- <?php -function test($locale, $value) +function test($locale, $value) { $newlocale = setlocale(LC_ALL, $locale); $conv = localeconv(); diff --git a/ext/standard/tests/strings/bug65947.phpt b/ext/standard/tests/strings/bug65947.phpt index b9ac8a474b..e6011dd5f7 100644 --- a/ext/standard/tests/strings/bug65947.phpt +++ b/ext/standard/tests/strings/bug65947.phpt @@ -7,9 +7,9 @@ $filename = 'test.toto'; $csv = base64_decode('6Q=='); $adata = str_getcsv($csv,";"); $b2 = basename($filename); -if ($filename != $b2) +if ($filename != $b2) print "BUG"; else print "OKEY"; ---EXPECT-- +--EXPECT-- OKEY diff --git a/ext/standard/tests/strings/bug67252.phpt b/ext/standard/tests/strings/bug67252.phpt index 80a6ebcf1c..576524f1d2 100644 --- a/ext/standard/tests/strings/bug67252.phpt +++ b/ext/standard/tests/strings/bug67252.phpt @@ -7,7 +7,7 @@ $a = "M86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A"."\n"."a."; var_dump(convert_uudecode($a)); ?> ---EXPECTF-- +--EXPECTF-- Warning: convert_uudecode(): The given parameter is not a valid uuencoded string in %s on line %d bool(false) diff --git a/ext/standard/tests/strings/chop_variation1.phpt b/ext/standard/tests/strings/chop_variation1.phpt index 13e735d02e..a5bf0afc48 100644 --- a/ext/standard/tests/strings/chop_variation1.phpt +++ b/ext/standard/tests/strings/chop_variation1.phpt @@ -72,10 +72,10 @@ $values = array ( // unset variable $unset_var, - + // object $sample_obj, - + // resource $file_handle ); diff --git a/ext/standard/tests/strings/chop_variation2.phpt b/ext/standard/tests/strings/chop_variation2.phpt index 02d32306ec..cad8ec75f5 100644 --- a/ext/standard/tests/strings/chop_variation2.phpt +++ b/ext/standard/tests/strings/chop_variation2.phpt @@ -71,13 +71,13 @@ $values = array ( // resource $file_handle, - + // undefined variable $undefined_var, // unset variable $unset_var - + ); diff --git a/ext/standard/tests/strings/chr_variation1.phpt b/ext/standard/tests/strings/chr_variation1.phpt index 3da03316c9..85a2219ecb 100644 --- a/ext/standard/tests/strings/chr_variation1.phpt +++ b/ext/standard/tests/strings/chr_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -32,36 +32,36 @@ $inputs = array ( 1, 255, 256, - + // float values /*5*/ 10.5, -20.5, 1.1234e6, - + // array values /*8*/ array(), array(0), array(1, 2), - + // boolean values /*11*/ true, false, TRUE, FALSE, - + // null values /*15*/ NULL, null, - + // objects /*17*/ new sample(), - + // resource /*18*/ $file_handle, - + // undefined variable /*19*/ @$undefined_var, - + // unset variable /*20*/ @$unset_var ); diff --git a/ext/standard/tests/strings/chunk_split_basic.phpt b/ext/standard/tests/strings/chunk_split_basic.phpt index da4720a187..a1a269080e 100644 --- a/ext/standard/tests/strings/chunk_split_basic.phpt +++ b/ext/standard/tests/strings/chunk_split_basic.phpt @@ -5,7 +5,7 @@ Test chunk_split() function : basic functionality /* Prototype : string chunk_split(string $str [, int $chunklen [, string $ending]]) * Description: Returns split line * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ /* @@ -22,7 +22,7 @@ $chunklen = 2; $ending = '##'; // Calling chunk_split() with all possible arguments -echo "-- Testing chunk_split() with all possible arguments --\n"; +echo "-- Testing chunk_split() with all possible arguments --\n"; var_dump( chunk_split($str, $chunklen, $ending) ); @@ -34,7 +34,7 @@ var_dump( chunk_split($str, $chunklen) ); //Calling chunk_split() with default chunklen and ending string echo "-- Testing chunk_split() with default chunklen and ending string --\n"; var_dump( chunk_split($str) ); - + echo "Done" ?> --EXPECT-- diff --git a/ext/standard/tests/strings/chunk_split_variation10.phpt b/ext/standard/tests/strings/chunk_split_variation10.phpt index 99bb623c33..755d4ab46a 100644 --- a/ext/standard/tests/strings/chunk_split_variation10.phpt +++ b/ext/standard/tests/strings/chunk_split_variation10.phpt @@ -28,12 +28,12 @@ $values = array ( 'ENDING', //String '@#$%^', //Special chars - - '\t', + + '\t', '\n', '\r', '\r\n', - + '\0', //Null char '123', //Numeric '(MSG)', //With ( and ) diff --git a/ext/standard/tests/strings/chunk_split_variation12.phpt b/ext/standard/tests/strings/chunk_split_variation12.phpt index 6a025f1abb..2162b96522 100644 --- a/ext/standard/tests/strings/chunk_split_variation12.phpt +++ b/ext/standard/tests/strings/chunk_split_variation12.phpt @@ -9,7 +9,7 @@ Test chunk_split() function : usage variations - different heredoc strings for ' */ /* -* passing different heredoc strings as 'ending' argument to chunk_split() +* passing different heredoc strings as 'ending' argument to chunk_split() * 'chunklen' argument is set to 10 */ @@ -80,7 +80,7 @@ foreach($heredoc_arr as $value) { var_dump( chunk_split( $str, $chunklen, $value) ); $count++; }; - + echo "Done" ?> --EXPECT-- diff --git a/ext/standard/tests/strings/chunk_split_variation13.phpt b/ext/standard/tests/strings/chunk_split_variation13.phpt index 38b8f9568a..8e4da96e7b 100644 --- a/ext/standard/tests/strings/chunk_split_variation13.phpt +++ b/ext/standard/tests/strings/chunk_split_variation13.phpt @@ -5,7 +5,7 @@ Test chunk_split() function : usage variations - default 'chunklen' with long st /* Prototype : string chunk_split(string $str [, int $chunklen [, string $ending]]) * Description: Returns split line * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/standard/tests/strings/chunk_split_variation2.phpt b/ext/standard/tests/strings/chunk_split_variation2.phpt index 195e2d2605..b5d58b0d00 100644 --- a/ext/standard/tests/strings/chunk_split_variation2.phpt +++ b/ext/standard/tests/strings/chunk_split_variation2.phpt @@ -40,7 +40,7 @@ $values = array( (float) PHP_INT_MAX + 1, (float) -PHP_INT_MAX - 1, .5, - + // array data array(), array(0), diff --git a/ext/standard/tests/strings/chunk_split_variation3.phpt b/ext/standard/tests/strings/chunk_split_variation3.phpt index 758bec088b..408d8c8afb 100644 --- a/ext/standard/tests/strings/chunk_split_variation3.phpt +++ b/ext/standard/tests/strings/chunk_split_variation3.phpt @@ -75,7 +75,7 @@ $values = array( // unset data @$unset_var, - + // resource data $fp ); diff --git a/ext/standard/tests/strings/chunk_split_variation4.phpt b/ext/standard/tests/strings/chunk_split_variation4.phpt index 9f9a8b75ba..640df405f7 100644 --- a/ext/standard/tests/strings/chunk_split_variation4.phpt +++ b/ext/standard/tests/strings/chunk_split_variation4.phpt @@ -9,7 +9,7 @@ Test chunk_split() function : usage variations - different heredoc strings as 's */ /* -* Passing different heredoc strings as 'str' argument to the chunk_split() +* Passing different heredoc strings as 'str' argument to the chunk_split() * with 'chunklen' 4 and default value of 'ending' that is "\r\n" */ @@ -81,7 +81,7 @@ foreach($heredoc_arr as $str) { var_dump( chunk_split( $str, $chunklen) ); $count++; }; - + echo "Done" ?> --EXPECT-- diff --git a/ext/standard/tests/strings/chunk_split_variation6.phpt b/ext/standard/tests/strings/chunk_split_variation6.phpt index ccfc08a569..84a3a5ab67 100644 --- a/ext/standard/tests/strings/chunk_split_variation6.phpt +++ b/ext/standard/tests/strings/chunk_split_variation6.phpt @@ -24,18 +24,18 @@ $values = array( '', //empty ' ', //space 'This is simple string', //regular string - 'It\'s string with quotes', + 'It\'s string with quotes', 'This contains @ # $ % ^ & chars', //special characters 'This string\tcontains\rwhite space\nchars', //with white space chars - 'This is string with 1234 numbers', + 'This is string with 1234 numbers', 'This is string with \0 and ".chr(0)."null chars', //for binary safe - 'This is string with multiple space char', - 'This is to check string with ()', - ' Testing with multiple spaces ', - 'Testing invalid \k and \m escape char', + 'This is string with multiple space char', + 'This is to check string with ()', + ' Testing with multiple spaces ', + 'Testing invalid \k and \m escape char', 'This is to check with \\n and \\t' -); - +); + //Loop through each element of values for 'str' for($count = 0;$count < count($values);$count++) { diff --git a/ext/standard/tests/strings/chunk_split_variation8.phpt b/ext/standard/tests/strings/chunk_split_variation8.phpt index e97b1e9036..bfafd1af0b 100644 --- a/ext/standard/tests/strings/chunk_split_variation8.phpt +++ b/ext/standard/tests/strings/chunk_split_variation8.phpt @@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); /* Prototype : string chunk_split(string $str [, int $chunklen [, string $ending]]) * Description: Returns split line * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ /* @@ -31,8 +31,8 @@ $ending = ':::'; // different values for 'chunklen' $values = array ( - 0, - 1, + 0, + 1, -123, //negative integer 0234, //octal number 0x1A, //hexadecimal number diff --git a/ext/standard/tests/strings/convert_cyr_string.phpt b/ext/standard/tests/strings/convert_cyr_string.phpt index b62768eff4..af239543c5 100644 --- a/ext/standard/tests/strings/convert_cyr_string.phpt +++ b/ext/standard/tests/strings/convert_cyr_string.phpt @@ -19,7 +19,7 @@ var_dump(convert_cyr_string("", "d", "i")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: convert_cyr_string() expects exactly 3 parameters, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/strings/convert_cyr_string_variation1.phpt b/ext/standard/tests/strings/convert_cyr_string_variation1.phpt index 9986ac214d..47174defef 100644 --- a/ext/standard/tests/strings/convert_cyr_string_variation1.phpt +++ b/ext/standard/tests/strings/convert_cyr_string_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,36 +34,36 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/convert_uudecode_basic.phpt b/ext/standard/tests/strings/convert_uudecode_basic.phpt index 1d7e373512..3552f6d674 100644 --- a/ext/standard/tests/strings/convert_uudecode_basic.phpt +++ b/ext/standard/tests/strings/convert_uudecode_basic.phpt @@ -20,27 +20,27 @@ $strings = array ( "Here is a simple string to test convert_uuencode/decode", "\t This String contains \t\t some control characters\r\n", "\x90\x91\x00\x93\x94\x90\x91\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f", - + //single quoted strings '123', 'abc', '1a2b3c', '\t This String contains \t\t some control characters\r\n', - -); + +); // loop through with each element of the $strings array to test convert_uudecode() function $count = 1; foreach($strings as $string) { - + $encode = convert_uuencode($string); $decode = convert_uudecode($encode); - - if ($decode != $string) { - var_dump($encode, $decode, $string); + + if ($decode != $string) { + var_dump($encode, $decode, $string); exit("TEST FAILED on iteration $count\n"); - } - + } + $count ++; } diff --git a/ext/standard/tests/strings/convert_uudecode_variation1.phpt b/ext/standard/tests/strings/convert_uudecode_variation1.phpt index 049fd7f65b..4c66f076a5 100644 --- a/ext/standard/tests/strings/convert_uudecode_variation1.phpt +++ b/ext/standard/tests/strings/convert_uudecode_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,36 +34,36 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/convert_uuencode_basic.phpt b/ext/standard/tests/strings/convert_uuencode_basic.phpt index 9849997d41..2d4851945e 100644 --- a/ext/standard/tests/strings/convert_uuencode_basic.phpt +++ b/ext/standard/tests/strings/convert_uuencode_basic.phpt @@ -20,14 +20,14 @@ $strings = array ( "Here is a simple string to test convert_uuencode/decode", "\t This String contains \t\t some control characters\r\n", "\x90\x91\x00\x93\x94\x90\x91\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f", - + //single quoted strings '123', 'abc', '1a2b3c', '\t This String contains \t\t some control characters\r\n', - -); + +); // loop through with each element of the $strings array to test convert_uuencode() function $count = 1; diff --git a/ext/standard/tests/strings/convert_uuencode_variation1.phpt b/ext/standard/tests/strings/convert_uuencode_variation1.phpt index 12ca281960..c9ef4335be 100644 --- a/ext/standard/tests/strings/convert_uuencode_variation1.phpt +++ b/ext/standard/tests/strings/convert_uuencode_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,36 +34,36 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/count_chars_error.phpt b/ext/standard/tests/strings/count_chars_error.phpt index 45c1163398..f87b6e532e 100644 --- a/ext/standard/tests/strings/count_chars_error.phpt +++ b/ext/standard/tests/strings/count_chars_error.phpt @@ -14,7 +14,7 @@ echo "\n-- Testing count_chars() function with no arguments --\n"; var_dump( count_chars() ); echo "\n-- Testing count_chars() function with more than expected no. of arguments --\n"; -$string = "Hello World\n"; +$string = "Hello World\n"; $mode = 1; $extra_arg = 10; var_dump( count_chars($string, $mode, $extra_arg) ); diff --git a/ext/standard/tests/strings/count_chars_variation1.phpt b/ext/standard/tests/strings/count_chars_variation1.phpt index 18e23f95b6..9e78219dbe 100644 --- a/ext/standard/tests/strings/count_chars_variation1.phpt +++ b/ext/standard/tests/strings/count_chars_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,36 +34,36 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /* 7 */ 10.5, -20.5, 10.1234567e10, - + // array values /* 10 */ array(), array(0), array(1, 2), - + // boolean values /* 13 */ true, false, TRUE, FALSE, - + // null values /* 17 */ NULL, null, - + // objects /* 19 */ new sample(), - + // resource /* 20 */ $file_handle, - + // undefined variable /* 21 */ @$undefined_var, - + // unset variable /* 22 */ @$unset_var ); diff --git a/ext/standard/tests/strings/count_chars_variation2.phpt b/ext/standard/tests/strings/count_chars_variation2.phpt index fb3305bbbd..986312a930 100644 --- a/ext/standard/tests/strings/count_chars_variation2.phpt +++ b/ext/standard/tests/strings/count_chars_variation2.phpt @@ -29,40 +29,40 @@ $inputs = array ( 255, 2147483647, -2147483648, - + // float values /* 6 */ 0.0, 1.3, 10.5, -20.5, 10.1234567e10, - + // array values /* 11 */ array(), array(1, 2, 3, 4, 5, 6, 7, 8, 9), - + // boolean values /* 14 */ true, false, TRUE, FALSE, - + // null values /* 18 */ NULL, null, - + // string values /* 20 */ "ABCD", 'abcd', "1ABC", "5ABC", - + // objects /* 24 */ new sample(), - + // undefined variable /* 25 */ @$undefined_var, - + // unset variable /* 26 */ @$unset_var ); diff --git a/ext/standard/tests/strings/crc32_variation1.phpt b/ext/standard/tests/strings/crc32_variation1.phpt index cfd4779091..28f01e0f7c 100644 --- a/ext/standard/tests/strings/crc32_variation1.phpt +++ b/ext/standard/tests/strings/crc32_variation1.phpt @@ -2,7 +2,7 @@ Test crc32() function : usage variations - unexpected values --SKIPIF-- <?php -if (PHP_INT_SIZE != 4) +if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?> diff --git a/ext/standard/tests/strings/crc32_variation2.phpt b/ext/standard/tests/strings/crc32_variation2.phpt index 7473194f1b..51ccca8beb 100644 --- a/ext/standard/tests/strings/crc32_variation2.phpt +++ b/ext/standard/tests/strings/crc32_variation2.phpt @@ -63,7 +63,7 @@ $string_array = array( // looping to check the behaviour of the function for each string in the array -$count = 1; +$count = 1; foreach($string_array as $str) { echo "\n-- Iteration $count --\n"; var_dump( crc32($str) ); diff --git a/ext/standard/tests/strings/crc32_variation3.phpt b/ext/standard/tests/strings/crc32_variation3.phpt index 639254a5f4..505446a1bd 100644 --- a/ext/standard/tests/strings/crc32_variation3.phpt +++ b/ext/standard/tests/strings/crc32_variation3.phpt @@ -65,7 +65,7 @@ $string_array = array( // looping to check the behaviour of the function for each string in the array -$count = 1; +$count = 1; foreach($string_array as $str) { echo "\n-- Iteration $count --\n"; var_dump( crc32($str) ); diff --git a/ext/standard/tests/strings/dirname_basic.phpt b/ext/standard/tests/strings/dirname_basic.phpt index 33fee611e0..9006b27619 100644 --- a/ext/standard/tests/strings/dirname_basic.phpt +++ b/ext/standard/tests/strings/dirname_basic.phpt @@ -16,18 +16,18 @@ $file_paths = array ( "/foo/bar/", "foo/bar/", "/bar/", - + /* path with only files and trailing slashes*/ "/foo/bar.gz", "foo/bar.gz", "bar.gz", "bar.gz/", - "/bar.gz", + "/bar.gz", "/bar.gz/", "/foo/bar.gz/", "foo/bar.gz/", - "/bar.gz/", - + "/bar.gz/", + /* path with file extension and trailing slashes */ "/.gz", ".gz", @@ -49,7 +49,7 @@ function check_dirname( $paths ) { $noOfPaths = count($paths); for( ; $loop_counter < $noOfPaths; $loop_counter++ ) { echo "\n--Iteration "; - echo $loop_counter + 1; + echo $loop_counter + 1; echo " --\n"; var_dump( dirname($paths[$loop_counter]) ); } diff --git a/ext/standard/tests/strings/dirname_variation.phpt b/ext/standard/tests/strings/dirname_variation.phpt index da66f0fc55..71a2e4db2e 100644 --- a/ext/standard/tests/strings/dirname_variation.phpt +++ b/ext/standard/tests/strings/dirname_variation.phpt @@ -6,7 +6,7 @@ Test dirname() function : usage variations Description: Returns directory name component of path. */ class temp -{ +{ function __toString() { return "Object"; } @@ -26,7 +26,7 @@ $file_path_variations = array ( "hostname:/home/user/My Pics.gz/", "hostname:/home/user/My Pics/", "hostname:/home/user/My Pics", - + /* path containing numeric string */ "10.5", "/10.5", @@ -35,7 +35,7 @@ $file_path_variations = array ( "10/10.gz", '0', "0", - + /* object */ new temp, @@ -56,7 +56,7 @@ function check_dirname( $paths ) { for( ; $loop_counter < $noOfPaths; $loop_counter++ ) { echo "\n--Iteration "; echo $loop_counter +1; - echo " --\n"; + echo " --\n"; var_dump( dirname($paths[$loop_counter]) ); } } diff --git a/ext/standard/tests/strings/explode1.phpt b/ext/standard/tests/strings/explode1.phpt index 669b66272d..f4a90573f3 100644 --- a/ext/standard/tests/strings/explode1.phpt +++ b/ext/standard/tests/strings/explode1.phpt @@ -51,7 +51,7 @@ echo "\n-- Passing limit values 0 and 1 to explode() --\n"; var_dump( explode(":", "Name:Phone:Address:City:State", 0) ); var_dump( explode(":", "Name:Phone:Address:City:State", 1) ); -/* to check the maximum limit of string that can be given with limit<=0, +/* to check the maximum limit of string that can be given with limit<=0, default size is 50 but increases dynamically */ echo "\n*** Testing explode() for maximum limit of string with Limit = -1 ***\n"; var_dump( explode(":", "1:2:3:4:5:6:7:7:5:6:7:3:4:5:2:8:9:0:5:5:5:5:5:5:5:5:5:5:5:5:55:5:5:5%:%:%:%:5:5:5:%:%:5:5:5:5:5%:%:%:55:1:1", -1) ); diff --git a/ext/standard/tests/strings/explode_variation1.phpt b/ext/standard/tests/strings/explode_variation1.phpt index f16f69bece..7ced1dc822 100644 --- a/ext/standard/tests/strings/explode_variation1.phpt +++ b/ext/standard/tests/strings/explode_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,36 +34,36 @@ $delimiters = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/explode_variation2.phpt b/ext/standard/tests/strings/explode_variation2.phpt index 4de4637ac1..9377f30842 100644 --- a/ext/standard/tests/strings/explode_variation2.phpt +++ b/ext/standard/tests/strings/explode_variation2.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,36 +34,36 @@ $strings = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/explode_variation3.phpt b/ext/standard/tests/strings/explode_variation3.phpt index b139058844..2addd0436d 100644 --- a/ext/standard/tests/strings/explode_variation3.phpt +++ b/ext/standard/tests/strings/explode_variation3.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,36 +34,36 @@ $limits = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e5, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/explode_variation6.phpt b/ext/standard/tests/strings/explode_variation6.phpt index d1b34e3ef8..14b6d401a2 100644 --- a/ext/standard/tests/strings/explode_variation6.phpt +++ b/ext/standard/tests/strings/explode_variation6.phpt @@ -33,10 +33,10 @@ $e = test_explode("\x00", $str, 100); function test_explode($delim, $string, $limit) { $e = explode($delim, $string, $limit); - foreach ( $e as $v) + foreach ( $e as $v) { var_dump(bin2hex($v)); - } + } } ?> ===DONE=== diff --git a/ext/standard/tests/strings/get_html_translation_table_basic5.phpt b/ext/standard/tests/strings/get_html_translation_table_basic5.phpt index e60443050d..86f19f3a66 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic5.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic5.phpt @@ -22,7 +22,7 @@ $tt = get_html_translation_table($table, ENT_NOQUOTES | ENT_HTML5, "UTF-8"); var_dump( count($tt) ); echo "-- with table = HTML_SPECIALCHARS, ENT_COMPAT --\n"; -$table = HTML_SPECIALCHARS; +$table = HTML_SPECIALCHARS; $tt = get_html_translation_table($table, ENT_COMPAT, "UTF-8"); asort( $tt ); var_dump( count($tt) ); diff --git a/ext/standard/tests/strings/get_html_translation_table_basic7.phpt b/ext/standard/tests/strings/get_html_translation_table_basic7.phpt index 98ebbb9ac4..4e5c5afc14 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic7.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic7.phpt @@ -23,7 +23,7 @@ $tt = get_html_translation_table($table, ENT_NOQUOTES | ENT_XHTML, "UTF-8"); var_dump( count($tt) ); echo "-- with table = HTML_SPECIALCHARS, ENT_COMPAT --\n"; -$table = HTML_SPECIALCHARS; +$table = HTML_SPECIALCHARS; $tt = get_html_translation_table($table, ENT_COMPAT, "UTF-8"); asort( $tt ); var_dump( count($tt) ); diff --git a/ext/standard/tests/strings/get_html_translation_table_basic8.phpt b/ext/standard/tests/strings/get_html_translation_table_basic8.phpt index 8f8ca580ea..a3813262f7 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic8.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic8.phpt @@ -22,7 +22,7 @@ $tt = get_html_translation_table($table, ENT_NOQUOTES | ENT_XML1, "UTF-8"); var_dump( count($tt) ); echo "-- with table = HTML_SPECIALCHARS, ENT_COMPAT --\n"; -$table = HTML_SPECIALCHARS; +$table = HTML_SPECIALCHARS; $tt = get_html_translation_table($table, ENT_COMPAT, "UTF-8"); asort( $tt ); var_dump( count($tt) ); diff --git a/ext/standard/tests/strings/get_html_translation_table_basic9.phpt b/ext/standard/tests/strings/get_html_translation_table_basic9.phpt index cd32cccd5f..6e144c0c51 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic9.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic9.phpt @@ -23,7 +23,7 @@ $tt = get_html_translation_table($table, ENT_NOQUOTES | ENT_HTML5, "SJIS"); var_dump( count($tt) ); echo "-- with table = HTML_SPECIALCHARS, ENT_COMPAT --\n"; -$table = HTML_SPECIALCHARS; +$table = HTML_SPECIALCHARS; $tt = get_html_translation_table($table, ENT_COMPAT, "SJIS"); asort( $tt ); var_dump( count($tt) ); diff --git a/ext/standard/tests/strings/get_html_translation_table_variation1.phpt b/ext/standard/tests/strings/get_html_translation_table_variation1.phpt index a20d10c654..b7fd6f5775 100644 --- a/ext/standard/tests/strings/get_html_translation_table_variation1.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_variation1.phpt @@ -81,7 +81,7 @@ for($index = 0; $index < count($values); $index ++) { } else { var_dump($v); } - + $v = get_html_translation_table($table, $quote_style, "UTF-8"); if (is_array($v) && count($v) > 100) var_dump(count($v)); diff --git a/ext/standard/tests/strings/get_meta_tags.phpt b/ext/standard/tests/strings/get_meta_tags.phpt index 1fb9bf41a1..cc29995046 100644 --- a/ext/standard/tests/strings/get_meta_tags.phpt +++ b/ext/standard/tests/strings/get_meta_tags.phpt @@ -55,7 +55,7 @@ foreach ($array as $html) { echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(4) { ["author"]=> string(4) "name" diff --git a/ext/standard/tests/strings/hebrev_variation1.phpt b/ext/standard/tests/strings/hebrev_variation1.phpt index 23a4c23145..33fd974eb7 100644 --- a/ext/standard/tests/strings/hebrev_variation1.phpt +++ b/ext/standard/tests/strings/hebrev_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,36 +34,36 @@ $texts = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e5, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var, diff --git a/ext/standard/tests/strings/hebrev_variation2.phpt b/ext/standard/tests/strings/hebrev_variation2.phpt index a577d1ee89..f312472c82 100644 --- a/ext/standard/tests/strings/hebrev_variation2.phpt +++ b/ext/standard/tests/strings/hebrev_variation2.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,43 +34,43 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e5, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // string values /*19*/ "abc", 'abc', "3abc", "0abc", "0x3", - + // objects /*24*/ new sample(), - + // resource /*25*/ $file_handle, - + // undefined variable /*26*/ @$undefined_var, - + // unset variable /*27*/ @$unset_var ); diff --git a/ext/standard/tests/strings/hebrevc_variation1.phpt b/ext/standard/tests/strings/hebrevc_variation1.phpt index 92c6ffabb9..c16780e769 100644 --- a/ext/standard/tests/strings/hebrevc_variation1.phpt +++ b/ext/standard/tests/strings/hebrevc_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,36 +34,36 @@ $texts = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e5, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/hebrevc_variation2.phpt b/ext/standard/tests/strings/hebrevc_variation2.phpt index 75ebc30cd8..334d128989 100644 --- a/ext/standard/tests/strings/hebrevc_variation2.phpt +++ b/ext/standard/tests/strings/hebrevc_variation2.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,43 +34,43 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e5, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // string values /*19*/ "abc", 'abc', "3abc", "0abc", "0x3", - + // objects /*24*/ new sample(), - + // resource /*25*/ $file_handle, - + // undefined variable /*26*/ @$undefined_var, - + // unset variable /*27*/ @$unset_var ); diff --git a/ext/standard/tests/strings/html_entity_decode_cp866.phpt b/ext/standard/tests/strings/html_entity_decode_cp866.phpt index 76323be30b..18f6f3c90b 100644 --- a/ext/standard/tests/strings/html_entity_decode_cp866.phpt +++ b/ext/standard/tests/strings/html_entity_decode_cp866.phpt @@ -138,7 +138,7 @@ foreach ($arr as $u => $v) { $res = html_entity_decode($ent, ENT_QUOTES, 'CP866'); $d = unpack("H*", $res); echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]); - + $ent = sprintf("&#x%X;", $v[0]); $res = html_entity_decode($ent, ENT_QUOTES, 'CP866'); if ($res[0] != "&" || $res[1] != "#") diff --git a/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt b/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt index a3be8f3668..09fd5df02b 100644 --- a/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt +++ b/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt @@ -106,7 +106,7 @@ foreach ($arr as $u => $v) { $res = html_entity_decode($ent, ENT_QUOTES, 'ISO-8859-15'); $d = unpack("H*", $res); echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]); - + $ent = sprintf("&#x%X;", $v[0]); $res = html_entity_decode($ent, ENT_QUOTES, 'ISO-8859-15'); if ($res[0] != "&" || $res[1] != "#") diff --git a/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt b/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt index 6a65413c9c..070ed536f4 100644 --- a/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt +++ b/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt @@ -106,7 +106,7 @@ foreach ($arr as $u => $v) { $res = html_entity_decode($ent, ENT_QUOTES, 'ISO-8859-5'); $d = unpack("H*", $res); echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]); - + $ent = sprintf("&#x%X;", $v[0]); $res = html_entity_decode($ent, ENT_QUOTES, 'ISO-8859-5'); if ($res[0] != "&" || $res[1] != "#") diff --git a/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt b/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt index cb7fc7d1d8..e8523f6a09 100644 --- a/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt +++ b/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt @@ -138,7 +138,7 @@ foreach ($arr as $u => $v) { $res = html_entity_decode($ent, ENT_QUOTES, 'KOI8-R'); $d = unpack("H*", $res); echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]); - + $ent = sprintf("&#x%X;", $v[0]); $res = html_entity_decode($ent, ENT_QUOTES, 'KOI8-R'); if ($res[0] != "&" || $res[1] != "#") diff --git a/ext/standard/tests/strings/html_entity_decode_macroman.phpt b/ext/standard/tests/strings/html_entity_decode_macroman.phpt index 4691bcf1a7..4f500dc4e7 100644 --- a/ext/standard/tests/strings/html_entity_decode_macroman.phpt +++ b/ext/standard/tests/strings/html_entity_decode_macroman.phpt @@ -142,7 +142,7 @@ foreach ($arr as $u => $v) { $res = html_entity_decode($ent, ENT_QUOTES, 'MacRoman'); $d = unpack("H*", $res); echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]); - + $ent = sprintf("&#x%X;", $v[0]); $res = html_entity_decode($ent, ENT_QUOTES, 'MacRoman'); if ($res[0] != "&" || $res[1] != "#") diff --git a/ext/standard/tests/strings/html_entity_decode_win1251.phpt b/ext/standard/tests/strings/html_entity_decode_win1251.phpt index e47392623c..e60d7074bf 100644 --- a/ext/standard/tests/strings/html_entity_decode_win1251.phpt +++ b/ext/standard/tests/strings/html_entity_decode_win1251.phpt @@ -142,7 +142,7 @@ foreach ($arr as $u => $v) { $res = html_entity_decode($ent, ENT_QUOTES, 'WINDOWS-1251'); $d = unpack("H*", $res); echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]); - + $ent = sprintf("&#x%X;", $v[0]); $res = html_entity_decode($ent, ENT_QUOTES, 'WINDOWS-1251'); if ($res[0] != "&" || $res[1] != "#") diff --git a/ext/standard/tests/strings/html_entity_decode_win1252.phpt b/ext/standard/tests/strings/html_entity_decode_win1252.phpt index 2a7a6981dc..6163ef24ae 100644 --- a/ext/standard/tests/strings/html_entity_decode_win1252.phpt +++ b/ext/standard/tests/strings/html_entity_decode_win1252.phpt @@ -62,7 +62,7 @@ foreach ($arr as $u => $v) { $res = html_entity_decode($ent, ENT_QUOTES, 'WINDOWS-1252'); $d = unpack("H*", $res); echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]); - + $ent = sprintf("&#x%X;", $v[0]); $res = html_entity_decode($ent, ENT_QUOTES, 'WINDOWS-1252'); if ($res[0] != "&" || $res[1] != "#") diff --git a/ext/standard/tests/strings/htmlentities-utf-2.phpt b/ext/standard/tests/strings/htmlentities-utf-2.phpt index e6aa817276..3c0b9dde71 100644 --- a/ext/standard/tests/strings/htmlentities-utf-2.phpt +++ b/ext/standard/tests/strings/htmlentities-utf-2.phpt @@ -3,9 +3,9 @@ HTML entities with invalid chars and ENT_IGNORE --INI-- output_handler= --FILE-- -<?php +<?php @setlocale (LC_CTYPE, "C"); -$strings = array("<", "\xD0", "\xD0\x90", "\xD0\x90\xD0", "\xD0\x90\xD0\xB0", "\xE0", "A\xE0", "\xE0\x80", "\xE0\x79", "\xE0\x80\xBE", +$strings = array("<", "\xD0", "\xD0\x90", "\xD0\x90\xD0", "\xD0\x90\xD0\xB0", "\xE0", "A\xE0", "\xE0\x80", "\xE0\x79", "\xE0\x80\xBE", "Voil\xE0", "Clich\xE9s", "\xFE", "\xFE\x41", "\xC3\xA9", "\xC3\x79", "\xF7\xBF\xBF\xBF", "\xFB\xBF\xBF\xBF\xBF", "\xFD\xBF\xBF\xBF\xBF\xBF", "\x41\xF7\xF7\x42", "\x42\xFB\xFB\x42", "\x43\xFD\xFD\x42", "\x44\xF7\xF7", "\x45\xFB\xFB", "\x46\xFD\xFD" diff --git a/ext/standard/tests/strings/htmlentities-utf.phpt b/ext/standard/tests/strings/htmlentities-utf.phpt index dafec86b9a..215f500c91 100644 --- a/ext/standard/tests/strings/htmlentities-utf.phpt +++ b/ext/standard/tests/strings/htmlentities-utf.phpt @@ -3,7 +3,7 @@ HTML entities with invalid chars --INI-- output_handler= --FILE-- -<?php +<?php @setlocale (LC_CTYPE, "C"); $strings = array("<", "\xD0", "\xD0\x90", "\xD0\x90\xD0", "\xD0\x90\xD0\xB0", "\xE0", "A\xE0", "\xE0\x80", "\xE0\x79", "\xE0\x80\xBE", "Voil\xE0", "Clich\xE9s", diff --git a/ext/standard/tests/strings/htmlentities02.phpt b/ext/standard/tests/strings/htmlentities02.phpt index 5d708c21c8..161f02e24a 100644 --- a/ext/standard/tests/strings/htmlentities02.phpt +++ b/ext/standard/tests/strings/htmlentities02.phpt @@ -1,5 +1,5 @@ --TEST-- -htmlentities() test 2 (setlocale / fr_FR.ISO-8859-15) +htmlentities() test 2 (setlocale / fr_FR.ISO-8859-15) --SKIPIF-- <?php $result = (bool)setlocale(LC_CTYPE, "fr_FR.ISO-8859-15", "fr_FR.ISO8859-15", 'fr_FR@euro'); diff --git a/ext/standard/tests/strings/htmlentities20.phpt b/ext/standard/tests/strings/htmlentities20.phpt index 92c996bcb4..ff52aca07a 100644 --- a/ext/standard/tests/strings/htmlentities20.phpt +++ b/ext/standard/tests/strings/htmlentities20.phpt @@ -6,7 +6,7 @@ function codepoint_to_utf8($k) { if ($k < 0x80) { $retval = pack('C', $k); } else if ($k < 0x800) { - $retval = pack('C2', + $retval = pack('C2', 0xc0 | ($k >> 6), 0x80 | ($k & 0x3f)); } else if ($k < 0x10000) { diff --git a/ext/standard/tests/strings/htmlentities22.phpt b/ext/standard/tests/strings/htmlentities22.phpt index f11982044d..82dae2ba08 100644 --- a/ext/standard/tests/strings/htmlentities22.phpt +++ b/ext/standard/tests/strings/htmlentities22.phpt @@ -40,7 +40,7 @@ function test($flag, $flag2=ENT_DISALLOWED, $charset="UTF-8") { $i++; $a = htmlentities($test, $flag | $flag2, $charset, FALSE); $b = htmlspecialchars($test, $flag | $flag2, $charset, FALSE); - + if ($a == $b) echo sprintf("%s\t%s", $test, $a==$test?"NOT CHANGED":"CHANGED"), "\n"; else diff --git a/ext/standard/tests/strings/htmlentities_html4.phpt b/ext/standard/tests/strings/htmlentities_html4.phpt index 22b0305ced..5d784c2af5 100644 --- a/ext/standard/tests/strings/htmlentities_html4.phpt +++ b/ext/standard/tests/strings/htmlentities_html4.phpt @@ -6,7 +6,7 @@ function utf32_utf8($k) { if ($k < 0x80) { $retval = pack('C', $k); } else if ($k < 0x800) { - $retval = pack('C2', + $retval = pack('C2', 0xc0 | ($k >> 6), 0x80 | ($k & 0x3f)); } else if ($k < 0x10000) { diff --git a/ext/standard/tests/strings/htmlentities_html5.phpt b/ext/standard/tests/strings/htmlentities_html5.phpt index e7c216a292..427ba0bc35 100644 --- a/ext/standard/tests/strings/htmlentities_html5.phpt +++ b/ext/standard/tests/strings/htmlentities_html5.phpt @@ -6,7 +6,7 @@ function utf32_utf8($k) { if ($k < 0x80) { $retval = pack('C', $k); } else if ($k < 0x800) { - $retval = pack('C2', + $retval = pack('C2', 0xc0 | ($k >> 6), 0x80 | ($k & 0x3f)); } else if ($k < 0x10000) { diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt index 9dba3c87c5..4e83b5de5c 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt @@ -21,7 +21,7 @@ var_dump( htmlspecialchars_decode($double_quote_string) ); // Calling htmlspecialchars_decode() with optional 'quote_style' argument var_dump( htmlspecialchars_decode($single_quote_string, ENT_COMPAT) ); -var_dump( htmlspecialchars_decode($double_quote_string, ENT_COMPAT) ); +var_dump( htmlspecialchars_decode($double_quote_string, ENT_COMPAT) ); var_dump( htmlspecialchars_decode($single_quote_string, ENT_NOQUOTES) ); var_dump( htmlspecialchars_decode($double_quote_string, ENT_NOQUOTES) ); var_dump( htmlspecialchars_decode($single_quote_string, ENT_QUOTES) ); diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt index 007ff9e209..96a32351b4 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt @@ -7,7 +7,7 @@ Test htmlspecialchars_decode() function : usage variations - heredoc strings for * Source code: ext/standard/html.c */ -/* +/* * testing htmlspecialchars_decode() with various heredoc strings as argument for $string */ diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt index 95889b3527..7520dee09c 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt @@ -21,7 +21,7 @@ $values = array ( '\r\tRoy's height >\r; Sam\t's height', '\n 1\t3 &\tgt; 11 but 11 &\tlt; 12', ); - + // loop through each element of the values array to check htmlspecialchars_decode() function with all possible arguments $iterator = 1; foreach($values as $value) { diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt index ad86639576..85e34b8c8d 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt @@ -20,7 +20,7 @@ $strings = array ( "\r\tRoy's height >\r; Sam\t's height", "\n 1\t3 &\tgt; 11 but 11 &\tlt; 12", ); - + // loop through each element of the array to check htmlspecialchars_decode() function with all possible arguments $iterator = 1; foreach($strings as $value) { diff --git a/ext/standard/tests/strings/http_build_query_variation2.phpt b/ext/standard/tests/strings/http_build_query_variation2.phpt index 689db9e1fa..9edcf43e81 100644 --- a/ext/standard/tests/strings/http_build_query_variation2.phpt +++ b/ext/standard/tests/strings/http_build_query_variation2.phpt @@ -10,21 +10,21 @@ Adam Gegotek <adam [dot] gegotek [at] gmail [dot] com> */ $mDimensional = array( - 20, - 5 => 13, + 20, + 5 => 13, "9" => array( - 1 => "val1", - 3 => "val2", + 1 => "val1", + 3 => "val2", "string" => "string" ), - "name" => "homepage", + "name" => "homepage", "page" => 10, "sort" => array( - "desc", + "desc", "admin" => array( - "admin1", + "admin1", "admin2" => array( - "who" => "admin2", + "who" => "admin2", 2 => "test" ) ) diff --git a/ext/standard/tests/strings/join_error.phpt b/ext/standard/tests/strings/join_error.phpt index b283bf4cdb..3c72422907 100644 --- a/ext/standard/tests/strings/join_error.phpt +++ b/ext/standard/tests/strings/join_error.phpt @@ -25,7 +25,7 @@ var_dump( join($glue, $pieces, $extra_arg) ); // Less than expected number of arguments echo "\n-- Testing join() with less than expected no. of arguments --\n"; $glue = 'string_val'; - + var_dump( join($glue)); echo "Done\n"; diff --git a/ext/standard/tests/strings/join_variation1.phpt b/ext/standard/tests/strings/join_variation1.phpt index 6407f40dd0..1755df9edd 100644 --- a/ext/standard/tests/strings/join_variation1.phpt +++ b/ext/standard/tests/strings/join_variation1.phpt @@ -71,7 +71,7 @@ $values = array ( // null values NULL, null, - + // resource variable $fp, diff --git a/ext/standard/tests/strings/join_variation2.phpt b/ext/standard/tests/strings/join_variation2.phpt index ba21a25b12..03b3250b40 100644 --- a/ext/standard/tests/strings/join_variation2.phpt +++ b/ext/standard/tests/strings/join_variation2.phpt @@ -72,7 +72,7 @@ $values = array ( // resource variable $fp, - + // undefined variable @$undefined_var, diff --git a/ext/standard/tests/strings/join_variation3.phpt b/ext/standard/tests/strings/join_variation3.phpt index 5b0ad5a528..93f9822e2a 100644 --- a/ext/standard/tests/strings/join_variation3.phpt +++ b/ext/standard/tests/strings/join_variation3.phpt @@ -22,21 +22,21 @@ $pieces_arrays = array ( array(), // empty array array(NULL), // array with NULL array("a","aaaa","b","bbbb","c","ccccc"), - + // associative arrays array(1 => "one", 2 => "two", 3 => "three"), // explicit numeric keys, string values array("one" => 1, "two" => 2, "three" => 3 ), // string keys & numeric values array( 1 => 10, 2 => 20, 4 => 40, 3 => 30), // explicit numeric keys and numeric values array( "one" => "ten", "two" => "twenty", "three" => "thirty"), // string key/value array("one" => 1, 2 => "two", 4 => "four"), //mixed - + // associative array, containing null/empty/boolean values as key/value array(NULL => "NULL", null => "null", "NULL" => NULL, "null" => null), array(true => "true", false => "false", "false" => false, "true" => true), array("" => "emptyd", '' => 'emptys', "emptyd" => "", 'emptys' => ''), array(1 => '', 2 => "", 3 => NULL, 4 => null, 5 => false, 6 => true), array('' => 1, "" => 2, NULL => 3, null => 4, false => 5, true => 6), - + // array with repetative keys array("One" => 1, "two" => 2, "One" => 10, "two" => 20, "three" => 3) ); @@ -44,14 +44,14 @@ $pieces_arrays = array ( // a multichar glue value $glue = "], ["; -// loop through each $pieces_arrays element and call join() +// loop through each $pieces_arrays element and call join() $iteration = 1; for($index = 0; $index < count($pieces_arrays); $index ++) { echo "-- Iteration $iteration --\n"; var_dump( join($glue, $pieces_arrays[$index]) ); $iteration ++; } - + echo "Done\n"; ?> --EXPECTF-- diff --git a/ext/standard/tests/strings/levenshtein.phpt b/ext/standard/tests/strings/levenshtein.phpt index 249b532da7..1ac05cf2ae 100644 --- a/ext/standard/tests/strings/levenshtein.phpt +++ b/ext/standard/tests/strings/levenshtein.phpt @@ -1,11 +1,11 @@ --TEST-- levenshtein() function test --FILE-- -<?php - +<?php + function test_me($title,$expect,$text1,$text2,$cost1="",$cost2="",$cost3="") { - - if ($cost1=="") { + + if ($cost1=="") { $result=levenshtein($text1,$text2); } elseif ($cost2=="") { @@ -15,52 +15,52 @@ function test_me($title,$expect,$text1,$text2,$cost1="",$cost2="",$cost3="") { $result=levenshtein($text1,$text2,$cost1,$cost2,$cost3); } if($result==$expect) return 0; - + echo "$title: result is $result instead of $expect "; echo "for '$text1'/'$text2' "; if($cost1) echo "($cost1:$cost2:$cost3)"; echo "\n"; - + return 1; } - + $n=0; - + $n += test_me("equal" , 0, "12345", "12345"); $n += test_me("1st empty" , 3, "", "xzy"); $n += test_me("2nd empty" , 3, "xzy", ""); $n += test_me("both empty" , 0, "", ""); $n += test_me("1 char" , 1, "1", "2"); $n += test_me("2 char swap", 2, "12", "21"); - + $n += test_me("inexpensive delete", 2, "2121", "11", 2, 1, 1); $n += test_me("expensive delete" , 10, "2121", "11", 2, 1, 5); $n += test_me("inexpensive insert", 2, "11", "2121", 1, 1, 1); $n += test_me("expensive insert" , 10, "11", "2121", 5, 1, 1); - + $n += test_me("expensive replace" , 3, "111", "121", 2, 3, 2); $n += test_me("very expensive replace", 4, "111", "121", 2, 9, 2); - + $n += test_me("bug #7368", 2, "13458", "12345"); $n += test_me("bug #7368", 2, "1345", "1234"); - + $n += test_me("bug #6562", 1, "debugg", "debug"); $n += test_me("bug #6562", 1, "ddebug", "debug"); $n += test_me("bug #6562", 2, "debbbug", "debug"); $n += test_me("bug #6562", 1, "debugging", "debuging"); - + $n += test_me("bug #16473", 2, "a", "bc"); $n += test_me("bug #16473", 2, "xa", "xbc"); $n += test_me("bug #16473", 2, "xax", "xbcx"); $n += test_me("bug #16473", 2, "ax", "bcx"); - + $n += test_me("custom", -1, "111", "121", "my_levcode"); $n += test_me("lt maxlength1", 254, "AbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsu", "A"); $n += test_me("gt maxlength1", -1, "AbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuv", "A"); - + $n += test_me("lt maxlength2", 254, "A", "AbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsu"); $n += test_me("gt maxlength2", -1, "A", "AbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuv"); - + echo ($n==0)?"all passed\n":"$n failed\n"; var_dump(levenshtein(array(), array())); diff --git a/ext/standard/tests/strings/ltrim.phpt b/ext/standard/tests/strings/ltrim.phpt index cddce24688..638c93557f 100644 --- a/ext/standard/tests/strings/ltrim.phpt +++ b/ext/standard/tests/strings/ltrim.phpt @@ -36,7 +36,7 @@ var_dump( ltrim($str, "\nusi") ); var_dump ( ltrim("ABCXYZltrim test", "A..Z") ); /* with characters range as second Argument */ var_dump ( ltrim("0123456789ltrim test", "0..9") ); /* with numbers range as second Argument */ var_dump ( ltrim("@$#ltrim test", "#@$") ); /* with some special characters as second Argument */ - + echo "\n *** Output for scalar argument) ***\n"; var_dump( ltrim( 12345 ) ); /* Scalar argument */ diff --git a/ext/standard/tests/strings/ltrim_basic.phpt b/ext/standard/tests/strings/ltrim_basic.phpt index 74769cac9f..0d0eae88f7 100644 --- a/ext/standard/tests/strings/ltrim_basic.phpt +++ b/ext/standard/tests/strings/ltrim_basic.phpt @@ -18,13 +18,13 @@ $alpha = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; echo "\n-- Trim string with all white space characters --\n"; var_dump(ltrim($text)); -echo "\n-- Trim non-whitespace from a string --\n"; +echo "\n-- Trim non-whitespace from a string --\n"; var_dump(ltrim($hello, "=!")); -echo "\n-- Trim some non-white space characters from a string --\n"; +echo "\n-- Trim some non-white space characters from a string --\n"; var_dump(ltrim($hello, "!oleH=")); -echo "\n-- Trim some non-white space characters from a string suing a character range --\n"; +echo "\n-- Trim some non-white space characters from a string suing a character range --\n"; var_dump(ltrim($alpha, "A..Z")); diff --git a/ext/standard/tests/strings/ltrim_variation1.phpt b/ext/standard/tests/strings/ltrim_variation1.phpt index 5e88526609..48b76e9be7 100644 --- a/ext/standard/tests/strings/ltrim_variation1.phpt +++ b/ext/standard/tests/strings/ltrim_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return " sample object "; - } + } } //getting the resource @@ -34,36 +34,36 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/ltrim_variation2.phpt b/ext/standard/tests/strings/ltrim_variation2.phpt index 194acd187f..40254843a1 100644 --- a/ext/standard/tests/strings/ltrim_variation2.phpt +++ b/ext/standard/tests/strings/ltrim_variation2.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return " sample object "; - } + } } //getting the resource @@ -34,36 +34,36 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/md5_basic2.phpt b/ext/standard/tests/strings/md5_basic2.phpt index 7098dc41b5..73bcc33bec 100644 --- a/ext/standard/tests/strings/md5_basic2.phpt +++ b/ext/standard/tests/strings/md5_basic2.phpt @@ -13,7 +13,7 @@ $md5_raw = md5($str, true); var_dump(bin2hex($md5_raw)); $md5 = md5($str, false); - + if (strcmp(bin2hex($md5_raw), $md5) == 0 ) { echo "TEST PASSED\n"; } else { diff --git a/ext/standard/tests/strings/metaphone.phpt b/ext/standard/tests/strings/metaphone.phpt index d1aa9af543..ef1d23d89a 100644 --- a/ext/standard/tests/strings/metaphone.phpt +++ b/ext/standard/tests/strings/metaphone.phpt @@ -13,7 +13,7 @@ var_dump(metaphone("valid phrase", 0)); var_dump(metaphone("valid phrase", 10000)); $array = array( -"They fell forward, grovelling heedlessly on the cold earth.", +"They fell forward, grovelling heedlessly on the cold earth.", "But the shadow of horror wheeled and returned, passing lower now, right above them, sweeping the fen-reek with its ghastly wings.", "And then it was gone, flying back to Mordor with the speed of the wrath of Sauron; and behind it the wind roared away, leaving the Dead Marshes bare and bleak.", "The naked waste, as far as the eye could pierce, even to the distant menace of the mountains, was dappled with the fitful moonlight." @@ -25,7 +25,7 @@ foreach($array as $str) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: metaphone() expects at least 1 parameter, 0 given in %s on line %d NULL string(0) "" diff --git a/ext/standard/tests/strings/money_format_basic1.phpt b/ext/standard/tests/strings/money_format_basic1.phpt index 70b5ca574e..8b87c375ac 100644 --- a/ext/standard/tests/strings/money_format_basic1.phpt +++ b/ext/standard/tests/strings/money_format_basic1.phpt @@ -45,12 +45,12 @@ echo gettype(money_format('%=*14#8.2n', $value))."\n"; echo gettype(money_format('%=*14#8.2n', $negative_value))."\n"; // Same again but disable grouping character -echo "Format again but disable grouping character\n"; +echo "Format again but disable grouping character\n"; echo gettype(money_format('%=*^14#8.2n', $value))."\n"; echo gettype(money_format('%=*^14#8.2n', $negative_value))."\n"; // Same again but suppress currency symbol -echo "Format again suppress currency symbol\n"; +echo "Format again suppress currency symbol\n"; echo gettype(money_format('%=*!14#8.2n', $value))."\n"; echo gettype(money_format('%=*!14#8.2n', $negative_value))."\n"; diff --git a/ext/standard/tests/strings/money_format_variation1.phpt b/ext/standard/tests/strings/money_format_variation1.phpt index d4fa687db3..4a381c183a 100644 --- a/ext/standard/tests/strings/money_format_variation1.phpt +++ b/ext/standard/tests/strings/money_format_variation1.phpt @@ -26,11 +26,11 @@ unset($unset_var); //defining a couple of sample classes class class_no_tostring { } - + class class_with_tostring { public function __toString() { return " sample object "; - } + } } @@ -47,43 +47,43 @@ $formats = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // string values /*19*/ "abcd", 'abcd', "0x12f", "%=*!14#8.2nabcd", - + // objects /*23*/ new class_no_tostring(), new class_with_tostring(), - + // resource /*25*/ $file_handle, - + // undefined variable /*26*/ @$undefined_var, - + // unset variable /*27*/ @$unset_var ); @@ -99,7 +99,7 @@ foreach($formats as $format) { } // close the file handle -fclose($file_handle); +fclose($file_handle); ?> ===Done=== diff --git a/ext/standard/tests/strings/money_format_variation2.phpt b/ext/standard/tests/strings/money_format_variation2.phpt index 6e01bf03dd..c8de58bded 100644 --- a/ext/standard/tests/strings/money_format_variation2.phpt +++ b/ext/standard/tests/strings/money_format_variation2.phpt @@ -26,11 +26,11 @@ unset($unset_var); //defining a couple of sample classes class class_no_tostring { } - + class class_with_tostring { public function __toString() { return " sample object "; - } + } } @@ -47,43 +47,43 @@ $numbers = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // string values /*19*/ "abcd", 'abcd', "0x12f", "%=*!14#8.2nabcd", - + // objects /*23*/ new class_no_tostring(), new class_with_tostring(), - + // resource /*25*/ $file_handle, - + // undefined variable /*26*/ @$undefined_var, - + // unset variable /*27*/ @$unset_var ); diff --git a/ext/standard/tests/strings/nl2br.phpt b/ext/standard/tests/strings/nl2br.phpt index 6a3b94023c..728f3339a0 100644 --- a/ext/standard/tests/strings/nl2br.phpt +++ b/ext/standard/tests/strings/nl2br.phpt @@ -9,11 +9,11 @@ nl2br() function var_dump(nl2br("\n")); var_dump(nl2br("\r")); var_dump(nl2br("\n\r")); - + var_dump(nl2br("\n\r\r\n\r\r\r\r")); var_dump(nl2br("\n\r\n\n\r\n\r\r\n\r\n")); var_dump(nl2br("\n\r\n\n\n\n\r\r\r\r\n\r")); - + ?> --EXPECT-- string(4) "test" diff --git a/ext/standard/tests/strings/nl_langinfo_basic.phpt b/ext/standard/tests/strings/nl_langinfo_basic.phpt index 7502e2d471..b6f9fecc91 100644 --- a/ext/standard/tests/strings/nl_langinfo_basic.phpt +++ b/ext/standard/tests/strings/nl_langinfo_basic.phpt @@ -2,7 +2,7 @@ Test nl_langinfo() function : basic functionality --SKIPIF-- <?php -if( substr(PHP_OS, 0, 3) == 'WIN'){ +if( substr(PHP_OS, 0, 3) == 'WIN'){ die('skip Not for Windows'); } ?> @@ -24,7 +24,7 @@ var_dump(nl_langinfo(ABMON_7)); var_dump(nl_langinfo(MON_4)); var_dump(nl_langinfo(RADIXCHAR)); -setlocale(LC_ALL, $original); +setlocale(LC_ALL, $original); ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/strings/nl_langinfo_error1.phpt b/ext/standard/tests/strings/nl_langinfo_error1.phpt index 7702b012e9..0bfe2956cb 100644 --- a/ext/standard/tests/strings/nl_langinfo_error1.phpt +++ b/ext/standard/tests/strings/nl_langinfo_error1.phpt @@ -2,7 +2,7 @@ Test nl_langinfo() function : error conditions --SKIPIF-- <?php -if( substr(PHP_OS, 0, 3) == 'WIN'){ +if( substr(PHP_OS, 0, 3) == 'WIN'){ die('skip Not for Windows'); } ?> diff --git a/ext/standard/tests/strings/nl_langinfo_variation1.phpt b/ext/standard/tests/strings/nl_langinfo_variation1.phpt index c8c92855fc..180991e400 100644 --- a/ext/standard/tests/strings/nl_langinfo_variation1.phpt +++ b/ext/standard/tests/strings/nl_langinfo_variation1.phpt @@ -2,7 +2,7 @@ Test nl_langinfo() function : unexpected inputs for '$tem' argument --SKIPIF-- <?php -if( substr(PHP_OS, 0, 3) == 'WIN'){ +if( substr(PHP_OS, 0, 3) == 'WIN'){ die('skip Not for Windows'); } ?> @@ -26,7 +26,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -38,15 +38,15 @@ $items = array ( /*1*/ 2147483647, -2147483648, -20, - + // array values /*4*/ array(), array(0), array(1, 2), - + // objects /*7*/ new sample(), - + // resource /*8*/ $file_handle, ); @@ -63,7 +63,7 @@ foreach($items as $item) { } fclose($file_handle); //closing the file handle -setlocale(LC_ALL, $original); +setlocale(LC_ALL, $original); ?> ===DONE=== diff --git a/ext/standard/tests/strings/number_format_basic.phpt b/ext/standard/tests/strings/number_format_basic.phpt index 0e467b70d0..631bba0558 100644 --- a/ext/standard/tests/strings/number_format_basic.phpt +++ b/ext/standard/tests/strings/number_format_basic.phpt @@ -7,7 +7,7 @@ Test number_format() - basic function test number_format() * Description: Format a number with grouped thousands * Source code: ext/standard/string.c */ - + echo "*** Testing number_format() : basic functionality ***\n"; $values = array(1234.5678, @@ -21,7 +21,7 @@ $values = array(1234.5678, "12.3456789e1", null, true, - false); + false); echo "\n-- number_format tests.....default --\n"; for ($i = 0; $i < count($values); $i++) { diff --git a/ext/standard/tests/strings/number_format_error.phpt b/ext/standard/tests/strings/number_format_error.phpt index 334b63eacc..933466d12b 100644 --- a/ext/standard/tests/strings/number_format_error.phpt +++ b/ext/standard/tests/strings/number_format_error.phpt @@ -7,7 +7,7 @@ Test number_format() - wrong params test number_format() * Description: Format a number with grouped thousands * Source code: ext/standard/string.c */ - + echo "*** Testing number_format() : error conditions ***\n"; echo "\n-- Testing number_format() function with less than expected no. of arguments --\n"; diff --git a/ext/standard/tests/strings/ord_basic.phpt b/ext/standard/tests/strings/ord_basic.phpt index 19f3ea28d6..c445be1e49 100644 --- a/ext/standard/tests/strings/ord_basic.phpt +++ b/ext/standard/tests/strings/ord_basic.phpt @@ -26,7 +26,7 @@ var_dump(ord("Hello")); for ($i = 0; $i < 255; $i++) { if (ord(chr($i)) != $i) { exit("TEST FAILED: $i does not round trip\n"); - } + } } ?> diff --git a/ext/standard/tests/strings/ord_variation1.phpt b/ext/standard/tests/strings/ord_variation1.phpt index 06d9364a08..ffca230dba 100644 --- a/ext/standard/tests/strings/ord_variation1.phpt +++ b/ext/standard/tests/strings/ord_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -33,36 +33,36 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/pack_float.phpt b/ext/standard/tests/strings/pack_float.phpt index 4cfeb92e4b..b86c599299 100644 --- a/ext/standard/tests/strings/pack_float.phpt +++ b/ext/standard/tests/strings/pack_float.phpt @@ -19,7 +19,7 @@ var_dump( bin2hex(pack("e", -10000000000000000)), bin2hex(pack("e", -0.591234709823149)), bin2hex(pack("e", -12345678901234567890.1234567898765432123456789)), - + 'pack E', bin2hex(pack("E", "")), bin2hex(pack("E", "a")), @@ -36,7 +36,7 @@ var_dump( bin2hex(pack("E", -10000000000000000)), bin2hex(pack("E", -0.591234709823149)), bin2hex(pack("E", -12345678901234567890.1234567898765432123456789)), - + 'pack g', bin2hex(pack("g", "")), bin2hex(pack("g", "a")), @@ -53,7 +53,7 @@ var_dump( bin2hex(pack("g", -10000000000000000)), bin2hex(pack("g", -0.591234709823149)), bin2hex(pack("g", -12345678901234567890.1234567898765432123456789)), - + 'pack G', bin2hex(pack("G", "")), bin2hex(pack("G", "a")), @@ -70,7 +70,7 @@ var_dump( bin2hex(pack("G", -10000000000000000)), bin2hex(pack("G", -0.591234709823149)), bin2hex(pack("G", -12345678901234567890.1234567898765432123456789)), - + 'unpack e', unpack('e', hex2bin('0000000000000000')), unpack('e', hex2bin('000000000000f03f')), @@ -80,7 +80,7 @@ var_dump( unpack('e', hex2bin('0080e03779c341c3')), unpack('e', hex2bin('4a6ade0d65ebe2bf')), unpack('e', hex2bin('e1639d31956ae5c3')), - + 'unpack E', unpack('E', hex2bin('3ff0000000000000')), unpack('E', hex2bin('4341c37937e08000')), @@ -90,7 +90,7 @@ var_dump( unpack('E', hex2bin('c341c37937e08000')), unpack('E', hex2bin('bfe2eb650dde6a4a')), unpack('E', hex2bin('c3e56a95319d63e1')), - + 'unpack g', unpack('g', hex2bin('0000803f')), unpack('g', hex2bin('ca1b0e5a')), @@ -100,7 +100,7 @@ var_dump( unpack('g', hex2bin('ca1b0eda')), unpack('g', hex2bin('285b17bf')), unpack('g', hex2bin('aa542bdf')), - + 'unpack G', unpack('G', hex2bin('3f800000')), unpack('G', hex2bin('5a0e1bca')), @@ -110,7 +110,7 @@ var_dump( unpack('G', hex2bin('da0e1bca')), unpack('G', hex2bin('bf175b28')), unpack('G', hex2bin('df2b54aa')) - + ); ?> --EXPECT-- diff --git a/ext/standard/tests/strings/parse_str_basic1.phpt b/ext/standard/tests/strings/parse_str_basic1.phpt index a1222814f7..d72fb2624c 100644 --- a/ext/standard/tests/strings/parse_str_basic1.phpt +++ b/ext/standard/tests/strings/parse_str_basic1.phpt @@ -2,7 +2,7 @@ Test parse_str() function : basic functionality --FILE-- <?php - + /* Prototype : void parse_str ( string $str [, array &$arr ] ) * Description: Parses the string into variables * Source code: ext/standard/string.c @@ -29,7 +29,7 @@ var_dump($res2); echo "\nBasic test with an existing array as results array\n"; $res3_array = array(1,2,3,4); var_dump(parse_str($s1, $res3_array)); -var_dump($res3_array); +var_dump($res3_array); ?> ===DONE=== diff --git a/ext/standard/tests/strings/parse_str_error1.phpt b/ext/standard/tests/strings/parse_str_error1.phpt index a9c902e807..a2402b7813 100644 --- a/ext/standard/tests/strings/parse_str_error1.phpt +++ b/ext/standard/tests/strings/parse_str_error1.phpt @@ -15,7 +15,7 @@ echo "\n-- Testing htmlentities() function with less than expected no. of argume parse_str(); echo "\n-- Testing htmlentities() function with more than expected no. of arguments --\n"; $s1 = "first=val1&second=val2&third=val3"; -parse_str($s1, $res_array, true); +parse_str($s1, $res_array, true); ?> ===DONE=== diff --git a/ext/standard/tests/strings/pathinfo.phpt b/ext/standard/tests/strings/pathinfo.phpt index d9c3a2ed6c..a3d735069d 100644 --- a/ext/standard/tests/strings/pathinfo.phpt +++ b/ext/standard/tests/strings/pathinfo.phpt @@ -26,7 +26,7 @@ var_dump(pathinfo(__FILE__, PATHINFO_DIRNAME|PATHINFO_BASENAME)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: pathinfo() expects at least 1 parameter, 0 given in %s on line %d NULL array(2) { diff --git a/ext/standard/tests/strings/php_strip_whitespace.phpt b/ext/standard/tests/strings/php_strip_whitespace.phpt index 4f7ef909e9..d9376b101a 100644 --- a/ext/standard/tests/strings/php_strip_whitespace.phpt +++ b/ext/standard/tests/strings/php_strip_whitespace.phpt @@ -39,7 +39,7 @@ var_dump(php_strip_whitespace($filename)); @unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: php_strip_whitespace() expects exactly 1 parameter, 0 given in %s on line %d bool(false) diff --git a/ext/standard/tests/strings/print_basic.phpt b/ext/standard/tests/strings/print_basic.phpt index a4bc8c239a..27862c74e8 100644 --- a/ext/standard/tests/strings/print_basic.phpt +++ b/ext/standard/tests/strings/print_basic.phpt @@ -50,7 +50,7 @@ echo "\n-- Iteration 9 --\n"; print $foo; // foobar echo "\n-- Iteration 10 --\n"; -$variable = "VARIABLE"; +$variable = "VARIABLE"; print <<<END This uses the "here document" syntax to output multiple lines with $variable interpolation. Note diff --git a/ext/standard/tests/strings/print_variation1.phpt b/ext/standard/tests/strings/print_variation1.phpt index 233a21c729..18ed423278 100644 --- a/ext/standard/tests/strings/print_variation1.phpt +++ b/ext/standard/tests/strings/print_variation1.phpt @@ -19,7 +19,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,36 +34,36 @@ $inputs = array ( -2, 2147483647, -2147483648, - + // float values /*6*/ 10.5, -20.5, 10.1234567e10, - + // array values /*9*/ array(), array(0), array(1, 2), - + // boolean values /*12*/ true, false, TRUE, FALSE, - + // null values /*16*/ NULL, null, - + // objects /*18*/ new sample(), - + // resource /*19*/ $file_handle, - + // undefined variable /*20*/ @$undefined_var, - + // unset variable /*21*/ @$unset_var ); @@ -74,7 +74,7 @@ foreach($inputs as $input) { echo "-- Iteration $count --\n"; $res = print($input); echo "\n"; - var_dump($res); + var_dump($res); $count ++; } diff --git a/ext/standard/tests/strings/printf_basic2.phpt b/ext/standard/tests/strings/printf_basic2.phpt index f57b263fbf..6448fe6609 100644 --- a/ext/standard/tests/strings/printf_basic2.phpt +++ b/ext/standard/tests/strings/printf_basic2.phpt @@ -19,7 +19,7 @@ $arg1 = 111; $arg2 = 222; $arg3 = 333; -echo "\n-- Calling printf() with no arguments --\n"; +echo "\n-- Calling printf() with no arguments --\n"; $result = printf($format); echo "\n"; var_dump($result); diff --git a/ext/standard/tests/strings/printf_basic4.phpt b/ext/standard/tests/strings/printf_basic4.phpt index da8f29e795..e5c07fd03c 100644 --- a/ext/standard/tests/strings/printf_basic4.phpt +++ b/ext/standard/tests/strings/printf_basic4.phpt @@ -19,7 +19,7 @@ $arg1 = TRUE; $arg2 = FALSE; $arg3 = true; -echo "\n-- Calling printf() with no arguments --\n"; +echo "\n-- Calling printf() with no arguments --\n"; $result = printf($format); echo "\n"; var_dump($result); diff --git a/ext/standard/tests/strings/printf_basic7.phpt b/ext/standard/tests/strings/printf_basic7.phpt index f7e0d2b4f6..6675ddb29e 100644 --- a/ext/standard/tests/strings/printf_basic7.phpt +++ b/ext/standard/tests/strings/printf_basic7.phpt @@ -25,7 +25,7 @@ $arg1 = -1111; $arg2 = -1234567; $arg3 = +2345432; -echo "\n-- Calling printf() with no arguments --\n"; +echo "\n-- Calling printf() with no arguments --\n"; $result = printf($format); echo "\n"; var_dump($result); diff --git a/ext/standard/tests/strings/printf_basic8.phpt b/ext/standard/tests/strings/printf_basic8.phpt index 626797ffbf..3ec0eda5ec 100644 --- a/ext/standard/tests/strings/printf_basic8.phpt +++ b/ext/standard/tests/strings/printf_basic8.phpt @@ -29,7 +29,7 @@ $result = printf($format); echo "\n"; var_dump($result); -echo "\n-- Calling printf() with one arguments --\n"; +echo "\n-- Calling printf() with one arguments --\n"; $result = printf($format1, $arg1); echo "\n"; var_dump($result); diff --git a/ext/standard/tests/strings/printf_basic9.phpt b/ext/standard/tests/strings/printf_basic9.phpt index db1ebba2f7..cff579de03 100644 --- a/ext/standard/tests/strings/printf_basic9.phpt +++ b/ext/standard/tests/strings/printf_basic9.phpt @@ -25,12 +25,12 @@ $arg1 = 11; $arg2 = 132; $arg3 = 177; -echo "\n-- Calling printf() with no arguments --\n"; +echo "\n-- Calling printf() with no arguments --\n"; $result = printf($format); echo "\n"; var_dump($result); -echo "\n-- Calling printf() with one arguments --\n"; +echo "\n-- Calling printf() with one arguments --\n"; $result = printf($format1, $arg1); echo "\n"; var_dump($result); @@ -38,7 +38,7 @@ $result = printf($format11, $arg1); echo "\n"; var_dump($result); -echo "\n-- Calling printf() with two arguments --\n"; +echo "\n-- Calling printf() with two arguments --\n"; $result = printf($format2, $arg1, $arg2); echo "\n"; var_dump($result); @@ -46,7 +46,7 @@ $result = printf($format22, $arg1, $arg2); echo "\n"; var_dump($result); -echo "\n-- Calling printf() with three arguments --\n"; +echo "\n-- Calling printf() with three arguments --\n"; $result = printf($format3, $arg1, $arg2, $arg3); echo "\n"; var_dump($result); diff --git a/ext/standard/tests/strings/printf_error.phpt b/ext/standard/tests/strings/printf_error.phpt index 6645613c83..2e13f7ca16 100644 --- a/ext/standard/tests/strings/printf_error.phpt +++ b/ext/standard/tests/strings/printf_error.phpt @@ -21,7 +21,7 @@ $arg1 = 'one'; $arg2 = 'two'; echo "\n-- Call printf with one argument less than expected --\n"; -var_dump( printf($format1) ); +var_dump( printf($format1) ); var_dump( printf($format2,$arg1) ); var_dump( printf($format3,$arg1,$arg2) ); diff --git a/ext/standard/tests/strings/printf_variation1.phpt b/ext/standard/tests/strings/printf_variation1.phpt index e71e564da2..fcf69ebaa7 100644 --- a/ext/standard/tests/strings/printf_variation1.phpt +++ b/ext/standard/tests/strings/printf_variation1.phpt @@ -40,44 +40,44 @@ $values = array( 1, 12345, -2345, - + // float data /*5*/ 10.5, -10.5, 10.1234567e10, 10.7654321E-10, .5, - + // array data /*10*/ array(), array(0), array(1), array(1, 2), array('color' => 'red', 'item' => 'pen'), - + // null data /*15*/ NULL, null, - + // boolean data /*17*/ true, false, TRUE, FALSE, - + // empty data /*21*/ "", '', - + // object data /*23*/ new sample(), - + // undefined data /*24*/ @$undefined_var, - + // unset data /*25*/ @$unset_var, - + // resource data /*26*/ $file_handle ); @@ -87,12 +87,12 @@ $values = array( $count = 1; foreach($values as $value) { echo "\n-- Iteration $count --\n"; - + // with default argument $result = printf($value); echo "\n"; var_dump($result); - + // with two arguments $result = printf($value, $arg1); echo "\n"; diff --git a/ext/standard/tests/strings/printf_variation2.phpt b/ext/standard/tests/strings/printf_variation2.phpt index be66ad8fca..8e7d5ec910 100644 --- a/ext/standard/tests/strings/printf_variation2.phpt +++ b/ext/standard/tests/strings/printf_variation2.phpt @@ -24,7 +24,7 @@ class sample { public function __toString() { return "Object"; - } + } } // creating a file resource @@ -38,48 +38,48 @@ $values = array( 1, 12345, -2345, - + // float data /*5*/ 10.5, -10.5, 10.1234567e10, 10.7654321E-10, .5, - + // array data /*10*/ array(), array(0), array(1), array(1, 2), array('color' => 'red', 'item' => 'pen'), - + // null data /*15*/ NULL, null, - + // boolean data /*17*/ true, false, TRUE, FALSE, - + // empty data /*21*/ "", '', - + // string data /*23*/ "string", 'string', - + // object data /*25*/ new sample(), - + // undefined data /*26*/ @$undefined_var, - + // unset data /*27*/ @$unset_var, - + // resource data /*28*/ $file_handle ); @@ -89,7 +89,7 @@ $values = array( $count = 1; foreach($values as $value) { echo "\n-- Iteration $count --\n"; - + // with two arguments $result = printf($format, $value); echo "\n"; @@ -99,8 +99,8 @@ foreach($values as $value) { $result = printf($format, $value, $arg2); echo "\n"; var_dump($result); - - $count++; + + $count++; }; // closing the resource diff --git a/ext/standard/tests/strings/quoted_printable_decode_basic.phpt b/ext/standard/tests/strings/quoted_printable_decode_basic.phpt index d58d3f9056..1720056912 100644 --- a/ext/standard/tests/strings/quoted_printable_decode_basic.phpt +++ b/ext/standard/tests/strings/quoted_printable_decode_basic.phpt @@ -13,7 +13,7 @@ $str = "=FAwow-factor=C1=d0=D5=DD=C5=CE=CE=D9=C5=0A= =20=D4=cf=D2=C7=CF=D7=D9=C5= =20= =D0= -=D2=CF=C5=CB=D4=D9"; +=D2=CF=C5=CB=D4=D9"; var_dump(bin2hex(quoted_printable_decode($str))); diff --git a/ext/standard/tests/strings/quoted_printable_decode_error.phpt b/ext/standard/tests/strings/quoted_printable_decode_error.phpt index 0515fea2a7..d823a89eaf 100644 --- a/ext/standard/tests/strings/quoted_printable_decode_error.phpt +++ b/ext/standard/tests/strings/quoted_printable_decode_error.phpt @@ -17,7 +17,7 @@ $str = "=FAwow-factor=C1=d0=D5=DD=C5=CE=CE=D9=C5=0A= =20=D4=cf=D2=C7=CF=D7=D9=C5= =20= =D0= -=D2=CF=C5=CB=D4=D9"; +=D2=CF=C5=CB=D4=D9"; $extra_arg = 10; var_dump( quoted_printable_decode($str, $extra_arg) ); diff --git a/ext/standard/tests/strings/quoted_printable_decode_variation1.phpt b/ext/standard/tests/strings/quoted_printable_decode_variation1.phpt index ce35cea6b8..8d147c0e67 100644 --- a/ext/standard/tests/strings/quoted_printable_decode_variation1.phpt +++ b/ext/standard/tests/strings/quoted_printable_decode_variation1.phpt @@ -40,44 +40,44 @@ $values = array( 1, 12345, -2345, - + // float data /*5*/ 10.5, -10.5, 10.1234567e10, 10.7654321E-10, .5, - + // array data /*10*/ array(), array(0), array(1), array(1, 2), array('color' => 'red', 'item' => 'pen'), - + // null data /*15*/ NULL, null, - + // boolean data /*17*/ true, false, TRUE, FALSE, - + // empty data /*21*/ "", '', - + // object data /*23*/ new sample(), - + // undefined data /*24*/ @$undefined_var, - + // unset data /*25*/ @$unset_var, - + // resource data /*26*/ $file_handle ); diff --git a/ext/standard/tests/strings/quoted_printable_encode_001.phpt b/ext/standard/tests/strings/quoted_printable_encode_001.phpt index 6a22da8afc..1ce7d791dc 100644 --- a/ext/standard/tests/strings/quoted_printable_encode_001.phpt +++ b/ext/standard/tests/strings/quoted_printable_encode_001.phpt @@ -16,7 +16,7 @@ var_dump(quoted_printable_encode(false)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: quoted_printable_encode() expects exactly 1 parameter, 0 given in %s on line %d NULL string(0) "" diff --git a/ext/standard/tests/strings/rtrim_basic.phpt b/ext/standard/tests/strings/rtrim_basic.phpt index 7193b59866..53661a8e70 100644 --- a/ext/standard/tests/strings/rtrim_basic.phpt +++ b/ext/standard/tests/strings/rtrim_basic.phpt @@ -20,13 +20,13 @@ $binary = "Example string\x0A\x0D"; echo "\n-- Trim string with all white space characters --\n"; var_dump(rtrim($text)); -echo "\n-- Trim non-whitespace from a string --\n"; +echo "\n-- Trim non-whitespace from a string --\n"; var_dump(rtrim($hello, "=!")); -echo "\n-- Trim some non-white space characters from a string --\n"; +echo "\n-- Trim some non-white space characters from a string --\n"; var_dump(rtrim($hello, "!dlWro=")); -echo "\n-- Trim some non-white space characters from a string using a character range --\n"; +echo "\n-- Trim some non-white space characters from a string using a character range --\n"; var_dump(rtrim($alpha, "A..Z")); echo "\n-- Trim the ASCII control characters at the beginning of a string --\n"; diff --git a/ext/standard/tests/strings/rtrim_variation1.phpt b/ext/standard/tests/strings/rtrim_variation1.phpt index 68c7bb9079..f07b7db3df 100644 --- a/ext/standard/tests/strings/rtrim_variation1.phpt +++ b/ext/standard/tests/strings/rtrim_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return " !---sample object---! "; - } + } } //getting the resource @@ -34,36 +34,36 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/rtrim_variation2.phpt b/ext/standard/tests/strings/rtrim_variation2.phpt index 9e3943dfe4..70efd09f2b 100644 --- a/ext/standard/tests/strings/rtrim_variation2.phpt +++ b/ext/standard/tests/strings/rtrim_variation2.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return " sample object "; - } + } } //getting the resource @@ -34,36 +34,36 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/setlocale_basic1.phpt b/ext/standard/tests/strings/setlocale_basic1.phpt index c806e6fabf..6ecc72c116 100644 --- a/ext/standard/tests/strings/setlocale_basic1.phpt +++ b/ext/standard/tests/strings/setlocale_basic1.phpt @@ -12,7 +12,7 @@ if (setlocale(LC_ALL, "en_US.utf8", "en_AU.utf8", "ko_KR.utf8", "zh_CN.utf8", "d --FILE-- <?php /* Prototype : string setlocale (int $category , string $locale [,string $..] ) - : string setlocale(int $category , array $locale); + : string setlocale(int $category , array $locale); * Description: Sets locale information.Returns the new current locale , * or FALSE if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c @@ -50,9 +50,9 @@ echo "*** Testing setlocale() : basic functionality - set to a specific locale * //set of locales to be used $common_locales = array( - "english_US"=> "en_US.utf8", - "english_AU" => "en_AU.utf8", - "korean_KR" => "ko_KR.utf8", + "english_US"=> "en_US.utf8", + "english_AU" => "en_AU.utf8", + "korean_KR" => "ko_KR.utf8", "Chinese_zh" => "zh_CN.utf8", "germen_DE" => "de_DE.utf8", "spanish_es" => "es_EC.utf8", diff --git a/ext/standard/tests/strings/setlocale_basic2.phpt b/ext/standard/tests/strings/setlocale_basic2.phpt index 7204c45911..4680941784 100644 --- a/ext/standard/tests/strings/setlocale_basic2.phpt +++ b/ext/standard/tests/strings/setlocale_basic2.phpt @@ -12,7 +12,7 @@ if (setlocale(LC_ALL, "en_US.utf8", "en_AU.utf8", "ko_KR.utf8", "zh_CN.utf8", "d --FILE-- <?php /* Prototype : string setlocale (int $category , string $locale [,string $..] ) - : string setlocale(int $category , array $locale); + : string setlocale(int $category , array $locale); * Description: Sets locale information.Returns the new current locale , or FALSE if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c @@ -51,9 +51,9 @@ echo "*** Testing setlocale() with an array containing list of locales ***\n"; //set of locales to be used $common_locales = array( - "english_US"=> "en_US.utf8", - "english_AU" => "en_AU.utf8", - "korean_KR" => "ko_KR.utf8", + "english_US"=> "en_US.utf8", + "english_AU" => "en_AU.utf8", + "korean_KR" => "ko_KR.utf8", "Chinese_zh" => "zh_CN.utf8", "germen_DE" => "de_DE.utf8", "spanish_es" => "es_EC.utf8", @@ -111,7 +111,7 @@ if ( count($list_of_locales) > 0 ) { if(trim($currency_symbol[$new_locale]) == $new_currency){ echo "PASSED.\n"; - } else { + } else { echo "FAILED.\n"; } } else { diff --git a/ext/standard/tests/strings/setlocale_error.phpt b/ext/standard/tests/strings/setlocale_error.phpt index a6a8e38205..30f7d6cca0 100644 --- a/ext/standard/tests/strings/setlocale_error.phpt +++ b/ext/standard/tests/strings/setlocale_error.phpt @@ -11,7 +11,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : string setlocale (int $category , string $locale [,string $..] ) - : string setlocale(int $category , array $locale); + : string setlocale(int $category , array $locale); * Description: Sets locale information.Returns the new current locale , or FALSE if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c */ diff --git a/ext/standard/tests/strings/setlocale_variation2.phpt b/ext/standard/tests/strings/setlocale_variation2.phpt index 5ebdfe8d50..e138734920 100644 --- a/ext/standard/tests/strings/setlocale_variation2.phpt +++ b/ext/standard/tests/strings/setlocale_variation2.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : string setlocale (int $category , string $locale [,string $..] ) - : string setlocale(int $category , array $locale); + : string setlocale(int $category , array $locale); * Description: Sets locale information.Returns the new current locale , or FALSE if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c @@ -18,7 +18,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { /* setlocale() to set all available locales in the system and check the success count */ echo "*** Testing setlocale() : usage variations ***\n"; -function good_locale($locale) { +function good_locale($locale) { /** * Note: no_NO is a bogus locale and should not be used, see https://bugzilla.redhat.com/971416 **/ diff --git a/ext/standard/tests/strings/setlocale_variation3.phpt b/ext/standard/tests/strings/setlocale_variation3.phpt index 2b12d26d14..c68998fcfa 100644 --- a/ext/standard/tests/strings/setlocale_variation3.phpt +++ b/ext/standard/tests/strings/setlocale_variation3.phpt @@ -12,7 +12,7 @@ if (setlocale(LC_ALL,'en_US.utf8') === false) { --FILE-- <?php /* Prototype : string setlocale (int $category , string $locale [,string $..] ) - * : string setlocale(int $category , array $locale); + * : string setlocale(int $category , array $locale); * Description: Sets locale information.Returns the new current locale , or FALSE * if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c diff --git a/ext/standard/tests/strings/setlocale_variation4.phpt b/ext/standard/tests/strings/setlocale_variation4.phpt index 47ae8fcc97..d2bb0f13a6 100644 --- a/ext/standard/tests/strings/setlocale_variation4.phpt +++ b/ext/standard/tests/strings/setlocale_variation4.phpt @@ -14,7 +14,7 @@ LC_ALL=en_US.utf8; --FILE-- <?php /* Prototype : string setlocale (int $category , string $locale [,string $..] ) - * : string setlocale(int $category , array $locale); + * : string setlocale(int $category , array $locale); * Description: Sets locale information.Returns the new current locale , or FALSE * if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c diff --git a/ext/standard/tests/strings/setlocale_variation5.phpt b/ext/standard/tests/strings/setlocale_variation5.phpt index 85d06e1a74..f17c7e42b8 100644 --- a/ext/standard/tests/strings/setlocale_variation5.phpt +++ b/ext/standard/tests/strings/setlocale_variation5.phpt @@ -14,7 +14,7 @@ LC_ALL=en_US.utf8; --FILE-- <?php /* Prototype : string setlocale (int $category , string $locale [,string $..] ) - * : string setlocale(int $category , array $locale); + * : string setlocale(int $category , array $locale); * Description: Sets locale information.Returns the new current locale , or FALSE * if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c diff --git a/ext/standard/tests/strings/sha1_error.phpt b/ext/standard/tests/strings/sha1_error.phpt index bfc3e44fd5..e666351d20 100644 --- a/ext/standard/tests/strings/sha1_error.phpt +++ b/ext/standard/tests/strings/sha1_error.phpt @@ -7,7 +7,7 @@ Test sha1() function : error conditions /* Prototype: string sha1 ( string $str [, bool $raw_output ] ) * Description: Calculate the sha1 hash of a string */ - + echo "*** Testing sha1() : error conditions ***\n"; echo "\n-- Testing sha1() function with no arguments --\n"; diff --git a/ext/standard/tests/strings/sha1_file.phpt b/ext/standard/tests/strings/sha1_file.phpt index 20d62e6999..cb65572fcd 100644 --- a/ext/standard/tests/strings/sha1_file.phpt +++ b/ext/standard/tests/strings/sha1_file.phpt @@ -17,7 +17,7 @@ return false; if (($handle2 = fopen( "DataFile.txt", "w+")) == FALSE) return false; -/* Writing into file */ +/* Writing into file */ $filename = "DataFile.txt"; $content = "Add this to the file\n"; if (is_writable($filename)) { diff --git a/ext/standard/tests/strings/sha1_variation1.phpt b/ext/standard/tests/strings/sha1_variation1.phpt index 044be46d98..e473585989 100644 --- a/ext/standard/tests/strings/sha1_variation1.phpt +++ b/ext/standard/tests/strings/sha1_variation1.phpt @@ -35,44 +35,44 @@ $values = array( 1, 12345, -2345, - + // float data /*5*/ 10.5, -10.5, 10.1234567e10, 10.1234567E-10, .5, - + // array data /*10*/ array(), array(0), array(1), array(1, 2), array('color' => 'red', 'item' => 'pen'), - + // null data /*15*/ NULL, null, - + // boolean data /*17*/ true, false, TRUE, FALSE, - + // empty data /*21*/ "", '', - + // object data /*23*/ new MyClass(), - + // undefined data /*24*/ @$undefined_var, - + // unset data /*25*/ @$unset_var, - + //resource data /*26*/ $fp ); diff --git a/ext/standard/tests/strings/sha1_variation2.phpt b/ext/standard/tests/strings/sha1_variation2.phpt index eb11760b76..e7d8f01218 100644 --- a/ext/standard/tests/strings/sha1_variation2.phpt +++ b/ext/standard/tests/strings/sha1_variation2.phpt @@ -35,44 +35,44 @@ $values = array( 1, 12345, -2345, - + // float data /*5*/ 10.5, -10.5, 10.1234567e10, 10.1234567E-10, .5, - + // array data /*10*/ array(), array(0), array(1), array(1, 2), array('color' => 'red', 'item' => 'pen'), - + // null data /*15*/ NULL, null, - + // string data /*17*/ "ABC", 'abc', "0abc", "123abc", - + // empty data /*21*/ "", '', - + // object data /*23*/ new MyClass(), - + // undefined data /*24*/ @$undefined_var, - + // unset data /*25*/ @$unset_var, - + //resource data /*26*/ $fp ); diff --git a/ext/standard/tests/strings/soundex.phpt b/ext/standard/tests/strings/soundex.phpt index 55769ad57e..650236c2e5 100644 --- a/ext/standard/tests/strings/soundex.phpt +++ b/ext/standard/tests/strings/soundex.phpt @@ -11,10 +11,10 @@ $array = array( "From", "that", "time", -"on", +"on", "Sam", -"thought", -"that", +"thought", +"that", "he", "sensed", "a", @@ -31,7 +31,7 @@ foreach ($array as $str) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(false) string(4) "0000" diff --git a/ext/standard/tests/strings/soundex_basic.phpt b/ext/standard/tests/strings/soundex_basic.phpt index 9777473ee9..367ee60f15 100644 --- a/ext/standard/tests/strings/soundex_basic.phpt +++ b/ext/standard/tests/strings/soundex_basic.phpt @@ -9,9 +9,9 @@ Test soundex() function : basic functionality echo "*** Testing soundex() : basic functionality ***\n"; var_dump(soundex("Euler")); -var_dump(soundex("Gauss")); -var_dump(soundex("Hilbert")); -var_dump(soundex("Knuth")); +var_dump(soundex("Gauss")); +var_dump(soundex("Hilbert")); +var_dump(soundex("Knuth")); var_dump(soundex("Lloyd")); var_dump(soundex("Lukasiewicz")); @@ -23,7 +23,7 @@ var_dump(soundex("Lloyd") == soundex("Ladd")); // L300 var_dump(soundex("Lukasiewicz") == soundex("Lissajous")); // L222 var_dump(soundex("Lukasiewicz") == soundex("Ghosh")); -var_dump(soundex("Hilbert") == soundex("Ladd")); +var_dump(soundex("Hilbert") == soundex("Ladd")); ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/strings/sprintf_error.phpt b/ext/standard/tests/strings/sprintf_error.phpt index f7f9e37e77..bed1108118 100644 --- a/ext/standard/tests/strings/sprintf_error.phpt +++ b/ext/standard/tests/strings/sprintf_error.phpt @@ -21,7 +21,7 @@ $arg1 = 'one'; $arg2 = 'two'; // with one argument less than expected -var_dump( sprintf($format1) ); +var_dump( sprintf($format1) ); var_dump( sprintf($format2,$arg1) ); var_dump( sprintf($format3,$arg1,$arg2) ); diff --git a/ext/standard/tests/strings/sprintf_f_2.phpt b/ext/standard/tests/strings/sprintf_f_2.phpt index 1c7cc7f924..9ee0aae17f 100644 --- a/ext/standard/tests/strings/sprintf_f_2.phpt +++ b/ext/standard/tests/strings/sprintf_f_2.phpt @@ -77,7 +77,7 @@ var_dump(sprintf("%01.2f", $money)); // output "123.10" /* example#9: scientific notation */ $number = 362525200; - + var_dump(sprintf("%.3e", $number)); // outputs 3.63e+8 ?> --EXPECTREGEX-- diff --git a/ext/standard/tests/strings/sprintf_variation1.phpt b/ext/standard/tests/strings/sprintf_variation1.phpt index 2a5bdfdec9..ef66b68117 100644 --- a/ext/standard/tests/strings/sprintf_variation1.phpt +++ b/ext/standard/tests/strings/sprintf_variation1.phpt @@ -87,7 +87,7 @@ $values = array( $count = 1; foreach($values as $value) { echo "\n-- Iteration $count --\n"; - + // with default argument var_dump( sprintf($value) ); diff --git a/ext/standard/tests/strings/sprintf_variation10.phpt b/ext/standard/tests/strings/sprintf_variation10.phpt index 2b338b238a..9bd1379589 100644 --- a/ext/standard/tests/strings/sprintf_variation10.phpt +++ b/ext/standard/tests/strings/sprintf_variation10.phpt @@ -42,7 +42,7 @@ $float_formats = array( $count = 1; foreach($integer_values as $int_value) { echo "\n-- Iteration $count --\n"; - + foreach($float_formats as $format) { // with two arguments var_dump( sprintf($format, $int_value) ); diff --git a/ext/standard/tests/strings/sprintf_variation11.phpt b/ext/standard/tests/strings/sprintf_variation11.phpt index 21e01883a6..5a7d22d1bf 100644 --- a/ext/standard/tests/strings/sprintf_variation11.phpt +++ b/ext/standard/tests/strings/sprintf_variation11.phpt @@ -21,8 +21,8 @@ $resource_values = array ( // various float formats $float_formats = array( - "%f", "%hf", "%lf", - "%Lf", " %f", "%f ", + "%f", "%hf", "%lf", + "%Lf", " %f", "%f ", "\t%f", "\n%f", "%4f", "%30f", "%[0-9]", "%*f" ); @@ -30,7 +30,7 @@ $float_formats = array( $count = 1; foreach($resource_values as $resource_value) { echo "\n-- Iteration $count --\n"; - + foreach($float_formats as $format) { // with two arguments var_dump( sprintf($format, $resource_value) ); diff --git a/ext/standard/tests/strings/sprintf_variation12.phpt b/ext/standard/tests/strings/sprintf_variation12.phpt index b11e5f5eb2..ab3c3d34e1 100644 --- a/ext/standard/tests/strings/sprintf_variation12.phpt +++ b/ext/standard/tests/strings/sprintf_variation12.phpt @@ -29,8 +29,8 @@ $array_values = array ( // various float formats $float_formats = array( - "%f", "%hf", "%lf", - "%Lf", " %f", "%f ", + "%f", "%hf", "%lf", + "%Lf", " %f", "%f ", "\t%f", "\n%f", "%4f", "%30f", "%[0-9]", "%*f" ); @@ -38,7 +38,7 @@ $float_formats = array( $count = 1; foreach($array_values as $array_value) { echo "\n-- Iteration $count --\n"; - + foreach($float_formats as $format) { // with two arguments var_dump( sprintf($format, $array_value) ); diff --git a/ext/standard/tests/strings/sprintf_variation13.phpt b/ext/standard/tests/strings/sprintf_variation13.phpt index ce1567a24d..8d39fb9e62 100644 --- a/ext/standard/tests/strings/sprintf_variation13.phpt +++ b/ext/standard/tests/strings/sprintf_variation13.phpt @@ -35,8 +35,8 @@ $string_values = array ( // various float formats $float_formats = array( - "%f", "%hf", "%lf", - "%Lf", " %f", "%f ", + "%f", "%hf", "%lf", + "%Lf", " %f", "%f ", "\t%f", "\n%f", "%4f", "%30f", "%[0-9]", "%*f" ); @@ -44,7 +44,7 @@ $float_formats = array( $count = 1; foreach($string_values as $string_value) { echo "\n-- Iteration $count --\n"; - + foreach($float_formats as $format) { var_dump( sprintf($format, $string_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation14.phpt b/ext/standard/tests/strings/sprintf_variation14.phpt index 8c1278e9e0..7b34649426 100644 --- a/ext/standard/tests/strings/sprintf_variation14.phpt +++ b/ext/standard/tests/strings/sprintf_variation14.phpt @@ -19,8 +19,8 @@ $boolean_values = array ( // various float formats $float_formats = array( - "%f", "%hf", "%lf", - "%Lf", " %f", "%f ", + "%f", "%hf", "%lf", + "%Lf", " %f", "%f ", "\t%f", "\n%f", "%4f", "%30f", "%[0-9]", "%*f" ); @@ -28,7 +28,7 @@ $float_formats = array( $count = 1; foreach($boolean_values as $boolean_value) { echo "\n-- Iteration $count --\n"; - + foreach($float_formats as $format) { var_dump( sprintf($format, $boolean_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation16.phpt b/ext/standard/tests/strings/sprintf_variation16.phpt index c89b651fdf..48b3cda464 100644 --- a/ext/standard/tests/strings/sprintf_variation16.phpt +++ b/ext/standard/tests/strings/sprintf_variation16.phpt @@ -29,9 +29,9 @@ $float_values = array( ); // array of string formats -$string_formats = array( - "%s", "%hs", "%ls", - "%Ls"," %s", "%s ", +$string_formats = array( + "%s", "%hs", "%ls", + "%Ls"," %s", "%s ", "\t%s", "\n%s", "%4s", "%30s", "%[a-zA-Z0-9]", "%*s" ); @@ -39,7 +39,7 @@ $string_formats = array( $count = 1; foreach($float_values as $float_value) { echo "\n-- Iteration $count --\n"; - + foreach($string_formats as $format) { var_dump( sprintf($format, $float_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation17.phpt b/ext/standard/tests/strings/sprintf_variation17.phpt index 8ba55070e8..649a1f5cd1 100644 --- a/ext/standard/tests/strings/sprintf_variation17.phpt +++ b/ext/standard/tests/strings/sprintf_variation17.phpt @@ -20,9 +20,9 @@ $resource_values = array ( ); // array of string formats -$string_formats = array( - "%s", "%hs", "%ls", - "%Ls"," %s", "%s ", +$string_formats = array( + "%s", "%hs", "%ls", + "%Ls"," %s", "%s ", "\t%s", "\n%s", "%4s", "%30s", "%[a-zA-Z0-9]", "%*s" ); @@ -30,7 +30,7 @@ $string_formats = array( $count = 1; foreach($resource_values as $resource_value) { echo "\n-- Iteration $count --\n"; - + foreach($string_formats as $format) { var_dump( sprintf($format, $resource_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation18.phpt b/ext/standard/tests/strings/sprintf_variation18.phpt index 40fc7d9757..8f702e08b9 100644 --- a/ext/standard/tests/strings/sprintf_variation18.phpt +++ b/ext/standard/tests/strings/sprintf_variation18.phpt @@ -28,9 +28,9 @@ $array_values = array( ); // array of string formats -$string_formats = array( - "%s", "%hs", "%ls", - "%Ls"," %s", "%s ", +$string_formats = array( + "%s", "%hs", "%ls", + "%Ls"," %s", "%s ", "\t%s", "\n%s", "%4s", "%30s", "%[a-zA-Z0-9]", "%*s" ); @@ -38,7 +38,7 @@ $string_formats = array( $count = 1; foreach($array_values as $array_value) { echo "\n-- Iteration $count --\n"; - + foreach($string_formats as $format) { var_dump( sprintf($format, $array_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation19.phpt b/ext/standard/tests/strings/sprintf_variation19.phpt index 916896e5fa..5c7c8b620f 100644 --- a/ext/standard/tests/strings/sprintf_variation19.phpt +++ b/ext/standard/tests/strings/sprintf_variation19.phpt @@ -32,9 +32,9 @@ $integer_values = array( ); // array of string formats -$string_formats = array( - "%s", "%hs", "%ls", - "%Ls"," %s", "%s ", +$string_formats = array( + "%s", "%hs", "%ls", + "%Ls"," %s", "%s ", "\t%s", "\n%s", "%4s", "%30s", "%[a-zA-Z0-9]", "%*s" ); @@ -42,7 +42,7 @@ $string_formats = array( $count = 1; foreach($integer_values as $integer_value) { echo "\n-- Iteration $count --\n"; - + foreach($string_formats as $format) { var_dump( sprintf($format, $integer_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation2.phpt b/ext/standard/tests/strings/sprintf_variation2.phpt index a663df4444..858ae7402c 100644 --- a/ext/standard/tests/strings/sprintf_variation2.phpt +++ b/ext/standard/tests/strings/sprintf_variation2.phpt @@ -24,7 +24,7 @@ class sample { public function __toString() { return "Object"; - } + } } // creating a file resource @@ -89,14 +89,14 @@ $values = array( $count = 1; foreach($values as $value) { echo "\n-- Iteration $count --\n"; - + // with two arguments var_dump( sprintf($format, $value) ); // with three arguments var_dump( sprintf($format, $value, $arg2) ); - - $count++; + + $count++; }; // closing the resource diff --git a/ext/standard/tests/strings/sprintf_variation20.phpt b/ext/standard/tests/strings/sprintf_variation20.phpt index 6ac7cbb18a..5f44d6a42f 100644 --- a/ext/standard/tests/strings/sprintf_variation20.phpt +++ b/ext/standard/tests/strings/sprintf_variation20.phpt @@ -18,9 +18,9 @@ $boolean_values = array( ); // array of string formats -$string_formats = array( - "%s", "%hs", "%ls", - "%Ls"," %s", "%s ", +$string_formats = array( + "%s", "%hs", "%ls", + "%Ls"," %s", "%s ", "\t%s", "\n%s", "%4s", "%30s", "%[a-zA-Z0-9]", "%*s" ); @@ -28,7 +28,7 @@ $string_formats = array( $count = 1; foreach($boolean_values as $boolean_value) { echo "\n-- Iteration $count --\n"; - + foreach($string_formats as $format) { var_dump( sprintf($format, $boolean_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation23.phpt b/ext/standard/tests/strings/sprintf_variation23.phpt index 09e5b9fbb2..e0d247346f 100644 --- a/ext/standard/tests/strings/sprintf_variation23.phpt +++ b/ext/standard/tests/strings/sprintf_variation23.phpt @@ -20,8 +20,8 @@ $resource_values = array ( ); // array of char formats -$char_formats = array( - "%c", "%hc", "%lc", +$char_formats = array( + "%c", "%hc", "%lc", "%Lc", " %c", "%c ", "\t%c", "\n%c", "%4c", "%30c", "%[a-bA-B@#$&]", "%*c" @@ -30,7 +30,7 @@ $char_formats = array( $count = 1; foreach($resource_values as $resource_value) { echo "\n-- Iteration $count --\n"; - + foreach($char_formats as $format) { var_dump( sprintf($format, $resource_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation28.phpt b/ext/standard/tests/strings/sprintf_variation28.phpt index 1474aad1bd..3586c262df 100644 --- a/ext/standard/tests/strings/sprintf_variation28.phpt +++ b/ext/standard/tests/strings/sprintf_variation28.phpt @@ -48,7 +48,7 @@ $octal_formats = array( $count = 1; foreach($integer_values as $integer_value) { echo "\n-- Iteration $count --\n"; - + foreach($octal_formats as $format) { var_dump( sprintf($format, $integer_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation28_64bit.phpt b/ext/standard/tests/strings/sprintf_variation28_64bit.phpt index c13d5b9b8c..6e0d8eae93 100644 --- a/ext/standard/tests/strings/sprintf_variation28_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation28_64bit.phpt @@ -44,7 +44,7 @@ $octal_formats = array( $count = 1; foreach($integer_values as $integer_value) { echo "\n-- Iteration $count --\n"; - + foreach($octal_formats as $format) { var_dump( sprintf($format, $integer_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation29.phpt b/ext/standard/tests/strings/sprintf_variation29.phpt index 641db49518..2e686771ec 100644 --- a/ext/standard/tests/strings/sprintf_variation29.phpt +++ b/ext/standard/tests/strings/sprintf_variation29.phpt @@ -28,9 +28,9 @@ $float_values = array( ); // array of octal formats -$octal_formats = array( - "%o", "%ho", "%lo", - "%Lo", " %o", "%o ", +$octal_formats = array( + "%o", "%ho", "%lo", + "%Lo", " %o", "%o ", "\t%o", "\n%o", "%4o", "%30o", "%[0-7]", "%*o" ); @@ -38,7 +38,7 @@ $octal_formats = array( $count = 1; foreach($float_values as $float_value) { echo "\n-- Iteration $count --\n"; - + foreach($octal_formats as $format) { var_dump( sprintf($format, $float_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation29_64bit.phpt b/ext/standard/tests/strings/sprintf_variation29_64bit.phpt index 6e7303521c..f758a673e4 100644 --- a/ext/standard/tests/strings/sprintf_variation29_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation29_64bit.phpt @@ -24,9 +24,9 @@ $float_values = array( ); // array of octal formats -$octal_formats = array( - "%o", "%ho", "%lo", - "%Lo", " %o", "%o ", +$octal_formats = array( + "%o", "%ho", "%lo", + "%Lo", " %o", "%o ", "\t%o", "\n%o", "%4o", "%30o", "%[0-7]", "%*o" ); @@ -34,7 +34,7 @@ $octal_formats = array( $count = 1; foreach($float_values as $float_value) { echo "\n-- Iteration $count --\n"; - + foreach($octal_formats as $format) { var_dump( sprintf($format, $float_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation3.phpt b/ext/standard/tests/strings/sprintf_variation3.phpt index ab4fbb1caf..905507e7a2 100644 --- a/ext/standard/tests/strings/sprintf_variation3.phpt +++ b/ext/standard/tests/strings/sprintf_variation3.phpt @@ -37,11 +37,11 @@ $int_formats = array( "\t%d", "\n%d", "%4d", "%30d", "%[0-9]", "%*d" ); - + $count = 1; foreach($valid_ints as $int_value) { echo "\n-- Iteration $count --\n"; - + foreach($int_formats as $format) { var_dump( sprintf($format, $int_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation30.phpt b/ext/standard/tests/strings/sprintf_variation30.phpt index 78d8e133bf..4f91ad57f4 100644 --- a/ext/standard/tests/strings/sprintf_variation30.phpt +++ b/ext/standard/tests/strings/sprintf_variation30.phpt @@ -20,9 +20,9 @@ $resource_values = array ( ); // array of octal formats -$octal_formats = array( - "%o", "%ho", "%lo", - "%Lo", " %o", "%o ", +$octal_formats = array( + "%o", "%ho", "%lo", + "%Lo", " %o", "%o ", "\t%o", "\n%o", "%4o", "%30o", "%[0-7]", "%*o" ); @@ -30,7 +30,7 @@ $octal_formats = array( $count = 1; foreach($resource_values as $resource_value) { echo "\n-- Iteration $count --\n"; - + foreach($octal_formats as $format) { var_dump( sprintf($format, $resource_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation31.phpt b/ext/standard/tests/strings/sprintf_variation31.phpt index 59a9cfcbc1..31f211c795 100644 --- a/ext/standard/tests/strings/sprintf_variation31.phpt +++ b/ext/standard/tests/strings/sprintf_variation31.phpt @@ -27,9 +27,9 @@ $array_values = array( ); // array of octal formats -$octal_formats = array( - "%o", "%ho", "%lo", - "%Lo", " %o", "%o ", +$octal_formats = array( + "%o", "%ho", "%lo", + "%Lo", " %o", "%o ", "\t%o", "\n%o", "%4o", "%30o", "%[0-7]", "%*o" ); @@ -37,7 +37,7 @@ $octal_formats = array( $count = 1; foreach($array_values as $array_value) { echo "\n-- Iteration $count --\n"; - + foreach($octal_formats as $format) { var_dump( sprintf($format, $array_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation32.phpt b/ext/standard/tests/strings/sprintf_variation32.phpt index ee72d0521c..e6ca521f72 100644 --- a/ext/standard/tests/strings/sprintf_variation32.phpt +++ b/ext/standard/tests/strings/sprintf_variation32.phpt @@ -33,9 +33,9 @@ $string_values = array( ); // array of octal formats -$octal_formats = array( - "%o", "%ho", "%lo", - "%Lo", " %o", "%o ", +$octal_formats = array( + "%o", "%ho", "%lo", + "%Lo", " %o", "%o ", "\t%o", "\n%o", "%4o", "%30o", "%[0-7]", "%*o" ); @@ -43,7 +43,7 @@ $octal_formats = array( $count = 1; foreach($string_values as $string_value) { echo "\n-- Iteration $count --\n"; - + foreach($octal_formats as $format) { var_dump( sprintf($format, $string_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation33.phpt b/ext/standard/tests/strings/sprintf_variation33.phpt index acd4781c02..9b3e602a2f 100644 --- a/ext/standard/tests/strings/sprintf_variation33.phpt +++ b/ext/standard/tests/strings/sprintf_variation33.phpt @@ -18,9 +18,9 @@ $boolean_values = array( ); // array of octal formats -$octal_formats = array( - "%o", "%ho", "%lo", - "%Lo", " %o", "%o ", +$octal_formats = array( + "%o", "%ho", "%lo", + "%Lo", " %o", "%o ", "\t%o", "\n%o", "%4o", "%30o", "%[0-7]", "%*o" ); @@ -28,7 +28,7 @@ $octal_formats = array( $count = 1; foreach($boolean_values as $boolean_value) { echo "\n-- Iteration $count --\n"; - + foreach($octal_formats as $format) { var_dump( sprintf($format, $boolean_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation34.phpt b/ext/standard/tests/strings/sprintf_variation34.phpt index ce2d01ca12..0dd38448ec 100644 --- a/ext/standard/tests/strings/sprintf_variation34.phpt +++ b/ext/standard/tests/strings/sprintf_variation34.phpt @@ -48,7 +48,7 @@ $hexa_formats = array( $count = 1; foreach($integer_values as $integer_value) { echo "\n-- Iteration $count --\n"; - + foreach($hexa_formats as $format) { var_dump( sprintf($format, $integer_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation34_64bit.phpt b/ext/standard/tests/strings/sprintf_variation34_64bit.phpt index 2d095cd739..d5d8fe229d 100644 --- a/ext/standard/tests/strings/sprintf_variation34_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation34_64bit.phpt @@ -44,7 +44,7 @@ $hexa_formats = array( $count = 1; foreach($integer_values as $integer_value) { echo "\n-- Iteration $count --\n"; - + foreach($hexa_formats as $format) { var_dump( sprintf($format, $integer_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation35.phpt b/ext/standard/tests/strings/sprintf_variation35.phpt index c658a767bf..56afca215d 100644 --- a/ext/standard/tests/strings/sprintf_variation35.phpt +++ b/ext/standard/tests/strings/sprintf_variation35.phpt @@ -32,8 +32,8 @@ $float_values = array( ); // array of hexa formats -$hexa_formats = array( - "%x", "%xx", "%lx", +$hexa_formats = array( + "%x", "%xx", "%lx", "%Lx", " %x", "%x ", "\t%x", "\n%x", "%4x", "%30x", "%[0-9A-Fa-f]", "%*x" @@ -42,7 +42,7 @@ $hexa_formats = array( $count = 1; foreach($float_values as $float_value) { echo "\n-- Iteration $count --\n"; - + foreach($hexa_formats as $format) { // with two arguments var_dump( sprintf($format, $float_value) ); diff --git a/ext/standard/tests/strings/sprintf_variation35_64bit.phpt b/ext/standard/tests/strings/sprintf_variation35_64bit.phpt index 64beaf1368..4a2c701acd 100644 --- a/ext/standard/tests/strings/sprintf_variation35_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation35_64bit.phpt @@ -28,8 +28,8 @@ $float_values = array( ); // array of hexa formats -$hexa_formats = array( - "%x", "%xx", "%lx", +$hexa_formats = array( + "%x", "%xx", "%lx", "%Lx", " %x", "%x ", "\t%x", "\n%x", "%4x", "%30x", "%[0-9A-Fa-f]", "%*x" @@ -38,7 +38,7 @@ $hexa_formats = array( $count = 1; foreach($float_values as $float_value) { echo "\n-- Iteration $count --\n"; - + foreach($hexa_formats as $format) { // with two arguments var_dump( sprintf($format, $float_value) ); diff --git a/ext/standard/tests/strings/sprintf_variation36.phpt b/ext/standard/tests/strings/sprintf_variation36.phpt index d7d6999de8..1cebffe129 100644 --- a/ext/standard/tests/strings/sprintf_variation36.phpt +++ b/ext/standard/tests/strings/sprintf_variation36.phpt @@ -20,8 +20,8 @@ $resource_values = array ( ); // array of hexa formats -$hexa_formats = array( - "%x", "%xx", "%lx", +$hexa_formats = array( + "%x", "%xx", "%lx", "%Lx", " %x", "%x ", "\t%x", "\n%x", "%4x", "%30x", "%[0-9A-Fa-f]", "%*x" @@ -30,7 +30,7 @@ $hexa_formats = array( $count = 1; foreach($resource_values as $resource_value) { echo "\n-- Iteration $count --\n"; - + foreach($hexa_formats as $format) { var_dump( sprintf($format, $resource_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation37.phpt b/ext/standard/tests/strings/sprintf_variation37.phpt index 4406be95d9..51fcaaa0d7 100644 --- a/ext/standard/tests/strings/sprintf_variation37.phpt +++ b/ext/standard/tests/strings/sprintf_variation37.phpt @@ -26,8 +26,8 @@ $array_values = array( ); // array of hexa formats -$hexa_formats = array( - "%x", "%xx", "%lx", +$hexa_formats = array( + "%x", "%xx", "%lx", "%Lx", " %x", "%x ", "\t%x", "\n%x", "%4x", "%30x", "%[0-9A-Fa-f]", "%*x" @@ -36,7 +36,7 @@ $hexa_formats = array( $count = 1; foreach($array_values as $array_value) { echo "\n-- Iteration $count --\n"; - + foreach($hexa_formats as $format) { var_dump( sprintf($format, $array_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation38.phpt b/ext/standard/tests/strings/sprintf_variation38.phpt index 79948b24af..6b29c1fc09 100644 --- a/ext/standard/tests/strings/sprintf_variation38.phpt +++ b/ext/standard/tests/strings/sprintf_variation38.phpt @@ -32,8 +32,8 @@ $string_values = array( ); // array of hexa formats -$hexa_formats = array( - "%x", "%xx", "%lx", +$hexa_formats = array( + "%x", "%xx", "%lx", "%Lx", " %x", "%x ", "\t%x", "\n%x", "%4x", "%30x", "%[0-9A-Fa-f]", "%*x" @@ -42,7 +42,7 @@ $hexa_formats = array( $count = 1; foreach($string_values as $string_value) { echo "\n-- Iteration $count --\n"; - + foreach($hexa_formats as $format) { var_dump( sprintf($format, $string_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation39.phpt b/ext/standard/tests/strings/sprintf_variation39.phpt index f3d0f8c21d..c799d169c2 100644 --- a/ext/standard/tests/strings/sprintf_variation39.phpt +++ b/ext/standard/tests/strings/sprintf_variation39.phpt @@ -18,8 +18,8 @@ $boolean_values = array( ); // array of hexa formats -$hexa_formats = array( - "%x", "%xx", "%lx", +$hexa_formats = array( + "%x", "%xx", "%lx", "%Lx", " %x", "%x ", "\t%x", "\n%x", "%4x", "%30x", "%[0-9A-Fa-f]", "%*x" @@ -28,7 +28,7 @@ $hexa_formats = array( $count = 1; foreach($boolean_values as $boolean_value) { echo "\n-- Iteration $count --\n"; - + foreach($hexa_formats as $format) { var_dump( sprintf($format, $boolean_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation4.phpt b/ext/standard/tests/strings/sprintf_variation4.phpt index 848e26de13..9ab493ff37 100644 --- a/ext/standard/tests/strings/sprintf_variation4.phpt +++ b/ext/standard/tests/strings/sprintf_variation4.phpt @@ -39,11 +39,11 @@ $int_formats = array( "\t%d", "\n%d", "%4d", "%30d", "%[0-9]", "%*d" ); - + $count = 1; foreach($float_values as $float_value) { echo "\n-- Iteration $count --\n"; - + foreach($int_formats as $format) { var_dump( sprintf($format, $float_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation40.phpt b/ext/standard/tests/strings/sprintf_variation40.phpt index 65f78fa7a2..da626a4d81 100644 --- a/ext/standard/tests/strings/sprintf_variation40.phpt +++ b/ext/standard/tests/strings/sprintf_variation40.phpt @@ -49,7 +49,7 @@ $unsigned_formats = array( $count = 1; foreach($integer_values as $integer_value) { echo "\n-- Iteration $count --\n"; - + foreach($unsigned_formats as $format) { var_dump( sprintf($format, $integer_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation40_64bit.phpt b/ext/standard/tests/strings/sprintf_variation40_64bit.phpt index e4d36f439f..f887ff5afa 100644 --- a/ext/standard/tests/strings/sprintf_variation40_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation40_64bit.phpt @@ -45,7 +45,7 @@ $unsigned_formats = array( $count = 1; foreach($integer_values as $integer_value) { echo "\n-- Iteration $count --\n"; - + foreach($unsigned_formats as $format) { var_dump( sprintf($format, $integer_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation41.phpt b/ext/standard/tests/strings/sprintf_variation41.phpt index 713df9a2a3..a87c1dd33a 100644 --- a/ext/standard/tests/strings/sprintf_variation41.phpt +++ b/ext/standard/tests/strings/sprintf_variation41.phpt @@ -39,7 +39,7 @@ $float_values = array( // array of unsigned formats $unsigned_formats = array( "%u", "%hu", "%lu", - "%Lu", " %u", "%u ", + "%Lu", " %u", "%u ", "\t%u", "\n%u", "%4u", "%30u", "%[0-9]", "%*u" ); @@ -47,7 +47,7 @@ $unsigned_formats = array( $count = 1; foreach($float_values as $float_value) { echo "\n-- Iteration $count --\n"; - + foreach($unsigned_formats as $format) { var_dump( sprintf($format, $float_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation41_64bit.phpt b/ext/standard/tests/strings/sprintf_variation41_64bit.phpt index 79e6275fcb..02991cf3ea 100644 --- a/ext/standard/tests/strings/sprintf_variation41_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation41_64bit.phpt @@ -35,7 +35,7 @@ $float_values = array( // array of unsigned formats $unsigned_formats = array( "%u", "%hu", "%lu", - "%Lu", " %u", "%u ", + "%Lu", " %u", "%u ", "\t%u", "\n%u", "%4u", "%30u", "%[0-9]", "%*u" ); @@ -43,7 +43,7 @@ $unsigned_formats = array( $count = 1; foreach($float_values as $float_value) { echo "\n-- Iteration $count --\n"; - + foreach($unsigned_formats as $format) { var_dump( sprintf($format, $float_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation42.phpt b/ext/standard/tests/strings/sprintf_variation42.phpt index f9f7dd631d..7f994e23d7 100644 --- a/ext/standard/tests/strings/sprintf_variation42.phpt +++ b/ext/standard/tests/strings/sprintf_variation42.phpt @@ -22,7 +22,7 @@ $resource_values = array ( // array of unsigned formats $unsigned_formats = array( "%u", "%hu", "%lu", - "%Lu", " %u", "%u ", + "%Lu", " %u", "%u ", "\t%u", "\n%u", "%4u", "%30u", "%[0-9]", "%*u" ); @@ -31,7 +31,7 @@ $unsigned_formats = array( $count = 1; foreach($resource_values as $resource_value) { echo "\n-- Iteration $count --\n"; - + foreach($unsigned_formats as $format) { var_dump( sprintf($format, $resource_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation43.phpt b/ext/standard/tests/strings/sprintf_variation43.phpt index a828e6b892..4def644ace 100644 --- a/ext/standard/tests/strings/sprintf_variation43.phpt +++ b/ext/standard/tests/strings/sprintf_variation43.phpt @@ -28,17 +28,17 @@ $array_values = array( ); // array of unsigned formats -$unsigned_formats = array( +$unsigned_formats = array( "%u", "%hu", "%lu", - "%Lu", " %u", "%u ", - "\t%u", "\n%u", "%4u", + "%Lu", " %u", "%u ", + "\t%u", "\n%u", "%4u", "%30u", "%[0-9]", "%*u" ); $count = 1; foreach($array_values as $array_value) { echo "\n-- Iteration $count --\n"; - + foreach($unsigned_formats as $format) { var_dump( sprintf($format, $array_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation44.phpt b/ext/standard/tests/strings/sprintf_variation44.phpt index 73e786e3df..f4023546ee 100644 --- a/ext/standard/tests/strings/sprintf_variation44.phpt +++ b/ext/standard/tests/strings/sprintf_variation44.phpt @@ -40,10 +40,10 @@ $string_values = array( ); // array of unsigned formats -$unsigned_formats = array( +$unsigned_formats = array( "%u", "%hu", "%lu", - "%Lu", " %u", "%u ", - "\t%u", "\n%u", "%4u", + "%Lu", " %u", "%u ", + "\t%u", "\n%u", "%4u", "%30u", "%[0-9]", "%*u" ); @@ -51,7 +51,7 @@ $unsigned_formats = array( $count = 1; foreach($string_values as $string_value) { echo "\n-- Iteration $count --\n"; - + foreach($unsigned_formats as $format) { var_dump( sprintf($format, $string_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation44_64bit.phpt b/ext/standard/tests/strings/sprintf_variation44_64bit.phpt index 1be1db709c..8aef09bdc9 100644 --- a/ext/standard/tests/strings/sprintf_variation44_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation44_64bit.phpt @@ -36,10 +36,10 @@ $string_values = array( ); // array of unsigned formats -$unsigned_formats = array( +$unsigned_formats = array( "%u", "%hu", "%lu", - "%Lu", " %u", "%u ", - "\t%u", "\n%u", "%4u", + "%Lu", " %u", "%u ", + "\t%u", "\n%u", "%4u", "%30u", "%[0-9]", "%*u" ); @@ -47,7 +47,7 @@ $unsigned_formats = array( $count = 1; foreach($string_values as $string_value) { echo "\n-- Iteration $count --\n"; - + foreach($unsigned_formats as $format) { var_dump( sprintf($format, $string_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation45.phpt b/ext/standard/tests/strings/sprintf_variation45.phpt index 85dcfceab7..a2a2f570f3 100644 --- a/ext/standard/tests/strings/sprintf_variation45.phpt +++ b/ext/standard/tests/strings/sprintf_variation45.phpt @@ -18,17 +18,17 @@ $boolean_values = array( ); // array of unsigned formats -$unsigned_formats = array( +$unsigned_formats = array( "%u", "%hu", "%lu", - "%Lu", " %u", "%u ", - "\t%u", "\n%u", "%4u", + "%Lu", " %u", "%u ", + "\t%u", "\n%u", "%4u", "%30u", "%[0-9]", "%*u" ); $count = 1; foreach($boolean_values as $boolean_value) { echo "\n-- Iteration $count --\n"; - + foreach($unsigned_formats as $format) { var_dump( sprintf($format, $boolean_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation46.phpt b/ext/standard/tests/strings/sprintf_variation46.phpt index 11bdb23cf6..79e2dff6f1 100644 --- a/ext/standard/tests/strings/sprintf_variation46.phpt +++ b/ext/standard/tests/strings/sprintf_variation46.phpt @@ -42,7 +42,7 @@ $scientific_formats = array( $count = 1; foreach($integer_values as $integer_value) { echo "\n-- Iteration $count --\n"; - + foreach($scientific_formats as $format) { var_dump( sprintf($format, $integer_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation47.phpt b/ext/standard/tests/strings/sprintf_variation47.phpt index 78d68fa4f4..a935885242 100644 --- a/ext/standard/tests/strings/sprintf_variation47.phpt +++ b/ext/standard/tests/strings/sprintf_variation47.phpt @@ -44,7 +44,7 @@ $scientific_formats = array( $count = 1; foreach($float_values as $float_value) { echo "\n-- Iteration $count --\n"; - + foreach($scientific_formats as $format) { var_dump( sprintf($format, $float_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation48.phpt b/ext/standard/tests/strings/sprintf_variation48.phpt index 758b705c0d..b3eccf7e13 100644 --- a/ext/standard/tests/strings/sprintf_variation48.phpt +++ b/ext/standard/tests/strings/sprintf_variation48.phpt @@ -20,17 +20,17 @@ $resource_values = array ( ); // array of scientific formats -$scientific_formats = array( +$scientific_formats = array( "%e", "%he", "%le", "%Le", " %e", "%e ", - "\t%e", "\n%e", "%4e", + "\t%e", "\n%e", "%4e", "%30e", "%[0-1]", "%*e" ); $count = 1; foreach($resource_values as $resource_value) { echo "\n-- Iteration $count --\n"; - + foreach($scientific_formats as $format) { var_dump( sprintf($format, $resource_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation49.phpt b/ext/standard/tests/strings/sprintf_variation49.phpt index d4807b1a2a..bbd3ce7e34 100644 --- a/ext/standard/tests/strings/sprintf_variation49.phpt +++ b/ext/standard/tests/strings/sprintf_variation49.phpt @@ -29,17 +29,17 @@ $array_values = array( ); // array of scientific formats -$scientific_formats = array( +$scientific_formats = array( "%e", "%he", "%le", "%Le", " %e", "%e ", - "\t%e", "\n%e", "%4e", + "\t%e", "\n%e", "%4e", "%30e", "%[0-1]", "%*e" ); $count = 1; foreach($array_values as $array_value) { echo "\n-- Iteration $count --\n"; - + foreach($scientific_formats as $format) { var_dump( sprintf($format, $array_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation4_64bit.phpt b/ext/standard/tests/strings/sprintf_variation4_64bit.phpt index a5fd306fd5..990c0b28d4 100644 --- a/ext/standard/tests/strings/sprintf_variation4_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation4_64bit.phpt @@ -35,11 +35,11 @@ $int_formats = array( "\t%d", "\n%d", "%4d", "%30d", "%[0-9]", "%*d" ); - + $count = 1; foreach($float_values as $float_value) { echo "\n-- Iteration $count --\n"; - + foreach($int_formats as $format) { var_dump( sprintf($format, $float_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation5.phpt b/ext/standard/tests/strings/sprintf_variation5.phpt index ee13d3d64b..5fc863781a 100644 --- a/ext/standard/tests/strings/sprintf_variation5.phpt +++ b/ext/standard/tests/strings/sprintf_variation5.phpt @@ -15,7 +15,7 @@ $dfp = opendir ( dirname(__FILE__) ); $fp_copy = $fp; $dfp_copy = $dfp; - + // array of resource types $resource_types = array ( $fp_copy, @@ -28,11 +28,11 @@ $int_formats = array( "\t%d", "\n%d", "%4d", "%[0-9]", "%*d" ); - + $count = 1; foreach($resource_types as $res) { echo "\n-- Iteration $count --\n"; - + foreach($int_formats as $format) { var_dump( sprintf($format, $res) ); } diff --git a/ext/standard/tests/strings/sprintf_variation50.phpt b/ext/standard/tests/strings/sprintf_variation50.phpt index fc27b2c932..bb4c96bb64 100644 --- a/ext/standard/tests/strings/sprintf_variation50.phpt +++ b/ext/standard/tests/strings/sprintf_variation50.phpt @@ -44,7 +44,7 @@ $scientific_formats = array( $count = 1; foreach($string_values as $string_value) { echo "\n-- Iteration $count --\n"; - + foreach($scientific_formats as $format) { var_dump( sprintf($format, $string_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation51.phpt b/ext/standard/tests/strings/sprintf_variation51.phpt index 9ee693e142..ab245da1a1 100644 --- a/ext/standard/tests/strings/sprintf_variation51.phpt +++ b/ext/standard/tests/strings/sprintf_variation51.phpt @@ -18,17 +18,17 @@ $boolean_values = array( ); // array of scientific formats -$scientific_formats = array( +$scientific_formats = array( "%e", "%he", "%le", "%Le", " %e", "%e ", - "\t%e", "\n%e", "%4e", + "\t%e", "\n%e", "%4e", "%30e", "%[0-1]", "%*e" ); $count = 1; foreach($boolean_values as $boolean_value) { echo "\n-- Iteration $count --\n"; - + foreach($scientific_formats as $format) { var_dump( sprintf($format, $boolean_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation6.phpt b/ext/standard/tests/strings/sprintf_variation6.phpt index c41db4e637..361570ea91 100644 --- a/ext/standard/tests/strings/sprintf_variation6.phpt +++ b/ext/standard/tests/strings/sprintf_variation6.phpt @@ -32,14 +32,14 @@ $array_types = array ( $int_formats = array( "%d", "%hd", "%ld", "%Ld", " %d", "%d ", - "\t%d", "\n%d", "%4d", + "\t%d", "\n%d", "%4d", "%30d", "%[0-9]", "%*d" ); - + $count = 1; foreach($array_types as $arr) { echo "\n-- Iteration $count --\n"; - + foreach($int_formats as $format) { var_dump( sprintf($format, $arr) ); } diff --git a/ext/standard/tests/strings/sprintf_variation7.phpt b/ext/standard/tests/strings/sprintf_variation7.phpt index b7ce8d94d2..49bb8932a7 100644 --- a/ext/standard/tests/strings/sprintf_variation7.phpt +++ b/ext/standard/tests/strings/sprintf_variation7.phpt @@ -21,14 +21,14 @@ $boolean_values = array ( $int_formats = array( "%d", "%hd", "%ld", "%Ld", " %d", "%d ", - "\t%d", "\n%d", "%4d", + "\t%d", "\n%d", "%4d", "%30d", "%[0-9]", "%*d" ); - + $count = 1; foreach($boolean_values as $boolean_value) { echo "\n-- Iteration $count --\n"; - + foreach($int_formats as $format) { var_dump( sprintf($format, $boolean_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation8.phpt b/ext/standard/tests/strings/sprintf_variation8.phpt index 7fd608b819..168f424a21 100644 --- a/ext/standard/tests/strings/sprintf_variation8.phpt +++ b/ext/standard/tests/strings/sprintf_variation8.phpt @@ -41,11 +41,11 @@ $int_formats = array( "\t%d", "\n%d", "%4d", "%30d", "%[0-9]", "%*d" ); - + $count = 1; foreach($string_values as $string_value) { echo "\n-- Iteration $count --\n"; - + foreach($int_formats as $format) { var_dump( sprintf($format, $string_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation9.phpt b/ext/standard/tests/strings/sprintf_variation9.phpt index 6be495aa42..6629a34f80 100644 --- a/ext/standard/tests/strings/sprintf_variation9.phpt +++ b/ext/standard/tests/strings/sprintf_variation9.phpt @@ -55,7 +55,7 @@ $float_formats = array( $count = 1; foreach($float_values as $float_value) { echo "\n-- Iteration $count --\n"; - + foreach($float_formats as $format) { var_dump( sprintf($format, $float_value) ); } diff --git a/ext/standard/tests/strings/sscanf_basic1.phpt b/ext/standard/tests/strings/sscanf_basic1.phpt index dadafbde2c..8a38f9d19e 100644 --- a/ext/standard/tests/strings/sscanf_basic1.phpt +++ b/ext/standard/tests/strings/sscanf_basic1.phpt @@ -16,15 +16,15 @@ echo "*** Testing sscanf() : basic functionality - using string format ***\n"; $str = "Part: Widget Serial Number: 1234789 Stock: 25"; $format = "Part: %s Serial Number: %s Stock: %s"; -echo "\n-- Try sccanf() WITHOUT optional args --\n"; +echo "\n-- Try sccanf() WITHOUT optional args --\n"; // extract details using short format list($part, $number, $stock) = sscanf($str, $format); var_dump($part, $number, $stock); -echo "\n-- Try sccanf() WITH optional args --\n"; +echo "\n-- Try sccanf() WITH optional args --\n"; // extract details using long format $res = sscanf($str, $format, $part, $number, $stock); -var_dump($res, $part, $number, $stock); +var_dump($res, $part, $number, $stock); ?> ===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic2.phpt b/ext/standard/tests/strings/sscanf_basic2.phpt index 693a307c05..92f4d1051e 100644 --- a/ext/standard/tests/strings/sscanf_basic2.phpt +++ b/ext/standard/tests/strings/sscanf_basic2.phpt @@ -16,15 +16,15 @@ echo "*** Testing sscanf() : basic functionality - using integer format ***\n"; $str = "Part: Widget Serial Number: 1234789 Stock: 25"; $format = "Part: %s Serial Number: %d Stock: %d"; -echo "\n-- Try sccanf() WITHOUT optional args --\n"; +echo "\n-- Try sccanf() WITHOUT optional args --\n"; // extract details using short format list($part, $number, $stock) = sscanf($str, $format); var_dump($part, $number, $stock); -echo "\n-- Try sccanf() WITH optional args --\n"; +echo "\n-- Try sccanf() WITH optional args --\n"; // extract details using long format $res = sscanf($str, $format, $part, $number, $stock); -var_dump($res, $part, $number, $stock); +var_dump($res, $part, $number, $stock); ?> ===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic3.phpt b/ext/standard/tests/strings/sscanf_basic3.phpt index de910ef4b8..b728dea34d 100644 --- a/ext/standard/tests/strings/sscanf_basic3.phpt +++ b/ext/standard/tests/strings/sscanf_basic3.phpt @@ -13,15 +13,15 @@ echo "*** Testing sscanf() : basic functionality -- using float format ***\n"; $str = "Part: Widget Length: 111.53 Width: 22.345 Depth: 12.4"; $format = "Part: %s Length: %f Width: %f Depth: %f"; -echo "\n-- Try sccanf() WITHOUT optional args --\n"; +echo "\n-- Try sccanf() WITHOUT optional args --\n"; // extract details using short format list($part, $length, $width, $depth) = sscanf($str, $format); var_dump($part, $length, $width, $depth); -echo "\n-- Try sccanf() WITH optional args --\n"; +echo "\n-- Try sccanf() WITH optional args --\n"; // extract details using long format $res = sscanf($str, $format, $part, $length, $width, $depth); -var_dump($res, $part, $length, $width, $depth); +var_dump($res, $part, $length, $width, $depth); ?> ===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic4.phpt b/ext/standard/tests/strings/sscanf_basic4.phpt index 8ce44ff4c8..8ed760afde 100644 --- a/ext/standard/tests/strings/sscanf_basic4.phpt +++ b/ext/standard/tests/strings/sscanf_basic4.phpt @@ -13,15 +13,15 @@ echo "*** Testing sscanf() : basic functionality - using char format ***\n"; $str = "X = A + B - C"; $format = "%c = %c + %c - %c"; -echo "\n-- Try sccanf() WITHOUT optional args --\n"; +echo "\n-- Try sccanf() WITHOUT optional args --\n"; // extract details using short format list($arg1, $arg2, $arg3, $arg4) = sscanf($str, $format); var_dump($arg1, $arg2, $arg3, $arg4); -echo "\n-- Try sccanf() WITH optional args --\n"; +echo "\n-- Try sccanf() WITH optional args --\n"; // extract details using long format $res = sscanf($str, $format, $arg1, $arg2, $arg3, $arg4); -var_dump($res, $arg1, $arg2, $arg3, $arg4); +var_dump($res, $arg1, $arg2, $arg3, $arg4); ?> ===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic5.phpt b/ext/standard/tests/strings/sscanf_basic5.phpt index 5dbbf44813..36c2feba9d 100644 --- a/ext/standard/tests/strings/sscanf_basic5.phpt +++ b/ext/standard/tests/strings/sscanf_basic5.phpt @@ -14,19 +14,19 @@ $str = "10.12345 10.12345E3 10.12345e3 -10.12345e4" ; $format1 = "%e %e %e %e"; $format2 = "%E %E %E %E"; -echo "\n-- Try sccanf() WITHOUT optional args --\n"; +echo "\n-- Try sccanf() WITHOUT optional args --\n"; // extract details using short format list($arg1, $arg2, $arg3, $arg4) = sscanf($str, $format1); var_dump($arg1, $arg2, $arg3, $arg4); list($arg1, $arg2, $arg3, $arg4) = sscanf($str, $format2); var_dump($arg1, $arg2, $arg3, $arg4); -echo "\n-- Try sccanf() WITH optional args --\n"; +echo "\n-- Try sccanf() WITH optional args --\n"; // extract details using long format $res = sscanf($str, $format1, $arg1, $arg2, $arg3, $arg4); -var_dump($res, $arg1, $arg2, $arg3, $arg4); +var_dump($res, $arg1, $arg2, $arg3, $arg4); $res = sscanf($str, $format2,$arg1, $arg2, $arg3, $arg4); -var_dump($res, $arg1, $arg2, $arg3, $arg4); +var_dump($res, $arg1, $arg2, $arg3, $arg4); ?> diff --git a/ext/standard/tests/strings/sscanf_basic6.phpt b/ext/standard/tests/strings/sscanf_basic6.phpt index 6efdd0b687..381ccc12c2 100644 --- a/ext/standard/tests/strings/sscanf_basic6.phpt +++ b/ext/standard/tests/strings/sscanf_basic6.phpt @@ -19,15 +19,15 @@ echo "*** Testing sscanf() : basic functionality - using unsigned format ***\n"; $str = "-11 +11 11 -11.234 +11.234 11.234"; $format = "%u %u %u %u %u %u"; -echo "\n-- Try sccanf() WITHOUT optional args --\n"; +echo "\n-- Try sccanf() WITHOUT optional args --\n"; // extract details using short format list($arg1, $arg2, $arg3, $arg4, $arg5, $arg6) = sscanf($str, $format); var_dump($arg1, $arg2, $arg3, $arg4, $arg5, $arg6); -echo "\n-- Try sccanf() WITH optional args --\n"; +echo "\n-- Try sccanf() WITH optional args --\n"; // extract details using long format $res = sscanf($str, $format, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); -var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); +var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); ?> ===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic7.phpt b/ext/standard/tests/strings/sscanf_basic7.phpt index 1d54054d4b..253dd1ba53 100644 --- a/ext/standard/tests/strings/sscanf_basic7.phpt +++ b/ext/standard/tests/strings/sscanf_basic7.phpt @@ -13,15 +13,15 @@ echo "*** Testing sscanf() : basic functionality - using octal format ***\n"; $str = "0123 -0123 +0123 0129 -0129 +0129"; $format = "%o %o %o %o %o %o"; -echo "\n-- Try sccanf() WITHOUT optional args --\n"; +echo "\n-- Try sccanf() WITHOUT optional args --\n"; // extract details using short format list($arg1, $arg2, $arg3, $arg4, $arg5, $arg6) = sscanf($str, $format); var_dump($arg1, $arg2, $arg3, $arg4, $arg5, $arg6); -echo "\n-- Try sccanf() WITH optional args --\n"; +echo "\n-- Try sccanf() WITH optional args --\n"; // extract details using long format $res = sscanf($str, $format, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); -var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); +var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); ?> ===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic8.phpt b/ext/standard/tests/strings/sscanf_basic8.phpt index 4773f026af..bcec81eab4 100644 --- a/ext/standard/tests/strings/sscanf_basic8.phpt +++ b/ext/standard/tests/strings/sscanf_basic8.phpt @@ -14,19 +14,19 @@ $str = "129 12F 123B -123B 01ABC 1G"; $format1 = "%x %x %x %x %x %x"; $format2 = "%X %X %X %X %X %X"; -echo "\n-- Try sccanf() WITHOUT optional args --\n"; +echo "\n-- Try sccanf() WITHOUT optional args --\n"; // extract details using short format list($arg1, $arg2, $arg3, $arg4, $arg5, $arg6) = sscanf($str, $format1); var_dump($arg1, $arg2, $arg3, $arg4, $arg5, $arg6); list($arg1, $arg2, $arg3, $arg4, $arg5, $arg6) = sscanf($str, $format2); var_dump($arg1, $arg2, $arg3, $arg4, $arg5, $arg6); -echo "\n-- Try sccanf() WITH optional args --\n"; +echo "\n-- Try sccanf() WITH optional args --\n"; // extract details using long format $res = sscanf($str, $format1, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); -var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); +var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); $res = sscanf($str, $format2, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); -var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); +var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); ?> ===DONE=== diff --git a/ext/standard/tests/strings/sscanf_variation1.phpt b/ext/standard/tests/strings/sscanf_variation1.phpt index 9bbf2c8b79..f5c4664526 100644 --- a/ext/standard/tests/strings/sscanf_variation1.phpt +++ b/ext/standard/tests/strings/sscanf_variation1.phpt @@ -17,7 +17,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -32,36 +32,36 @@ $inputs = array ( -2, 2147483647, -2147483648, - + // float values /*6*/ 10.5, -20.5, 10.1234567e10, - + // array values /*9*/ array(), array(0), array(1, 2), - + // boolean values /*12*/ true, false, TRUE, FALSE, - + // null values /*16*/ NULL, null, - + // objects /*18*/ new sample(), - + // resource /*19*/ $file_handle, - + // undefined variable /*20*/ @$undefined_var, - + // unset variable /*21*/ @$unset_var ); diff --git a/ext/standard/tests/strings/sscanf_variation2.phpt b/ext/standard/tests/strings/sscanf_variation2.phpt index ee3a41a7c3..9d2904ff72 100644 --- a/ext/standard/tests/strings/sscanf_variation2.phpt +++ b/ext/standard/tests/strings/sscanf_variation2.phpt @@ -17,7 +17,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -32,36 +32,36 @@ $inputs = array ( -2, 2147483647, -2147483648, - + // float values /*6*/ 10.5, -20.5, 10.1234567e10, - + // array values /*9*/ array(), array(0), array(1, 2), - + // boolean values /*12*/ true, false, TRUE, FALSE, - + // null values /*16*/ NULL, null, - + // objects /*18*/ new sample(), - + // resource /*19*/ $file_handle, - + // undefined variable /*20*/ @$undefined_var, - + // unset variable /*21*/ @$unset_var ); diff --git a/ext/standard/tests/strings/str_ireplace.phpt b/ext/standard/tests/strings/str_ireplace.phpt index b127424dfe..526b8ac723 100644 --- a/ext/standard/tests/strings/str_ireplace.phpt +++ b/ext/standard/tests/strings/str_ireplace.phpt @@ -47,7 +47,7 @@ var_dump($Data = str_ireplace("\n", "<br>", $Data)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: str_ireplace() expects at least 3 parameters, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/strings/str_pad_variation1.phpt b/ext/standard/tests/strings/str_pad_variation1.phpt index a630b6ad26..e694fa9db7 100644 --- a/ext/standard/tests/strings/str_pad_variation1.phpt +++ b/ext/standard/tests/strings/str_pad_variation1.phpt @@ -21,7 +21,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -36,36 +36,36 @@ $inputs = array ( -2, 2147483647, -2147483648, - + // float values /*6*/ 10.5, -20.5, 10.1234567e10, - + // array values /*9*/ array(), array(0), array(1, 2), - + // boolean values /*12*/ true, false, TRUE, FALSE, - + // null values /*16*/ NULL, null, - + // objects /*18*/ new sample(), - + // resource /*19*/ $file_handle, - + // undefined variable /*20*/ @$undefined_var, - + // unset variable /*21*/ @$unset_var ); diff --git a/ext/standard/tests/strings/str_pad_variation2.phpt b/ext/standard/tests/strings/str_pad_variation2.phpt index 2f082ea7a5..ec0aa959af 100644 --- a/ext/standard/tests/strings/str_pad_variation2.phpt +++ b/ext/standard/tests/strings/str_pad_variation2.phpt @@ -21,7 +21,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -35,36 +35,36 @@ $pad_lengths = array ( 1, -2, 255, - + // float values /*5*/ 10.5, -20.5, 10.12345e2, - + // array values /*8*/ array(), array(0), array(1, 2), - + // boolean values /*11*/ true, false, TRUE, FALSE, - + // null values /*15*/ NULL, null, - + // objects /*17*/ new sample(), - + // resource /*18*/ $file_handle, - + // undefined variable /*19*/ @$undefined_var, - + // unset variable /*20*/ @$unset_var ); diff --git a/ext/standard/tests/strings/str_pad_variation3.phpt b/ext/standard/tests/strings/str_pad_variation3.phpt index 73fd79a8b9..1e924efe8a 100644 --- a/ext/standard/tests/strings/str_pad_variation3.phpt +++ b/ext/standard/tests/strings/str_pad_variation3.phpt @@ -21,7 +21,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -36,36 +36,36 @@ $pad_strings = array ( -2, 2147483647, -2147483648, - + // float values /*6*/ 10.5, -20.5, 10.1234567e10, - + // array values /*9*/ array(), array(0), array(1, 2), - + // boolean values /*12*/ true, false, TRUE, FALSE, - + // null values /*16*/ NULL, null, - + // objects /*18*/ new sample(), - + // resource /*19*/ $file_handle, - + // undefined variable /*20*/ @$undefined_var, - + // unset variable /*21*/ @$unset_var ); diff --git a/ext/standard/tests/strings/str_pad_variation4.phpt b/ext/standard/tests/strings/str_pad_variation4.phpt index e5084b7e9b..b72ec20c02 100644 --- a/ext/standard/tests/strings/str_pad_variation4.phpt +++ b/ext/standard/tests/strings/str_pad_variation4.phpt @@ -23,7 +23,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } // array with different values for $input @@ -33,43 +33,43 @@ $pad_types = array ( /*1*/ 0, // == STR_PAD_LEFT 1, // == STR_PAD_RIGHT 2, // == STR_PAD_BOTH - -2, + -2, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // string data /*10*/ "abc", "STR_PAD_LEFT", "2", "0x2", "02", - + // array values /*15*/ array(), array(0), array(1, 2), - + // boolean values /*18*/ true, false, TRUE, FALSE, - + // null values /*22*/ NULL, null, - + // objects /*24*/ new sample(), - + // undefined variable /*25*/ @$undefined_var, - + // unset variable /*26*/ @$unset_var ); diff --git a/ext/standard/tests/strings/str_replace_basic.phpt b/ext/standard/tests/strings/str_replace_basic.phpt index 10bf542342..a133fd8bd5 100644 --- a/ext/standard/tests/strings/str_replace_basic.phpt +++ b/ext/standard/tests/strings/str_replace_basic.phpt @@ -4,7 +4,7 @@ Test str_replace() function basic function precision=14 --FILE-- <?php -/* +/* Prototype: mixed str_replace(mixed $search, mixed $replace, mixed $subject [, int &$count]); Description: Replace all occurrences of the search string with @@ -27,14 +27,14 @@ var_dump( str_replace("long string here", "", "", $count) ); var_dump( $count ); $fp = fopen( __FILE__, "r" ); -$fp_copy = $fp; +$fp_copy = $fp; var_dump( str_replace($fp_copy, $fp_copy, $fp_copy, $fp_copy) ); var_dump( $fp_copy ); fclose($fp); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- *** Testing str_replace() on basic operations *** string(0) "" string(4) "tbst" diff --git a/ext/standard/tests/strings/str_replace_error.phpt b/ext/standard/tests/strings/str_replace_error.phpt index 9fafc57a39..38c62dc86c 100644 --- a/ext/standard/tests/strings/str_replace_error.phpt +++ b/ext/standard/tests/strings/str_replace_error.phpt @@ -4,7 +4,7 @@ Test str_replace() function error conditions precision=14 --FILE-- <?php -/* +/* Prototype: mixed str_replace(mixed $search, mixed $replace, mixed $subject [, int &$count]); Description: Replace all occurrences of the search string with @@ -22,7 +22,7 @@ var_dump( str_replace(1,2,3,$var,5) ); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- *** Testing str_replace error conditions *** Warning: str_replace() expects at least 3 parameters, 0 given in %sstr_replace_error.php on line 12 NULL diff --git a/ext/standard/tests/strings/str_replace_variation1.phpt b/ext/standard/tests/strings/str_replace_variation1.phpt index 279fb2201f..0dddd2f5d8 100644 --- a/ext/standard/tests/strings/str_replace_variation1.phpt +++ b/ext/standard/tests/strings/str_replace_variation1.phpt @@ -4,7 +4,7 @@ Test str_replace() function - test search values precision=14 --FILE-- <?php -/* +/* Prototype: mixed str_replace(mixed $search, mixed $replace, mixed $subject [, int &$count]); Description: Replace all occurrences of the search string with @@ -21,14 +21,14 @@ $i = 0; foreach( $search_arr as $value ) { echo "\n-- Iteration $i --\n"; /* replace the string in array */ - var_dump( str_replace($value, "FOUND", $search_arr, $count) ); + var_dump( str_replace($value, "FOUND", $search_arr, $count) ); var_dump( $count ); $i++; } ?> ===DONE=== ---EXPECT-- +--EXPECT-- *** Testing str_replace() with various search values *** -- Iteration 0 -- array(12) { diff --git a/ext/standard/tests/strings/str_replace_variation3.phpt b/ext/standard/tests/strings/str_replace_variation3.phpt index 8f6f38f1f9..1042bc3099 100644 --- a/ext/standard/tests/strings/str_replace_variation3.phpt +++ b/ext/standard/tests/strings/str_replace_variation3.phpt @@ -4,7 +4,7 @@ Test str_replace() function precision=14 --FILE-- <?php -/* +/* Prototype: mixed str_replace(mixed $search, mixed $replace, mixed $subject [, int &$count]); Description: Replace all occurrences of the search string with @@ -95,7 +95,7 @@ var_dump($count); echo "\n-- Testing Resources --\n"; $resource1 = fopen( __FILE__, "r" ); $resource2 = opendir( "." ); -var_dump(str_replace("stream", "FOUND", $resource1, $count)); +var_dump(str_replace("stream", "FOUND", $resource1, $count)); var_dump($count); var_dump(str_replace("stream", "FOUND", $resource2, $count)); var_dump($count); @@ -142,7 +142,7 @@ closedir($resource2); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- *** Testing Miscelleneous input data *** string(3) "qqq" int(5) diff --git a/ext/standard/tests/strings/str_rot13_basic.phpt b/ext/standard/tests/strings/str_rot13_basic.phpt index 696d380932..109fdc51cc 100644 --- a/ext/standard/tests/strings/str_rot13_basic.phpt +++ b/ext/standard/tests/strings/str_rot13_basic.phpt @@ -14,16 +14,16 @@ var_dump(str_rot13("abcdefghijklmnopqrstuvwxyz")); echo "\nEnsure numeric characters are left untouched\n"; if (strcmp(str_rot13("0123456789"), "0123456789") == 0) { - echo "Strings equal : TEST PASSED\n"; + echo "Strings equal : TEST PASSED\n"; } else { - echo "Strings unequal : TEST FAILED\n"; + echo "Strings unequal : TEST FAILED\n"; } echo "\nEnsure non-alphabetic characters are left untouched\n"; if (strcmp(str_rot13("!%^&*()_-+={}[]:;@~#<,>.?"), "!%^&*()_-+={}[]:;@~#<,>.?")) { - echo "Strings equal : TEST PASSED\n"; + echo "Strings equal : TEST PASSED\n"; } else { - echo "Strings unequal : TEST FAILED\n"; + echo "Strings unequal : TEST FAILED\n"; } echo "\nEnsure strings round trip\n"; @@ -31,9 +31,9 @@ $str = "str_rot13() tests starting"; $encode = str_rot13($str); $decode = str_rot13($encode); if (strcmp($str, $decode) == 0) { - echo "Strings equal : TEST PASSED\n"; + echo "Strings equal : TEST PASSED\n"; } else { - echo "Strings unequal : TEST FAILED\n"; + echo "Strings unequal : TEST FAILED\n"; } ?> ===DONE=== diff --git a/ext/standard/tests/strings/str_shuffle_basic.phpt b/ext/standard/tests/strings/str_shuffle_basic.phpt index b60a35f560..063ea0199e 100644 --- a/ext/standard/tests/strings/str_shuffle_basic.phpt +++ b/ext/standard/tests/strings/str_shuffle_basic.phpt @@ -27,17 +27,17 @@ $len_ip = strlen($ip); for ($i = 0; $i < $trys; $i++) { $op = str_shuffle($ip); - + if (!is_string($op) || strlen($op) != $len_ip) { - echo "TEST FAILED\n"; - } - + echo "TEST FAILED\n"; + } + // Combination already hit ? if (empty($a[$op])) { // No first time init $a[$op] = 0; } - + // Increment count for this combination $a[$op]++; } diff --git a/ext/standard/tests/strings/str_shuffle_variation1.phpt b/ext/standard/tests/strings/str_shuffle_variation1.phpt index 5c9f5fc13b..367a25af0a 100644 --- a/ext/standard/tests/strings/str_shuffle_variation1.phpt +++ b/ext/standard/tests/strings/str_shuffle_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -33,36 +33,36 @@ $inputs = array ( -2, 2147483647, -2147483648, - + // float values /*6*/ 10.5, -20.5, 10.1234567e10, - + // array values /*9*/ array(), array(0), array(1, 2), - + // boolean values /*12*/ true, false, TRUE, FALSE, - + // null values /*16*/ NULL, null, - + // objects /*18*/ new sample(), - + // resource /*19*/ $file_handle, - + // undefined variable /*20*/ @$undefined_var, - + // unset variable /*21*/ @$unset_var ); diff --git a/ext/standard/tests/strings/str_split_variation4.phpt b/ext/standard/tests/strings/str_split_variation4.phpt index e06c7025d6..444384468a 100644 --- a/ext/standard/tests/strings/str_split_variation4.phpt +++ b/ext/standard/tests/strings/str_split_variation4.phpt @@ -28,7 +28,7 @@ $values = array( 'simple string', //regular string 'It\'s string with quote', //string containing single quote 'string\tcontains\rwhite space\nchars', - 'containing @ # $ % ^ & chars', + 'containing @ # $ % ^ & chars', 'with 1234 numbers', 'with \0 and ".chr(0)."null chars', //for binary safe 'with multiple space char', diff --git a/ext/standard/tests/strings/str_split_variation5.phpt b/ext/standard/tests/strings/str_split_variation5.phpt index 3f8e640f89..b5a175757c 100644 --- a/ext/standard/tests/strings/str_split_variation5.phpt +++ b/ext/standard/tests/strings/str_split_variation5.phpt @@ -11,7 +11,7 @@ Test str_split() function : usage variations - different heredoc strings as 'str */ /* -* Passing different heredoc strings as 'str' argument to the str_split() +* Passing different heredoc strings as 'str' argument to the str_split() * with 'split_length' 10 */ @@ -83,7 +83,7 @@ foreach($heredoc_array as $str) { var_dump( str_split($str, $split_length) ); $count++; }; - + echo "Done" ?> --EXPECT-- diff --git a/ext/standard/tests/strings/str_word_count.phpt b/ext/standard/tests/strings/str_word_count.phpt index a0496cc2cf..f88646370b 100644 --- a/ext/standard/tests/strings/str_word_count.phpt +++ b/ext/standard/tests/strings/str_word_count.phpt @@ -5,11 +5,11 @@ str_word_count() error_reporting(E_ALL); $str = "Hello friend, you're looking good today!"; -$b =& $str; +$b =& $str; var_dump(str_word_count($str, 1)); var_dump(str_word_count($str, 2)); var_dump(str_word_count($str)); -var_dump(str_word_count($str, 3)); +var_dump(str_word_count($str, 3)); var_dump(str_word_count($str, 123)); var_dump(str_word_count($str, -1)); var_dump(str_word_count($str, 999999999)); diff --git a/ext/standard/tests/strings/str_word_count1.phpt b/ext/standard/tests/strings/str_word_count1.phpt index 5f49fcfbf3..e942a17385 100644 --- a/ext/standard/tests/strings/str_word_count1.phpt +++ b/ext/standard/tests/strings/str_word_count1.phpt @@ -10,7 +10,7 @@ var_dump($a); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(0) Warning: str_word_count(): Invalid format value -1 in %s on line %d diff --git a/ext/standard/tests/strings/strcspn_basic.phpt b/ext/standard/tests/strings/strcspn_basic.phpt index 7ed9847edf..01ec5ea321 100644 --- a/ext/standard/tests/strings/strcspn_basic.phpt +++ b/ext/standard/tests/strings/strcspn_basic.phpt @@ -4,7 +4,7 @@ Test strcspn() function : basic functionality <?php /* Prototype : proto int strcspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters not found in mask. - If start or/and length is provided, it works like strcspn(substr($s,$start,$len),$bad_chars) + If start or/and length is provided, it works like strcspn(substr($s,$start,$len),$bad_chars) * Source code: ext/standard/string.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/strcspn_error.phpt b/ext/standard/tests/strings/strcspn_error.phpt index 03b4f2d2cf..4b69063881 100644 --- a/ext/standard/tests/strings/strcspn_error.phpt +++ b/ext/standard/tests/strings/strcspn_error.phpt @@ -4,7 +4,7 @@ Test strcspn() function : error conditions <?php /* Prototype : proto int strcspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters not found in mask. - If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) + If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) * Source code: ext/standard/string.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/strcspn_variation1.phpt b/ext/standard/tests/strings/strcspn_variation1.phpt index 219a12c4bf..81bd018a8a 100644 --- a/ext/standard/tests/strings/strcspn_variation1.phpt +++ b/ext/standard/tests/strings/strcspn_variation1.phpt @@ -4,7 +4,7 @@ Test strcspn() function : usage variations - unexpected values for str argument <?php /* Prototype : proto int strcspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters not found in mask. - If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) + If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) * Source code: ext/standard/string.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/strcspn_variation10.phpt b/ext/standard/tests/strings/strcspn_variation10.phpt index c82d9970fa..7f572283db 100644 --- a/ext/standard/tests/strings/strcspn_variation10.phpt +++ b/ext/standard/tests/strings/strcspn_variation10.phpt @@ -4,7 +4,7 @@ Test strcspn() function : usage variations - with varying mask & default start a <?php /* Prototype : proto int strcspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters not found in mask. - If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) + If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -49,7 +49,7 @@ $mask_array = array( " \t", "\t\i\100\xa" ); - + // loop through each element of the array for mask argument $count = 1; diff --git a/ext/standard/tests/strings/strcspn_variation11.phpt b/ext/standard/tests/strings/strcspn_variation11.phpt index f970f6e3e9..96926564b0 100644 --- a/ext/standard/tests/strings/strcspn_variation11.phpt +++ b/ext/standard/tests/strings/strcspn_variation11.phpt @@ -4,7 +4,7 @@ Test strcspn() function : usage variations - with varying start and default len <?php /* Prototype : proto int strcspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters not found in mask. - If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) + If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -61,7 +61,7 @@ $start_array = array( 2147483647, // max positive integer -2147483648, // min negative integer ); - + // loop through each element of the arrays for str,mask and start arguments $count = 1; diff --git a/ext/standard/tests/strings/strcspn_variation12.phpt b/ext/standard/tests/strings/strcspn_variation12.phpt index f187788d94..55b6b6e2e2 100644 --- a/ext/standard/tests/strings/strcspn_variation12.phpt +++ b/ext/standard/tests/strings/strcspn_variation12.phpt @@ -4,7 +4,7 @@ Test strcspn() function : usage variations - with varying start and len args <?php /* Prototype : proto int strcspn(string str, string mask [,int start [,int len]]) * Description: Finds length of initial segment consisting entirely of characters not found in mask. - If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) + If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -50,7 +50,7 @@ $start_array = array( 2147483647, // max positive integer -2147483648 // min negative integer ); - + //defining array of len values $len_array = array( 0, @@ -60,7 +60,7 @@ $len_array = array( 2147483647, // max positive integer -2147483648 // min negative integer ); - + // loop through each element of the arrays for str,mask,start and len arguments diff --git a/ext/standard/tests/strings/strcspn_variation2.phpt b/ext/standard/tests/strings/strcspn_variation2.phpt index c21af6f256..4935cf4b30 100644 --- a/ext/standard/tests/strings/strcspn_variation2.phpt +++ b/ext/standard/tests/strings/strcspn_variation2.phpt @@ -4,7 +4,7 @@ Test strcspn() function : usage variations - unexpected values for mask argument <?php /* Prototype : proto int strcspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters not found in mask. - If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) + If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) * Source code: ext/standard/string.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/strcspn_variation3.phpt b/ext/standard/tests/strings/strcspn_variation3.phpt index ad09fdbbec..a330c1111a 100644 --- a/ext/standard/tests/strings/strcspn_variation3.phpt +++ b/ext/standard/tests/strings/strcspn_variation3.phpt @@ -4,7 +4,7 @@ Test strcspn() function : usage variations - unexpected values of start argument <?php /* Prototype : proto int strcspn(string str, string mask [,int start [,int len]]) * Description: Finds length of initial segment consisting entirely of characters not found in mask. - If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) + If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) * Source code: ext/standard/string.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/strcspn_variation4.phpt b/ext/standard/tests/strings/strcspn_variation4.phpt index d7c6750233..0af1228293 100644 --- a/ext/standard/tests/strings/strcspn_variation4.phpt +++ b/ext/standard/tests/strings/strcspn_variation4.phpt @@ -6,7 +6,7 @@ Test strcspn() function : usage variations - unexpected values of len argument <?php /* Prototype : proto int strcspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters not found in mask. - If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) + If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) * Source code: ext/standard/string.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/strcspn_variation6.phpt b/ext/standard/tests/strings/strcspn_variation6.phpt index 712f139c55..4d6c81d0fb 100644 --- a/ext/standard/tests/strings/strcspn_variation6.phpt +++ b/ext/standard/tests/strings/strcspn_variation6.phpt @@ -4,7 +4,7 @@ Test strcspn() function : usage variations - with heredoc strings, varying mask <?php /* Prototype : proto int strcspn(string str, string mask [,int start [,int len]]) * Description: Finds length of initial segment consisting entirely of characters not found in mask. - If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) + If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -73,7 +73,7 @@ $mask_array = array( " \t", "\t\i\100\xaa" ); - + // loop through each element of the arrays for string and mask arguments diff --git a/ext/standard/tests/strings/strcspn_variation7.phpt b/ext/standard/tests/strings/strcspn_variation7.phpt index 3c32fee7de..ada8681914 100644 --- a/ext/standard/tests/strings/strcspn_variation7.phpt +++ b/ext/standard/tests/strings/strcspn_variation7.phpt @@ -4,7 +4,7 @@ Test strcspn() function : usage variations - with heredoc strings, varying start <?php /* Prototype : proto int strcspn(string str, string mask [, int start [,int len]]) * Description: Finds length of initial segment consisting entirely of characters not found in mask. - If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) + If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -86,7 +86,7 @@ $start_array = array( 2147483647, // max positive integer -2147483648, // min negative integer ); - + // loop through each element of the arrays for str, mask and start arguments diff --git a/ext/standard/tests/strings/strcspn_variation8.phpt b/ext/standard/tests/strings/strcspn_variation8.phpt index fff6e1ab0c..6881b07e50 100644 --- a/ext/standard/tests/strings/strcspn_variation8.phpt +++ b/ext/standard/tests/strings/strcspn_variation8.phpt @@ -4,7 +4,7 @@ Test strcspn() function : usage variations - with heredoc strings, varying start <?php /* Prototype : proto int strcspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters not found in mask. - If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) + If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -80,7 +80,7 @@ $start_array = array( 2147483647, // max positive integer -2147483648, // min negative integer ); - + // defining array of len values $len_array = array( 0, @@ -90,7 +90,7 @@ $len_array = array( 2147483647, // max positive integer -2147483648, // min negative integer ); - + // loop through each element of the arrays for all arguments @@ -100,7 +100,7 @@ foreach($heredoc_strings as $str) { foreach($mask_array as $mask) { foreach($start_array as $start) { foreach($len_array as $len) { - var_dump( strcspn($str,$mask,$start,$len) ); + var_dump( strcspn($str,$mask,$start,$len) ); } } } diff --git a/ext/standard/tests/strings/strip_tags_basic1.phpt b/ext/standard/tests/strings/strip_tags_basic1.phpt index d6d5d6e479..05380ddff5 100644 --- a/ext/standard/tests/strings/strip_tags_basic1.phpt +++ b/ext/standard/tests/strings/strip_tags_basic1.phpt @@ -28,8 +28,8 @@ $string_array = array ( "<html><!-- COMMENT --></html>", '<html><!-- COMMENT --></html>' ); - - + + // Calling strip_tags() with default arguments // loop through the $string_array to test strip_tags on various inputs $iteration = 1; diff --git a/ext/standard/tests/strings/strip_tags_variation1.phpt b/ext/standard/tests/strings/strip_tags_variation1.phpt index 56c8c28850..c02027d5df 100644 --- a/ext/standard/tests/strings/strip_tags_variation1.phpt +++ b/ext/standard/tests/strings/strip_tags_variation1.phpt @@ -37,44 +37,44 @@ $values = array( 1, 12345, -2345, - + // float data /*5*/ 10.5, -10.5, 10.1234567e10, 10.7654321E-10, .5, - + // array data /*10*/ array(), array(0), array(1), array(1, 2), array('color' => 'red', 'item' => 'pen'), - + // null data /*15*/ NULL, null, - + // boolean data /*17*/ true, false, TRUE, FALSE, - + // empty data /*21*/ "", '', - + // object data /*23*/ new classA(), - + // undefined data /*24*/ @$undefined_var, - + // unset data /*25*/ @$unset_var, - + // resource variable /*26*/ $fp diff --git a/ext/standard/tests/strings/strip_tags_variation11.phpt b/ext/standard/tests/strings/strip_tags_variation11.phpt index e592166d5f..3c6200ee48 100644 --- a/ext/standard/tests/strings/strip_tags_variation11.phpt +++ b/ext/standard/tests/strings/strip_tags_variation11.phpt @@ -14,8 +14,8 @@ $string_array = array ( 'hello <img title=">_<"> world', "hello <img title='>_<'> world" ); - - + + // Calling strip_tags() with default arguments // loop through the $string_array to test strip_tags on various inputs $iteration = 1; diff --git a/ext/standard/tests/strings/stripcslashes_variation1.phpt b/ext/standard/tests/strings/stripcslashes_variation1.phpt index a2754c6103..d08082e302 100644 --- a/ext/standard/tests/strings/stripcslashes_variation1.phpt +++ b/ext/standard/tests/strings/stripcslashes_variation1.phpt @@ -23,7 +23,7 @@ unset($unset_var); class sample { public function __toString() { return "obj'ct"; - } + } } // Defining resource @@ -37,43 +37,43 @@ $values = array ( 1, 12345, -2345, - + // float values /*5*/ 10.5, -10.5, 10.1234567e10, 10.7654321E-10, .5, - + // array values /*10*/ array(), array(0), array(1), array(1, 2), array('color' => 'red', 'item' => 'pen'), - + // boolean values /*15*/ true, false, TRUE, FALSE, - + // empty string /*19*/ "", '', - + // undefined variable /*21*/ $undefined_var, - + // unset variable /*22*/ $unset_var, - + // objects /*23*/ new sample(), - + // resource /*24*/ $file_handle, - + // null values /*25*/ NULL, null diff --git a/ext/standard/tests/strings/stripos_variation1.phpt b/ext/standard/tests/strings/stripos_variation1.phpt index 1494076586..a3fc324dd7 100644 --- a/ext/standard/tests/strings/stripos_variation1.phpt +++ b/ext/standard/tests/strings/stripos_variation1.phpt @@ -70,7 +70,7 @@ $needle = array( "456HEE", //numerics + chars $haystack //haystack as needle ); - + /* loop through to get the position of the needle in haystack string */ $count = 1; for($index=0; $index<count($needle); $index++) { diff --git a/ext/standard/tests/strings/stripos_variation10.phpt b/ext/standard/tests/strings/stripos_variation10.phpt index 70291c48a3..409c041dbd 100644 --- a/ext/standard/tests/strings/stripos_variation10.phpt +++ b/ext/standard/tests/strings/stripos_variation10.phpt @@ -21,7 +21,7 @@ unset($unset_var); class sample { public function __toString() { return "object"; - } + } } //getting the resource diff --git a/ext/standard/tests/strings/stripos_variation11.phpt b/ext/standard/tests/strings/stripos_variation11.phpt index d4fa84a613..b4b83a1641 100644 --- a/ext/standard/tests/strings/stripos_variation11.phpt +++ b/ext/standard/tests/strings/stripos_variation11.phpt @@ -19,11 +19,11 @@ unset($unset_var); class sample { public function __toString() { return "object"; - } + } } //getting the resource -$file_handle = fopen(__FILE__, "r"); +$file_handle = fopen(__FILE__, "r"); // array with different values $values = array ( diff --git a/ext/standard/tests/strings/stripos_variation14.phpt b/ext/standard/tests/strings/stripos_variation14.phpt index ecf9d47502..10b481fb71 100644 --- a/ext/standard/tests/strings/stripos_variation14.phpt +++ b/ext/standard/tests/strings/stripos_variation14.phpt @@ -19,11 +19,11 @@ unset($unset_var); class sample { public function __toString() { return "object"; - } + } } //getting the resource -$file_handle = fopen(__FILE__, "r"); +$file_handle = fopen(__FILE__, "r"); //definition of input args $haystack = "hello world"; diff --git a/ext/standard/tests/strings/stripos_variation15.phpt b/ext/standard/tests/strings/stripos_variation15.phpt index 819baf08c4..f8d4f029fe 100644 --- a/ext/standard/tests/strings/stripos_variation15.phpt +++ b/ext/standard/tests/strings/stripos_variation15.phpt @@ -21,11 +21,11 @@ unset($unset_var); class sample { public function __toString() { return "object"; - } + } } //getting the resource -$file_handle = fopen(__FILE__, "r"); +$file_handle = fopen(__FILE__, "r"); // array with different values $values = array ( diff --git a/ext/standard/tests/strings/stripos_variation9.phpt b/ext/standard/tests/strings/stripos_variation9.phpt index 8f44e2fcfd..c0713c57ab 100644 --- a/ext/standard/tests/strings/stripos_variation9.phpt +++ b/ext/standard/tests/strings/stripos_variation9.phpt @@ -19,7 +19,7 @@ unset($unset_var); class sample { public function __toString() { return "object"; - } + } } //getting the resource diff --git a/ext/standard/tests/strings/stripslashes_variation1.phpt b/ext/standard/tests/strings/stripslashes_variation1.phpt index fb104199bd..6f2e928cd5 100644 --- a/ext/standard/tests/strings/stripslashes_variation1.phpt +++ b/ext/standard/tests/strings/stripslashes_variation1.phpt @@ -22,7 +22,7 @@ unset($unset_var); class sample { public function __toString() { return "obj\'ct"; - } + } } // Defining resource @@ -36,43 +36,43 @@ $values = array ( 1, 12345, -2345, - + // float values /*5*/ 10.5, -10.5, 10.1234567e10, 10.7654321E-10, .5, - + // array values /*10*/ array(), array(0), array(1), array(1, 2), array('color' => 'red', 'item' => 'pen'), - + // boolean values /*15*/ true, false, TRUE, FALSE, - + // empty string /*19*/ "", '', - + // undefined variable /*21*/ $undefined_var, - + // unset variable /*22*/ $unset_var, - + // objects /*23*/ new sample(), - + // resource /*24*/ $file_handle, - + // null values /*25*/ NULL, null diff --git a/ext/standard/tests/strings/stripslashes_variation3.phpt b/ext/standard/tests/strings/stripslashes_variation3.phpt index 830d798c4a..61af9db836 100644 --- a/ext/standard/tests/strings/stripslashes_variation3.phpt +++ b/ext/standard/tests/strings/stripslashes_variation3.phpt @@ -25,7 +25,7 @@ This is line 2 \tof "heredoc" string EOT; // initialising the string array -$str_array = array( +$str_array = array( // string with newline character "\n", "\\n", @@ -36,7 +36,7 @@ $str_array = array( 'Hello \nworld', 'Hello \\nworld', $heredoc_string_with_newline, - + // string with tab character "\t", "\\t", diff --git a/ext/standard/tests/strings/stripslashes_variation4.phpt b/ext/standard/tests/strings/stripslashes_variation4.phpt index d78076e22c..32e0c2fdc3 100644 --- a/ext/standard/tests/strings/stripslashes_variation4.phpt +++ b/ext/standard/tests/strings/stripslashes_variation4.phpt @@ -15,7 +15,7 @@ echo "*** Testing stripslashes() : with double dimensional arrays ***\n"; // initialising the string array -$str_array = array( +$str_array = array( array("", array()), array("", array("")), array("f\\'oo", "b\\'ar", array("fo\\'o", "b\\'ar")), diff --git a/ext/standard/tests/strings/stristr_variation1.phpt b/ext/standard/tests/strings/stristr_variation1.phpt index f1e78bc4bd..795bf09323 100644 --- a/ext/standard/tests/strings/stristr_variation1.phpt +++ b/ext/standard/tests/strings/stristr_variation1.phpt @@ -17,7 +17,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -31,36 +31,36 @@ $inputs = array ( 1, -2, -PHP_INT_MAX, - + // float values /*5*/ 10.5, -20.5, 10.1234567e10, - + // array values /*8*/ array(), array(0), array(1, 2), - + // boolean values /*11*/ true, false, TRUE, FALSE, - + // null values /*15*/ NULL, null, - + // objects /*17*/ new sample(), - + // resource /*18*/ $file_handle, - + // undefined variable /*19*/ @$undefined_var, - + // unset variable /*20*/ @$unset_var ); diff --git a/ext/standard/tests/strings/stristr_variation2.phpt b/ext/standard/tests/strings/stristr_variation2.phpt index 644fe24b10..4a0b62f261 100644 --- a/ext/standard/tests/strings/stristr_variation2.phpt +++ b/ext/standard/tests/strings/stristr_variation2.phpt @@ -17,7 +17,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -31,36 +31,36 @@ $inputs = array ( 1, -2, -PHP_INT_MAX, - + // float values /*5*/ 10.5, -20.5, 10.1234567e10, - + // array values /*8*/ array(), array(0), array(1, 2), - + // boolean values /*11*/ true, false, TRUE, FALSE, - + // null values /*15*/ NULL, null, - + // objects /*17*/ new sample(), - + // resource /*18*/ $file_handle, - + // undefined variable /*19*/ @$undefined_var, - + // unset variable /*20*/ @$unset_var ); diff --git a/ext/standard/tests/strings/strlen_variation1.phpt b/ext/standard/tests/strings/strlen_variation1.phpt index 9ba138e57c..f1d6b6b978 100644 --- a/ext/standard/tests/strings/strlen_variation1.phpt +++ b/ext/standard/tests/strings/strlen_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -33,36 +33,36 @@ $inputs = array ( -2, 2147483647, -2147483648, - + // float values /*6*/ 10.5, -20.5, 10.1234567e10, - + // array values /*9*/ array(), array(0), array(1, 2), - + // boolean values /*12*/ true, false, TRUE, FALSE, - + // null values /*16*/ NULL, null, - + // objects /*18*/ new sample(), - + // resource /*19*/ $file_handle, - + // undefined variable /*20*/ @$undefined_var, - + // unset variable /*21*/ @$unset_var ); diff --git a/ext/standard/tests/strings/strnatcasecmp_basic.phpt b/ext/standard/tests/strings/strnatcasecmp_basic.phpt index d385c1958a..da71edf79c 100644 --- a/ext/standard/tests/strings/strnatcasecmp_basic.phpt +++ b/ext/standard/tests/strings/strnatcasecmp_basic.phpt @@ -7,7 +7,7 @@ Felix De Vliegher <felix.devliegher@gmail.com> /* Prototype : int strnatcasecmp(string s1, string s2) * Description: Returns the result of case-insensitive string comparison using 'natural' algorithm * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ function str_dump($one, $two) { diff --git a/ext/standard/tests/strings/strnatcasecmp_variation1.phpt b/ext/standard/tests/strings/strnatcasecmp_variation1.phpt index e74f6b73e9..a2f7ad38ca 100644 --- a/ext/standard/tests/strings/strnatcasecmp_variation1.phpt +++ b/ext/standard/tests/strings/strnatcasecmp_variation1.phpt @@ -7,7 +7,7 @@ Felix De Vliegher <felix.devliegher@gmail.com> /* Prototype : int strnatcasecmp(string s1, string s2) * Description: Returns the result of case-insensitive string comparison using 'natural' algorithm * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ /* Preparation */ diff --git a/ext/standard/tests/strings/strnatcmp_basic.phpt b/ext/standard/tests/strings/strnatcmp_basic.phpt index bef01de653..c80a8e062e 100644 --- a/ext/standard/tests/strings/strnatcmp_basic.phpt +++ b/ext/standard/tests/strings/strnatcmp_basic.phpt @@ -34,7 +34,7 @@ var_dump(strnatcmp($d1, $c2)); echo "Equal too tests\n"; var_dump(strnatcmp($b1, $b1)); -var_dump(strnatcmp($b1, $b2)); +var_dump(strnatcmp($b1, $b2)); echo "Greater than tests\n"; var_dump(strnatcmp($b1, $a1)); diff --git a/ext/standard/tests/strings/strncasecmp_variation10.phpt b/ext/standard/tests/strings/strncasecmp_variation10.phpt index adc9253964..8eb03ee518 100644 --- a/ext/standard/tests/strings/strncasecmp_variation10.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation10.phpt @@ -32,7 +32,7 @@ $values = array ( 1, 12345, -2345, - + /* float values */ 10.5, -10.5, @@ -43,7 +43,7 @@ $values = array ( /* hexadecimal values */ 0x12, -0x12, - + /* octal values */ 012, -012, diff --git a/ext/standard/tests/strings/strncasecmp_variation11.phpt b/ext/standard/tests/strings/strncasecmp_variation11.phpt index 03cc837077..d382df0a8e 100644 --- a/ext/standard/tests/strings/strncasecmp_variation11.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation11.phpt @@ -32,7 +32,7 @@ $values = array ( 1, 12345, -2345, - + /* float values */ 10.5, -10.5, @@ -43,7 +43,7 @@ $values = array ( /* hexadecimal values */ 0x12, -0x12, - + /* octal values */ 012, -012, diff --git a/ext/standard/tests/strings/strncasecmp_variation3.phpt b/ext/standard/tests/strings/strncasecmp_variation3.phpt index 5db892cfa1..b6d0f2917b 100644 --- a/ext/standard/tests/strings/strncasecmp_variation3.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation3.phpt @@ -20,7 +20,7 @@ for($len = strlen($str1); $len >= 0; $len--) { } echo "*** Done ***\n"; ?> ---EXPECT-- +--EXPECT-- *** Test strncasecmp() function: with different lengths *** int(0) int(0) diff --git a/ext/standard/tests/strings/strncasecmp_variation4.phpt b/ext/standard/tests/strings/strncasecmp_variation4.phpt index 9d46db9ee1..bc680caa31 100644 --- a/ext/standard/tests/strings/strncasecmp_variation4.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation4.phpt @@ -32,7 +32,7 @@ $values = array ( 1, 12345, -2345, - + /* float values */ 10.5, -10.5, @@ -43,7 +43,7 @@ $values = array ( /* hexadecimal values */ 0x12, -0x12, - + /* octal values */ 012, -012, diff --git a/ext/standard/tests/strings/strncasecmp_variation8.phpt b/ext/standard/tests/strings/strncasecmp_variation8.phpt index 6011a7b0fd..680653af90 100644 --- a/ext/standard/tests/strings/strncasecmp_variation8.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation8.phpt @@ -2,7 +2,7 @@ Test strncasecmp() function: usage variations - single quoted strings --FILE-- <?php -/* Prototype : int strncasecmp ( string $str1, string $str2, int $len ); +/* Prototype : int strncasecmp ( string $str1, string $str2, int $len ); * Description: Binary safe case-insensitive string comparison of the first n characters * Source code: Zend/zend_builtin_functions.c */ diff --git a/ext/standard/tests/strings/strncmp_variation1.phpt b/ext/standard/tests/strings/strncmp_variation1.phpt index 2fc3c3d4c7..7bc91784b3 100644 --- a/ext/standard/tests/strings/strncmp_variation1.phpt +++ b/ext/standard/tests/strings/strncmp_variation1.phpt @@ -23,7 +23,7 @@ for($ASCII = 97; $ASCII <= 122; $ASCII++) { } echo "*** Done ***"; ?> ---EXPECTREGEX-- +--EXPECTREGEX-- \*\*\* Test strncmp\(\) function: with alphabets \*\*\* -- Passing upper-case letters for 'str1' -- int\(0\) diff --git a/ext/standard/tests/strings/strncmp_variation4.phpt b/ext/standard/tests/strings/strncmp_variation4.phpt index 84684ea551..9958abcaec 100644 --- a/ext/standard/tests/strings/strncmp_variation4.phpt +++ b/ext/standard/tests/strings/strncmp_variation4.phpt @@ -32,7 +32,7 @@ $values = array ( 1, 12345, -2345, - + /* float values */ 10.5, -10.5, @@ -43,7 +43,7 @@ $values = array ( /* hexadecimal values */ 0x12, -0x12, - + /* octal values */ 012, -012, diff --git a/ext/standard/tests/strings/strncmp_variation6.phpt b/ext/standard/tests/strings/strncmp_variation6.phpt index e34d42cefc..f71119faf5 100644 --- a/ext/standard/tests/strings/strncmp_variation6.phpt +++ b/ext/standard/tests/strings/strncmp_variation6.phpt @@ -25,7 +25,7 @@ for($ASCII = 0; $ASCII <= 255; $ASCII++) { } echo "\n-- Checking with out of character's range, given in binary format --\n"; -/* Checking with the out of range ASCII value(given in binary format) */ +/* Checking with the out of range ASCII value(given in binary format) */ $str1 = decbin(256); $str2 = decbin( ord( chr(256) )); var_dump( strncmp($str1, $str2, 8) ); //comparing all the 8-bits; expected: int(1) diff --git a/ext/standard/tests/strings/strncmp_variation8.phpt b/ext/standard/tests/strings/strncmp_variation8.phpt index bc000d171e..9d8c841d68 100644 --- a/ext/standard/tests/strings/strncmp_variation8.phpt +++ b/ext/standard/tests/strings/strncmp_variation8.phpt @@ -2,7 +2,7 @@ Test strncmp() function: usage variations - single quoted strings --FILE-- <?php -/* Prototype : int strncmp ( string $str1, string $str2, int $len ); +/* Prototype : int strncmp ( string $str1, string $str2, int $len ); * Description: Binary safe case-sensitive string comparison of the first n characters * Source code: Zend/zend_builtin_functions.c */ diff --git a/ext/standard/tests/strings/strncmp_variation9.phpt b/ext/standard/tests/strings/strncmp_variation9.phpt index 1c83e80f09..194642fad4 100644 --- a/ext/standard/tests/strings/strncmp_variation9.phpt +++ b/ext/standard/tests/strings/strncmp_variation9.phpt @@ -22,7 +22,7 @@ EOD; $str2 = <<<identifier_str2 Example of heredoc string, whose identifier -having underscore("_") +having underscore("_") & numeric value. identifier_str2; diff --git a/ext/standard/tests/strings/strpbrk_basic.phpt b/ext/standard/tests/strings/strpbrk_basic.phpt index 23d59c2ff4..7cc36bec7e 100644 --- a/ext/standard/tests/strings/strpbrk_basic.phpt +++ b/ext/standard/tests/strings/strpbrk_basic.phpt @@ -5,7 +5,7 @@ Test strpbrk() function : basic functionality /* Prototype : array strpbrk(string haystack, string char_list) * Description: Search a string for any of a set of characters * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strpbrk() : basic functionality ***\n"; diff --git a/ext/standard/tests/strings/strpbrk_error.phpt b/ext/standard/tests/strings/strpbrk_error.phpt index 85729ea112..009aac699a 100644 --- a/ext/standard/tests/strings/strpbrk_error.phpt +++ b/ext/standard/tests/strings/strpbrk_error.phpt @@ -5,7 +5,7 @@ Test strpbrk() function : error conditions /* Prototype : array strpbrk(string haystack, string char_list) * Description: Search a string for any of a set of characters * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strpbrk() : error conditions ***\n"; diff --git a/ext/standard/tests/strings/strrchr.phpt b/ext/standard/tests/strings/strrchr.phpt index e98119ad8b..2af3726480 100644 --- a/ext/standard/tests/strings/strrchr.phpt +++ b/ext/standard/tests/strings/strrchr.phpt @@ -12,7 +12,7 @@ var_dump(strrchr("test".chr(0)."string", "t")); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- bool(false) bool(false) bool(false) diff --git a/ext/standard/tests/strings/strrchr_basic.phpt b/ext/standard/tests/strings/strrchr_basic.phpt index 5c3be8c121..5a2f86619c 100644 --- a/ext/standard/tests/strings/strrchr_basic.phpt +++ b/ext/standard/tests/strings/strrchr_basic.phpt @@ -10,8 +10,8 @@ Test strrchr() function : basic functionality echo "*** Testing strrchr() function: basic functionality ***\n"; var_dump( strrchr("Hello, World", "H") ); //needle as single char var_dump( strrchr("Hello, World", "Hello") ); //needle as a first word of haystack -var_dump( strrchr('Hello, World', 'H') ); -var_dump( strrchr('Hello, World', 'Hello') ); +var_dump( strrchr('Hello, World', 'H') ); +var_dump( strrchr('Hello, World', 'Hello') ); //considering case var_dump( strrchr("Hello, World", "h") ); diff --git a/ext/standard/tests/strings/strrchr_variation10.phpt b/ext/standard/tests/strings/strrchr_variation10.phpt index fc69a76b1a..35ca3c6330 100644 --- a/ext/standard/tests/strings/strrchr_variation10.phpt +++ b/ext/standard/tests/strings/strrchr_variation10.phpt @@ -21,7 +21,7 @@ unset($unset_var); class sample { public function __toString() { return "object"; - } + } } //getting the resource diff --git a/ext/standard/tests/strings/strrchr_variation11.phpt b/ext/standard/tests/strings/strrchr_variation11.phpt index b30ecbf242..67939daba5 100644 --- a/ext/standard/tests/strings/strrchr_variation11.phpt +++ b/ext/standard/tests/strings/strrchr_variation11.phpt @@ -19,7 +19,7 @@ unset($unset_var); class sample { public function __toString() { return "object"; - } + } } //getting the resource diff --git a/ext/standard/tests/strings/strrchr_variation2.phpt b/ext/standard/tests/strings/strrchr_variation2.phpt index 46d7e99e5f..4e42818938 100644 --- a/ext/standard/tests/strings/strrchr_variation2.phpt +++ b/ext/standard/tests/strings/strrchr_variation2.phpt @@ -71,7 +71,7 @@ $needle = array( 42, //needle as int(ASCII value of '*') $haystack //haystack as needle ); - + /* loop through to get the position of the needle in haystack string */ $count = 1; for($index=0; $index<count($needle); $index++) { diff --git a/ext/standard/tests/strings/strrchr_variation3.phpt b/ext/standard/tests/strings/strrchr_variation3.phpt index 947d613ee2..be4a95468d 100644 --- a/ext/standard/tests/strings/strrchr_variation3.phpt +++ b/ext/standard/tests/strings/strrchr_variation3.phpt @@ -19,14 +19,14 @@ using heredoc syntax. EOD; $needles = array( - "ing", - "", + "ing", + "", " ", $multi_line_str //needle as haystack ); //loop through to test strrchr() with each needle -foreach($needles as $needle) { +foreach($needles as $needle) { var_dump( strrchr($multi_line_str, $needle) ); } diff --git a/ext/standard/tests/strings/strrchr_variation9.phpt b/ext/standard/tests/strings/strrchr_variation9.phpt index 4d80825c85..1a86ba0cb1 100644 --- a/ext/standard/tests/strings/strrchr_variation9.phpt +++ b/ext/standard/tests/strings/strrchr_variation9.phpt @@ -21,7 +21,7 @@ unset($unset_var); class sample { public function __toString() { return "object"; - } + } } //getting the resource @@ -108,7 +108,7 @@ $needles = array ( //empty string "", '', - + //resource variable in string form "\$file_handle", diff --git a/ext/standard/tests/strings/strrev.phpt b/ext/standard/tests/strings/strrev.phpt index 321aca5bd7..92c66817d9 100644 --- a/ext/standard/tests/strings/strrev.phpt +++ b/ext/standard/tests/strings/strrev.phpt @@ -8,7 +8,7 @@ strrev() function while ($i<256) { $str .= chr($i++); } - + var_dump(md5(strrev($str))); var_dump(strrev(NULL)); var_dump(strrev("")); diff --git a/ext/standard/tests/strings/strripos_basic1.phpt b/ext/standard/tests/strings/strripos_basic1.phpt index 759c23114e..70bbdf94e5 100644 --- a/ext/standard/tests/strings/strripos_basic1.phpt +++ b/ext/standard/tests/strings/strripos_basic1.phpt @@ -23,7 +23,7 @@ echo "\n-- single char for needle --\n"; var_dump( strripos("Hello, World", "O") ); var_dump( strripos("Hello, World", ",") ); -echo "\n-- heredoc string for haystack & needle --\n"; +echo "\n-- heredoc string for haystack & needle --\n"; var_dump( strripos($heredoc_str, "Hello, WoRLd") ); var_dump( strripos($heredoc_str, 'HelLO') ); var_dump( strripos($heredoc_str, $heredoc_str) ); diff --git a/ext/standard/tests/strings/strripos_basic2.phpt b/ext/standard/tests/strings/strripos_basic2.phpt index d4a1a73f06..72d02d5c80 100644 --- a/ext/standard/tests/strings/strripos_basic2.phpt +++ b/ext/standard/tests/strings/strripos_basic2.phpt @@ -12,25 +12,25 @@ $heredoc_str = <<<EOD Hello, World EOD; -echo "\n-- regular string for haystack & needle, with various offsets --\n"; +echo "\n-- regular string for haystack & needle, with various offsets --\n"; var_dump( strripos("Hello, World", "HeLLo", 0) ); var_dump( strripos("Hello, World", 'Hello', 1) ); var_dump( strripos('Hello, World', 'world', 1) ); var_dump( strripos('Hello, World', "WorLD", 5) ); -echo "\n-- heredoc string for haystack & needle, with various offsets --\n"; +echo "\n-- heredoc string for haystack & needle, with various offsets --\n"; var_dump( strripos($heredoc_str, "Hello, WORLD", 0) ); var_dump( strripos($heredoc_str, 'HelLo', 0) ); var_dump( strripos($heredoc_str, 'HeLLo', 1) ); var_dump( strripos($heredoc_str, $heredoc_str, 0) ); var_dump( strripos($heredoc_str, $heredoc_str, 1) ); -echo "\n-- various +ve offsets --\n"; +echo "\n-- various +ve offsets --\n"; var_dump( strripos("Hello, World", "O", 3) ); var_dump( strripos("Hello, World", "O", 6) ); var_dump( strripos("Hello, World", "O", 10) ); -echo "\n-- various -ve offsets --\n"; +echo "\n-- various -ve offsets --\n"; var_dump( strripos("Hello, World", "O", -1) ); var_dump( strripos("Hello, World", "O", -5) ); var_dump( strripos("Hello, World", "O", -9) ); diff --git a/ext/standard/tests/strings/strripos_offset.phpt b/ext/standard/tests/strings/strripos_offset.phpt index 81e4e2ba8a..70a9534ebd 100644 --- a/ext/standard/tests/strings/strripos_offset.phpt +++ b/ext/standard/tests/strings/strripos_offset.phpt @@ -15,7 +15,7 @@ var_dump(strripos(1024, "te", -PHP_INT_MAX-1)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: strripos() expects parameter 3 to be int, float given in %s on line %d bool(false) diff --git a/ext/standard/tests/strings/strripos_variation1.phpt b/ext/standard/tests/strings/strripos_variation1.phpt index 9ba4091633..0495f6c5f2 100644 --- a/ext/standard/tests/strings/strripos_variation1.phpt +++ b/ext/standard/tests/strings/strripos_variation1.phpt @@ -13,46 +13,46 @@ echo "*** Testing strripos() function: with double quoted strings ***\n"; $haystack = "Hello,\t\n\0\n $&!#%()*<=>?@hello123456he \x234 \101 "; $needles = array( //regular strings -/*1*/ "l", +/*1*/ "l", "L", "HELLO", "hEllo", - + //escape characters -/*5*/ "\t", +/*5*/ "\t", "\T", //invalid input " ", "\n", "\N", //invalid input " ", //new line - + //nulls -/*11*/ "\0", +/*11*/ "\0", NULL, null, - + //boolean false /*14*/ FALSE, false, - + //empty string /*16*/ "", - + //special chars -/*17*/ " ", +/*17*/ " ", "$", " $", "&", - "!#", + "!#", "()", - "<=>", - ">", + "<=>", + ">", "=>", "?", "@", "@hEllo", - + /*29*/ "12345", //decimal numeric string "\x23", //hexadecimal numeric string "#", //respective ASCII char of \x23 @@ -61,7 +61,7 @@ $needles = array( "456HEE", //numerics + chars $haystack //haystack as needle ); - + /* loop through to get the position of the needle in haystack string */ $count = 1; foreach ($needles as $needle) { diff --git a/ext/standard/tests/strings/strripos_variation2.phpt b/ext/standard/tests/strings/strripos_variation2.phpt index 1711537d66..4222b06855 100644 --- a/ext/standard/tests/strings/strripos_variation2.phpt +++ b/ext/standard/tests/strings/strripos_variation2.phpt @@ -13,46 +13,46 @@ echo "*** Testing strripos() function: with single quoted strings ***\n"; $haystack = 'Hello,\t\n\0\n $&!#%()*<=>?@hello123456he \x234 \101 '; $needles = array( //regular strings -/*1*/ 'l', +/*1*/ 'l', 'L', 'HELLO', 'hEllo', - + //escape characters -/*5*/ '\t', +/*5*/ '\t', '\T', ' ', '\n', '\N', ' ', //new line - + //nulls -/*11*/ '\0', +/*11*/ '\0', NULL, null, - + //boolean false /*14*/ FALSE, false, - + //empty string /*16*/ '', - + //special chars -/*17*/ ' ', +/*17*/ ' ', '$', ' $', '&', '!#', '()', - '<=>', + '<=>', '>', '=>', '?', '@', '@hEllo', - + /*29*/ '12345', //decimal numeric string '\x23', //hexadecimal numeric string '#', //respective ASCII char of \x23 diff --git a/ext/standard/tests/strings/strrpos_offset.phpt b/ext/standard/tests/strings/strrpos_offset.phpt index 6ecab108dc..9ef4f42d18 100644 --- a/ext/standard/tests/strings/strrpos_offset.phpt +++ b/ext/standard/tests/strings/strrpos_offset.phpt @@ -14,7 +14,7 @@ var_dump(strrpos(1024, "te", -PHP_INT_MAX-1)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: strrpos() expects parameter 3 to be int, float given in %s on line %d bool(false) diff --git a/ext/standard/tests/strings/strrpos_variation1.phpt b/ext/standard/tests/strings/strrpos_variation1.phpt index 88da3d8230..ceb49df819 100644 --- a/ext/standard/tests/strings/strrpos_variation1.phpt +++ b/ext/standard/tests/strings/strrpos_variation1.phpt @@ -13,13 +13,13 @@ echo "*** Testing strrpos() function: with double quoted strings ***\n"; $haystack = "Hello,\t\n\0\n $&!#%()*<=>?@hello123456he \x234 \101 "; $needle = array( //regular strings - "l", + "l", "L", "HELLO", "hEllo", //escape characters - "\t", + "\t", "\T", //invalid input " ", "\n", @@ -28,7 +28,7 @@ $needle = array( ", //new line //nulls - "\0", + "\0", NULL, null, @@ -40,14 +40,14 @@ $needle = array( "", //special chars - " ", + " ", "$", " $", "&", - "!#", + "!#", "()", - "<=>", - ">", + "<=>", + ">", "=>", "?", "@", @@ -61,7 +61,7 @@ $needle = array( "456HEE", //numerics + chars $haystack //haystack as needle ); - + /* loop through to get the position of the needle in haystack string */ $count = 1; for($index=0; $index<count($needle); $index++) { diff --git a/ext/standard/tests/strings/strrpos_variation10.phpt b/ext/standard/tests/strings/strrpos_variation10.phpt index 1fc97ad4bd..c2e78f15cd 100644 --- a/ext/standard/tests/strings/strrpos_variation10.phpt +++ b/ext/standard/tests/strings/strrpos_variation10.phpt @@ -21,7 +21,7 @@ unset($unset_var); class sample { public function __toString() { return "object"; - } + } } //getting the resource diff --git a/ext/standard/tests/strings/strrpos_variation11.phpt b/ext/standard/tests/strings/strrpos_variation11.phpt index a5d24220ea..7822b759e2 100644 --- a/ext/standard/tests/strings/strrpos_variation11.phpt +++ b/ext/standard/tests/strings/strrpos_variation11.phpt @@ -19,11 +19,11 @@ unset($unset_var); class sample { public function __toString() { return "object"; - } + } } //getting the resource -$file_handle = fopen(__FILE__, "r"); +$file_handle = fopen(__FILE__, "r"); // array with different values $values = array ( diff --git a/ext/standard/tests/strings/strrpos_variation14.phpt b/ext/standard/tests/strings/strrpos_variation14.phpt index a0586db20f..db4a0590d0 100644 --- a/ext/standard/tests/strings/strrpos_variation14.phpt +++ b/ext/standard/tests/strings/strrpos_variation14.phpt @@ -21,11 +21,11 @@ unset($unset_var); class sample { public function __toString() { return "object"; - } + } } //getting the resource -$file_handle = fopen(__FILE__, "r"); +$file_handle = fopen(__FILE__, "r"); //definition of input args $haystack = "hello world"; diff --git a/ext/standard/tests/strings/strrpos_variation15.phpt b/ext/standard/tests/strings/strrpos_variation15.phpt index 1b8983ed1f..798a6877e4 100644 --- a/ext/standard/tests/strings/strrpos_variation15.phpt +++ b/ext/standard/tests/strings/strrpos_variation15.phpt @@ -21,11 +21,11 @@ unset($unset_var); class sample { public function __toString() { return "object"; - } + } } //getting the resource -$file_handle = fopen(__FILE__, "r"); +$file_handle = fopen(__FILE__, "r"); // array with different values $values = array ( diff --git a/ext/standard/tests/strings/strrpos_variation2.phpt b/ext/standard/tests/strings/strrpos_variation2.phpt index 510f92ae0b..7027c069c7 100644 --- a/ext/standard/tests/strings/strrpos_variation2.phpt +++ b/ext/standard/tests/strings/strrpos_variation2.phpt @@ -13,13 +13,13 @@ echo "*** Testing strrpos() function: with single quoted strings ***\n"; $haystack = 'Hello,\t\n\0\n $&!#%()*<=>?@hello123456he \x234 \101 '; $needle = array( //regular strings - 'l', + 'l', 'L', 'HELLO', 'hEllo', //escape characters - '\t', + '\t', '\T', ' ', '\n', @@ -28,7 +28,7 @@ $needle = array( ', //new line //nulls - '\0', + '\0', NULL, null, @@ -40,13 +40,13 @@ $needle = array( '', //special chars - ' ', + ' ', '$', ' $', '&', '!#', '()', - '<=>', + '<=>', '>', '=>', '?', diff --git a/ext/standard/tests/strings/strrpos_variation9.phpt b/ext/standard/tests/strings/strrpos_variation9.phpt index 04d8f44e8b..576d5b41e4 100644 --- a/ext/standard/tests/strings/strrpos_variation9.phpt +++ b/ext/standard/tests/strings/strrpos_variation9.phpt @@ -19,7 +19,7 @@ unset($unset_var); class sample { public function __toString() { return "object"; - } + } } //getting the resource diff --git a/ext/standard/tests/strings/strspn_basic.phpt b/ext/standard/tests/strings/strspn_basic.phpt index dd43470826..2da0f528e3 100644 --- a/ext/standard/tests/strings/strspn_basic.phpt +++ b/ext/standard/tests/strings/strspn_basic.phpt @@ -4,7 +4,7 @@ Test strspn() function : basic functionality <?php /* Prototype : proto int strspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters found in mask. - If start or/and length is provided, it works like strspn(substr($s,$start,$len),$good_chars) + If start or/and length is provided, it works like strspn(substr($s,$start,$len),$good_chars) * Source code: ext/standard/string.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/strspn_error.phpt b/ext/standard/tests/strings/strspn_error.phpt index caa1f901a1..494bcd6a05 100644 --- a/ext/standard/tests/strings/strspn_error.phpt +++ b/ext/standard/tests/strings/strspn_error.phpt @@ -4,7 +4,7 @@ Test strspn() function : error conditions <?php /* Prototype : proto int strspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters found in mask. - If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) + If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) * Source code: ext/standard/string.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/strspn_variation1.phpt b/ext/standard/tests/strings/strspn_variation1.phpt index 45e71edc28..6b73b212ea 100644 --- a/ext/standard/tests/strings/strspn_variation1.phpt +++ b/ext/standard/tests/strings/strspn_variation1.phpt @@ -4,7 +4,7 @@ Test strspn() function : usage variations - unexpected values for str argument <?php /* Prototype : proto int strspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters found in mask. - If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) + If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) * Source code: ext/standard/string.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/strspn_variation10.phpt b/ext/standard/tests/strings/strspn_variation10.phpt index 6c87eb01db..63071e3320 100644 --- a/ext/standard/tests/strings/strspn_variation10.phpt +++ b/ext/standard/tests/strings/strspn_variation10.phpt @@ -4,7 +4,7 @@ Test strspn() function : usage variations - with varying mask & default start an <?php /* Prototype : proto int strspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters found in mask. - If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) + If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -50,7 +50,7 @@ $mask_array = array( " \t", "fhel\t\i\100\xa" ); - + // loop through each element of the array for mask argument diff --git a/ext/standard/tests/strings/strspn_variation11.phpt b/ext/standard/tests/strings/strspn_variation11.phpt index 8f85e979a7..41dd46e4f6 100644 --- a/ext/standard/tests/strings/strspn_variation11.phpt +++ b/ext/standard/tests/strings/strspn_variation11.phpt @@ -4,7 +4,7 @@ Test strspn() function : usage variations - with varying start and default len a <?php /* Prototype : proto int strspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters found in mask. - If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) + If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -61,7 +61,7 @@ $start_array = array( 2147483647, // max positive integer -2147483648, // min negative integer ); - + // loop through each element of the arrays for str, mask and start argument $count = 1; diff --git a/ext/standard/tests/strings/strspn_variation12.phpt b/ext/standard/tests/strings/strspn_variation12.phpt index df353ec040..c8dd29f214 100644 --- a/ext/standard/tests/strings/strspn_variation12.phpt +++ b/ext/standard/tests/strings/strspn_variation12.phpt @@ -4,7 +4,7 @@ Test strspn() function : usage variations - with varying start and len args <?php /* Prototype : proto int strspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters found in mask. - If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) + If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -51,7 +51,7 @@ $start_array = array( 2147483647, // max positive integer -2147483648, // min negative integer ); - + // defining an array of len values $len_array = array( 0, @@ -61,7 +61,7 @@ $len_array = array( 2147483647, // max positive integer -2147483648, // min negative integer ); - + // loop through each element of the array for len argument $count = 1; diff --git a/ext/standard/tests/strings/strspn_variation2.phpt b/ext/standard/tests/strings/strspn_variation2.phpt index 57929fa352..b968ce1436 100644 --- a/ext/standard/tests/strings/strspn_variation2.phpt +++ b/ext/standard/tests/strings/strspn_variation2.phpt @@ -4,7 +4,7 @@ Test strspn() function : usage variations - unexpected values for mask argument <?php /* Prototype : proto int strspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters found in mask. - If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) + If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) * Source code: ext/standard/string.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/strspn_variation3.phpt b/ext/standard/tests/strings/strspn_variation3.phpt index db1a51abf4..11a37c6f94 100644 --- a/ext/standard/tests/strings/strspn_variation3.phpt +++ b/ext/standard/tests/strings/strspn_variation3.phpt @@ -4,7 +4,7 @@ Test strspn() function : usage variations - unexpected values of start argument <?php /* Prototype : proto int strspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters found in mask. - If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) + If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) * Source code: ext/standard/string.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/strspn_variation4.phpt b/ext/standard/tests/strings/strspn_variation4.phpt index 74c7db421b..82da538057 100644 --- a/ext/standard/tests/strings/strspn_variation4.phpt +++ b/ext/standard/tests/strings/strspn_variation4.phpt @@ -4,7 +4,7 @@ Test strspn() function : usage variations - unexpected values of len argument <?php /* Prototype : proto int strspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters found in mask. - If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) + If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) * Source code: ext/standard/string.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/strspn_variation6.phpt b/ext/standard/tests/strings/strspn_variation6.phpt index 3e039909e0..b202bb8234 100644 --- a/ext/standard/tests/strings/strspn_variation6.phpt +++ b/ext/standard/tests/strings/strspn_variation6.phpt @@ -4,7 +4,7 @@ Test strspn() function : usage variations - with heredoc strings, varying mask & <?php /* Prototype : proto int strspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters found in mask. - If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) + If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -74,7 +74,7 @@ $mask_array = array( "l \te", "lf\the\i\100\xaa" ); - + // loop through each element of the array for different heredoc and mask strings diff --git a/ext/standard/tests/strings/strspn_variation7.phpt b/ext/standard/tests/strings/strspn_variation7.phpt index b3a4dbe7c3..5b229dad3c 100644 --- a/ext/standard/tests/strings/strspn_variation7.phpt +++ b/ext/standard/tests/strings/strspn_variation7.phpt @@ -4,7 +4,7 @@ Test strspn() function : usage variations - with heredoc strings, varying start <?php /* Prototype : proto int strspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters found in mask. - If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) + If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -85,7 +85,7 @@ $start_array = array( 2147483647, // max positive integer -2147483648, // min negative integer ); - + // loop through each element of the array for heredoc strings, mask strings and start values diff --git a/ext/standard/tests/strings/strspn_variation8.phpt b/ext/standard/tests/strings/strspn_variation8.phpt index 0033aea837..57e0f80ed6 100644 --- a/ext/standard/tests/strings/strspn_variation8.phpt +++ b/ext/standard/tests/strings/strspn_variation8.phpt @@ -4,7 +4,7 @@ Test strspn() function : usage variations - with heredoc strings, varying start <?php /* Prototype : proto int strspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters found in mask. - If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) + If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -81,7 +81,7 @@ $start_array = array( 2147483647, // max positive integer -2147483648, // min negative integer ); - + // defining array of different len values $len_array = array( 0, @@ -91,13 +91,13 @@ $len_array = array( 2147483647, // max positive integer -2147483648, // min negative integer ); - + // loop through each element of the array for heredoc str, mask str , start values and len values $count = 1; -foreach($heredoc_strings as $str) { +foreach($heredoc_strings as $str) { echo "\n-- Iteration $count --\n"; foreach($mask_array as $mask) { foreach($start_array as $start) { @@ -107,7 +107,7 @@ foreach($heredoc_strings as $str) { } } $count++; -}; +}; echo "Done" ?> diff --git a/ext/standard/tests/strings/strtok_error.phpt b/ext/standard/tests/strings/strtok_error.phpt index 58044e7b62..b05a86c5fd 100644 --- a/ext/standard/tests/strings/strtok_error.phpt +++ b/ext/standard/tests/strings/strtok_error.phpt @@ -29,7 +29,7 @@ var_dump( $str ); // Less than expected number of arguments echo "\n-- Testing strtok() with less than expected no. of arguments --\n"; $str = 'string val'; - + var_dump( strtok($str)); var_dump( $str ); diff --git a/ext/standard/tests/strings/strtok_variation2.phpt b/ext/standard/tests/strings/strtok_variation2.phpt index 68fec53fb6..26de1ae0b5 100644 --- a/ext/standard/tests/strings/strtok_variation2.phpt +++ b/ext/standard/tests/strings/strtok_variation2.phpt @@ -24,7 +24,7 @@ class sample { public function __toString() { return "obj-ect"; } -} +} // Defining resource $file_handle = fopen(__FILE__, 'r'); @@ -74,7 +74,7 @@ $values = array ( // unset variable $unset_var, - + // resource $file_handle ); diff --git a/ext/standard/tests/strings/strtok_variation5.phpt b/ext/standard/tests/strings/strtok_variation5.phpt index 699c7a9695..a99d13eb7a 100644 --- a/ext/standard/tests/strings/strtok_variation5.phpt +++ b/ext/standard/tests/strings/strtok_variation5.phpt @@ -27,7 +27,7 @@ $string_array = array( chr(0).'hello'.chr(0), 'hello'.chr(0).'world' ); -$token_array = array( +$token_array = array( "wr", "hello world", "__", @@ -47,13 +47,13 @@ $token_array = array( $counter =1; foreach( $string_array as $string ) { echo "\n--- Iteration $counter ---\n"; - var_dump( strtok($string, $token_array[$counter-1]) ); + var_dump( strtok($string, $token_array[$counter-1]) ); for( $count = 1; $count <=5; $count++ ) { var_dump( strtok($token_array[$counter-1]) ); } $counter++; -} - +} + echo "Done\n"; ?> diff --git a/ext/standard/tests/strings/strtok_variation6.phpt b/ext/standard/tests/strings/strtok_variation6.phpt index 4b379ec86f..16b64c876c 100644 --- a/ext/standard/tests/strings/strtok_variation6.phpt +++ b/ext/standard/tests/strings/strtok_variation6.phpt @@ -20,7 +20,7 @@ $string_array = array( "/khello\k world/k", "/hellok/ world" ); -$token_array = array( +$token_array = array( "k", "/ ", "/k", @@ -34,16 +34,16 @@ $token_array = array( $counter =1; foreach( $string_array as $string ) { echo "\n--- Iteration $counter ---\n"; - foreach( $token_array as $token ) { - var_dump( strtok($string, $token) ); + foreach( $token_array as $token ) { + var_dump( strtok($string, $token) ); for( $count = 1; $count <=3; $count++ ) { var_dump( strtok($token) ); } echo "\n"; } $counter++; -} - +} + echo "Done\n"; ?> diff --git a/ext/standard/tests/strings/strtok_variation7.phpt b/ext/standard/tests/strings/strtok_variation7.phpt index 9a88c93668..aeb6820f2a 100644 --- a/ext/standard/tests/strings/strtok_variation7.phpt +++ b/ext/standard/tests/strings/strtok_variation7.phpt @@ -17,7 +17,7 @@ $str = "this is a sample string"; $token = " "; echo "\n*** Testing strtok() when string being tokenised is prefixed with another string in between the process ***\n"; -var_dump( strtok($str, $token) ); +var_dump( strtok($str, $token) ); // adding a string to the input string which is being tokenised $str = "extra string ".$str; for( $count = 1; $count <=6; $count++ ) { @@ -25,9 +25,9 @@ for( $count = 1; $count <=6; $count++ ) { var_dump( strtok($token) ); echo "\n-- Input str is \"$str\" --\n"; } - + echo "\n*** Testing strtok() when string being tokenised is suffixed with another string in between the process ***\n"; -var_dump( strtok($str, $token) ); +var_dump( strtok($str, $token) ); // adding a string to the input string which is being tokenised $str = $str." extra string"; for( $count = 1; $count <=10; $count++ ) { diff --git a/ext/standard/tests/strings/strtr_basic.phpt b/ext/standard/tests/strings/strtr_basic.phpt index 8f4ccdc326..5660be9f9b 100644 --- a/ext/standard/tests/strings/strtr_basic.phpt +++ b/ext/standard/tests/strings/strtr_basic.phpt @@ -27,7 +27,7 @@ var_dump( strtr('test strtr', 'test', 'TEST') ); var_dump( strtr($heredoc_str, "test", "TEST") ); //$from and $to are of different lengths, extra chars in the longer one are ignored -var_dump( strtr("test strtr", "test", "TESTz") ); +var_dump( strtr("test strtr", "test", "TESTz") ); var_dump( strtr('test strtr', 'testz', 'TEST') ); var_dump( strtr($heredoc_str, "test", "TESTz") ); diff --git a/ext/standard/tests/strings/strtr_variation5.phpt b/ext/standard/tests/strings/strtr_variation5.phpt index 7f398cfe65..bac7903fa0 100644 --- a/ext/standard/tests/strings/strtr_variation5.phpt +++ b/ext/standard/tests/strings/strtr_variation5.phpt @@ -22,7 +22,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -35,36 +35,36 @@ $strings = array ( /*1*/ 0, 1, -2, - + // float values /*4*/ 10.5, -20.5, 10.1234567e10, - + // array values /*7*/ array(), array(0), array(1, 2), - + // boolean values /*10*/ true, false, TRUE, FALSE, - + // null values /*14*/ NULL, null, - + // objects /*16*/ new sample(), - + // resource /*17*/ $file_handle, - + // undefined variable /*18*/ @$undefined_var, - + // unset variable /*19*/ @$unset_var ); diff --git a/ext/standard/tests/strings/strtr_variation6.phpt b/ext/standard/tests/strings/strtr_variation6.phpt index ba7c72c215..831d81d3fb 100644 --- a/ext/standard/tests/strings/strtr_variation6.phpt +++ b/ext/standard/tests/strings/strtr_variation6.phpt @@ -22,7 +22,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -38,36 +38,36 @@ $from_arr = array ( /*1*/ 0, 1, -2, - + // float values /*4*/ 10.5, -20.5, 10.1234567e10, - + // array values /*7*/ array(), array(0), array(1, 2), - + // boolean values /*10*/ true, false, TRUE, FALSE, - + // null values /*14*/ NULL, null, - + // objects /*16*/ new sample(), - + // resource /*17*/ $file_handle, - + // undefined variable /*18*/ @$undefined_var, - + // unset variable /*19*/ @$unset_var ); diff --git a/ext/standard/tests/strings/strtr_variation7.phpt b/ext/standard/tests/strings/strtr_variation7.phpt index b8d8de7de0..5842795273 100644 --- a/ext/standard/tests/strings/strtr_variation7.phpt +++ b/ext/standard/tests/strings/strtr_variation7.phpt @@ -22,7 +22,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -41,36 +41,36 @@ $to_arr = array ( /*1*/ 0, 1, -2, - + // float values /*4*/ 10.5, -20.5, 10.12345675e10, - + // array values /*7*/ array(), array(0), array(1, 2), - + // boolean values /*10*/ true, false, TRUE, FALSE, - + // null values /*14*/ NULL, null, - + // objects /*16*/ new sample(), - + // resource /*17*/ $file_handle, - + // undefined variable /*18*/ @$undefined_var, - + // unset variable /*19*/ @$unset_var ); diff --git a/ext/standard/tests/strings/strtr_variation8.phpt b/ext/standard/tests/strings/strtr_variation8.phpt index dd10c814f0..646e4b4b22 100644 --- a/ext/standard/tests/strings/strtr_variation8.phpt +++ b/ext/standard/tests/strings/strtr_variation8.phpt @@ -22,7 +22,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource diff --git a/ext/standard/tests/strings/strtr_variation9.phpt b/ext/standard/tests/strings/strtr_variation9.phpt index 107258e2ef..427fde5f75 100644 --- a/ext/standard/tests/strings/strtr_variation9.phpt +++ b/ext/standard/tests/strings/strtr_variation9.phpt @@ -20,7 +20,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -33,38 +33,38 @@ $values = array ( /*1*/ 0, 1, -2, - + // float values /*4*/ 10.5, -20.5, 10.1234567e10, - + // array values /*7*/ array(), array(0), array(1), array(1, 2), array('color' => 'red', 'item' => 'pen'), - + // boolean values /*12*/ true, false, TRUE, FALSE, - + // null values /*16*/ NULL, null, - + // objects /*18*/ new sample(), - + // resource /*19*/ $file_handle, - + // undefined variable /*20*/ @$undefined_var, - + // unset variable /*21*/ @$unset_var ); diff --git a/ext/standard/tests/strings/strtr_with_reference.phpt b/ext/standard/tests/strings/strtr_with_reference.phpt index a28d1e7be9..21cdc20318 100644 --- a/ext/standard/tests/strings/strtr_with_reference.phpt +++ b/ext/standard/tests/strings/strtr_with_reference.phpt @@ -4,7 +4,7 @@ strtr() with references <?php $foo = 'foo'; -$arr = ['bar' => &$foo]; +$arr = ['bar' => &$foo]; var_dump(strtr('foobar', $arr)); ?> diff --git a/ext/standard/tests/strings/strval_basic.phpt b/ext/standard/tests/strings/strval_basic.phpt index 70a12c7f36..94d1d92331 100644 --- a/ext/standard/tests/strings/strval_basic.phpt +++ b/ext/standard/tests/strings/strval_basic.phpt @@ -21,19 +21,19 @@ $values = array( // Simple strings /*1*/ "Hello World", 'Hello World', - + // String with control chars /*3*/ "String\nwith\ncontrol\ncharacters\r\n", - + // String with quotes /*4*/ "String with \"quotes\"", - + //Numeric String /*5*/ "123456", - + // Hexadecimal string /*6*/ "0xABC", - + //Heredoc String /*7*/ $simple_heredoc ); diff --git a/ext/standard/tests/strings/strval_variation1.phpt b/ext/standard/tests/strings/strval_variation1.phpt index 430a4362bd..e17d9941d5 100644 --- a/ext/standard/tests/strings/strval_variation1.phpt +++ b/ext/standard/tests/strings/strval_variation1.phpt @@ -32,53 +32,53 @@ $values = array( 1, 12345, -12345, - + //Octal values /*5*/ 02, 010, 030071, -030071, - + //Hexadecimal values /*9*/ 0x0, 0x1, 0xABCD, -0xABCD, - + // float data /*13*/ 100.5, -100.5, 100.1234567e10, 100.7654321E-10, .5, - + // array data /*18*/ array(), array('color' => 'red', 'item' => 'pen'), - + // null data /*20*/ NULL, null, - + // boolean data /*22*/ true, false, TRUE, FALSE, - + // empty data /*26*/ "", '', - + // object data /*28*/ new MyClass(), - + // resource /*29*/ $file_handle, - + // undefined data /*30*/ @$undefined_var, - + // unset data /*31*/ @$unset_var, ); diff --git a/ext/standard/tests/strings/substr_count_basic.phpt b/ext/standard/tests/strings/substr_count_basic.phpt index a3b3553dfc..4023a774d8 100644 --- a/ext/standard/tests/strings/substr_count_basic.phpt +++ b/ext/standard/tests/strings/substr_count_basic.phpt @@ -21,7 +21,7 @@ var_dump(substr_count($a, "bca", -200)); var_dump(substr_count($a, "bca", -200, 50)); var_dump(substr_count($a, "bca", -200, -50)); -echo "Done\n"; +echo "Done\n"; ?> --EXPECT-- diff --git a/ext/standard/tests/strings/substr_count_error.phpt b/ext/standard/tests/strings/substr_count_error.phpt index c086582caa..9ea1d95121 100644 --- a/ext/standard/tests/strings/substr_count_error.phpt +++ b/ext/standard/tests/strings/substr_count_error.phpt @@ -11,7 +11,7 @@ var_dump( substr_count() ); /* more than expected no. of args */ var_dump( substr_count($str, "t", 0, 15, 30) ); - + /* offset before start */ var_dump(substr_count($str, "t", -20)); diff --git a/ext/standard/tests/strings/substr_count_variation_001.phpt b/ext/standard/tests/strings/substr_count_variation_001.phpt index c2644ce89b..71f2d223e1 100644 --- a/ext/standard/tests/strings/substr_count_variation_001.phpt +++ b/ext/standard/tests/strings/substr_count_variation_001.phpt @@ -19,8 +19,8 @@ var_dump( substr_count($str, "I", NULL) ); var_dump( substr_count($str, "i", NULL, 10) ); echo "\n-- overlapped substrings --\n"; -var_dump( substr_count("abcabcabcabcabc", "abca") ); -var_dump( substr_count("abcabcabcabcabc", "abca", 2) ); +var_dump( substr_count("abcabcabcabcabc", "abca") ); +var_dump( substr_count("abcabcabcabcabc", "abca", 2) ); echo "\n-- complex strings containing other than 7-bit chars --\n"; $str = chr(128).chr(129).chr(128).chr(256).chr(255).chr(254).chr(255); @@ -49,7 +49,7 @@ var_dump(substr_count($str, "\0")); var_dump(substr_count($str, "\x000")); var_dump(substr_count($str, "0")); -echo "Done\n"; +echo "Done\n"; ?> --EXPECTF-- diff --git a/ext/standard/tests/strings/substr_count_variation_002.phpt b/ext/standard/tests/strings/substr_count_variation_002.phpt index a1310a22b5..29b8afd9f5 100644 --- a/ext/standard/tests/strings/substr_count_variation_002.phpt +++ b/ext/standard/tests/strings/substr_count_variation_002.phpt @@ -31,7 +31,7 @@ var_dump(substr_count($str, "\0")); var_dump(substr_count($str, "\x000")); var_dump(substr_count($str, "0")); -echo "Done\n"; +echo "Done\n"; ?> --EXPECT-- diff --git a/ext/standard/tests/strings/substr_replace_error.phpt b/ext/standard/tests/strings/substr_replace_error.phpt index 0a15035af2..31fdae3397 100644 --- a/ext/standard/tests/strings/substr_replace_error.phpt +++ b/ext/standard/tests/strings/substr_replace_error.phpt @@ -23,15 +23,15 @@ echo "\n-- Testing substr_replace() function with more than expected no. of argu var_dump(substr_replace($s1, "evening", 5, 7, true)); echo "\n-- Testing substr_replace() function with start and length different types --\n"; -var_dump(substr_replace($s1, "evening", array(5))); -var_dump(substr_replace($s1, "evening", 5, array(8))); - +var_dump(substr_replace($s1, "evening", array(5))); +var_dump(substr_replace($s1, "evening", 5, array(8))); + echo "\n-- Testing substr_replace() function with start and length with a different number of elements --\n"; -var_dump(substr_replace($s1, "evening", array(5, 1), array(8))); +var_dump(substr_replace($s1, "evening", array(5, 1), array(8))); echo "\n-- Testing substr_replace() function with start and length as arrays but string not--\n"; -var_dump(substr_replace($s1, "evening", array(5), array(8))); - +var_dump(substr_replace($s1, "evening", array(5), array(8))); + ?> ===DONE=== --EXPECTF-- diff --git a/ext/standard/tests/strings/trim_basic.phpt b/ext/standard/tests/strings/trim_basic.phpt index 501b477420..87f261ca7b 100644 --- a/ext/standard/tests/strings/trim_basic.phpt +++ b/ext/standard/tests/strings/trim_basic.phpt @@ -17,10 +17,10 @@ $binary = "\x0A\x0DExample string\x0A\x0D"; echo "\n-- Trim string with all white space characters --\n"; var_dump(trim($text)); -echo "\n-- Trim non-whitespace from a string --\n"; +echo "\n-- Trim non-whitespace from a string --\n"; var_dump(trim($hello, "=!")); -echo "\n-- Trim some non-white space characters from a string --\n"; +echo "\n-- Trim some non-white space characters from a string --\n"; var_dump(trim($hello, "Hdle")); echo "\n-- Trim the ASCII control characters at the beginning of a string --\n"; diff --git a/ext/standard/tests/strings/trim_variation1.phpt b/ext/standard/tests/strings/trim_variation1.phpt index 4ef40c6801..cbbd5b9e4c 100644 --- a/ext/standard/tests/strings/trim_variation1.phpt +++ b/ext/standard/tests/strings/trim_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return " !---sample object---! "; - } + } } //getting the resource @@ -34,36 +34,36 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/trim_variation2.phpt b/ext/standard/tests/strings/trim_variation2.phpt index 11b2aaf1cc..b4c0352404 100644 --- a/ext/standard/tests/strings/trim_variation2.phpt +++ b/ext/standard/tests/strings/trim_variation2.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return " sample object "; - } + } } //getting the resource @@ -34,36 +34,36 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/ucwords_variation1.phpt b/ext/standard/tests/strings/ucwords_variation1.phpt index 02edf05131..c0107e1300 100644 --- a/ext/standard/tests/strings/ucwords_variation1.phpt +++ b/ext/standard/tests/strings/ucwords_variation1.phpt @@ -82,7 +82,7 @@ $values = array ( '0x123', "0xFF12", "-0xFF12", - + // undefined variable @$undefined_var, diff --git a/ext/standard/tests/strings/ucwords_variation3.phpt b/ext/standard/tests/strings/ucwords_variation3.phpt index 8b38bb9401..c807990091 100644 --- a/ext/standard/tests/strings/ucwords_variation3.phpt +++ b/ext/standard/tests/strings/ucwords_variation3.phpt @@ -29,7 +29,7 @@ $str_array = array( '"testing",ucword,"test"', '"t""t",test, t', '\'t \'t\',test', - + // using other white spaces '\ttesting\ttesting\tucwords', 'testing\rucwords testing ucwords', @@ -41,7 +41,7 @@ $str_array = array( 't@@#$% %test ^test &test *test +test -test', '!test ~test `test` =test= @test@test.com', '/test/r\test\ucwords\t\y\y\u\3 \yy\ /uu/', - + //only special chars '!@#$%^&*()_+=-`~' ); diff --git a/ext/standard/tests/strings/ucwords_variation4.phpt b/ext/standard/tests/strings/ucwords_variation4.phpt index 023efd3d46..be6764bc5f 100644 --- a/ext/standard/tests/strings/ucwords_variation4.phpt +++ b/ext/standard/tests/strings/ucwords_variation4.phpt @@ -31,7 +31,7 @@ $str_array = array( "\'t \'t\',test", "Jack's pen", "P't'y 't it's ", - + // using other white spaces "\ttesting\ttesting\tucwords", "\\ttesting\\ttesting\tucwords", @@ -48,7 +48,7 @@ $str_array = array( "t@@#$% %test ^test &test *test +test -test", "!test ~test `test` =test= @test@test.com", "/test/r\test\\ucwords\t\y\y\\u\3 \yy\ /uu/", - + //only special chars "!@#$%^&*()_+=-`~" ); diff --git a/ext/standard/tests/strings/utf8_decode_error.phpt b/ext/standard/tests/strings/utf8_decode_error.phpt index 911cc15cfc..201459edab 100644 --- a/ext/standard/tests/strings/utf8_decode_error.phpt +++ b/ext/standard/tests/strings/utf8_decode_error.phpt @@ -5,7 +5,7 @@ Test utf8_decode() function : error conditions /* Prototype : proto string utf8_decode(string data) * Description: Converts a UTF-8 encoded string to ISO-8859-1 * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing utf8_decode() : error conditions ***\n"; diff --git a/ext/standard/tests/strings/utf8_decode_variation1.phpt b/ext/standard/tests/strings/utf8_decode_variation1.phpt index f564b87da0..5b03723be0 100644 --- a/ext/standard/tests/strings/utf8_decode_variation1.phpt +++ b/ext/standard/tests/strings/utf8_decode_variation1.phpt @@ -5,7 +5,7 @@ Test utf8_decode() function : usage variations - different types for data /* Prototype : proto string utf8_decode(string data) * Description: Converts a UTF-8 encoded string to ISO-8859-1 * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing utf8_decode() : usage variations ***\n"; diff --git a/ext/standard/tests/strings/utf8_encode_error.phpt b/ext/standard/tests/strings/utf8_encode_error.phpt index e12f0978b6..1aabeedd81 100644 --- a/ext/standard/tests/strings/utf8_encode_error.phpt +++ b/ext/standard/tests/strings/utf8_encode_error.phpt @@ -5,7 +5,7 @@ Test utf8_encode() function : error conditions /* Prototype : proto string utf8_encode(string data) * Description: Encodes an ISO-8859-1 string to UTF-8 * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing utf8_encode() : error conditions ***\n"; diff --git a/ext/standard/tests/strings/utf8_encode_variation1.phpt b/ext/standard/tests/strings/utf8_encode_variation1.phpt index fa4b79976e..80edc9ac68 100644 --- a/ext/standard/tests/strings/utf8_encode_variation1.phpt +++ b/ext/standard/tests/strings/utf8_encode_variation1.phpt @@ -5,7 +5,7 @@ Test utf8_encode() function : usage variations - <type here specifics of this v /* Prototype : proto string utf8_encode(string data) * Description: Encodes an ISO-8859-1 string to UTF-8 * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing utf8_encode() : usage variations ***\n"; diff --git a/ext/standard/tests/strings/uuencode.phpt b/ext/standard/tests/strings/uuencode.phpt index 3671cd736c..5a1f3d2a24 100644 --- a/ext/standard/tests/strings/uuencode.phpt +++ b/ext/standard/tests/strings/uuencode.phpt @@ -17,7 +17,7 @@ var_dump(convert_uudecode(substr($enc, 0, -10))); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: convert_uuencode() expects parameter 1 to be string, array given in %s on line %d bool(false) diff --git a/ext/standard/tests/strings/vfprintf_basic.phpt b/ext/standard/tests/strings/vfprintf_basic.phpt index 5ba2b91007..37d91a7b60 100644 --- a/ext/standard/tests/strings/vfprintf_basic.phpt +++ b/ext/standard/tests/strings/vfprintf_basic.phpt @@ -9,7 +9,7 @@ precision=14 /* Prototype : int vfprintf(resource stream, string format, array args) * Description: Output a formatted string into a stream * Source code: ext/standard/formatted_print.c - * Alias to functions: + * Alias to functions: */ function writeAndDump($fp, $format, $args) diff --git a/ext/standard/tests/strings/vfprintf_basic2.phpt b/ext/standard/tests/strings/vfprintf_basic2.phpt index 36d6577bbd..db28f5fb70 100644 --- a/ext/standard/tests/strings/vfprintf_basic2.phpt +++ b/ext/standard/tests/strings/vfprintf_basic2.phpt @@ -28,13 +28,13 @@ if (!($fp = fopen($data_file, 'wt'))) return; vfprintf($fp, $format1, $arg1); -fprintf($fp, "\n"); +fprintf($fp, "\n"); vfprintf($fp, $format2, $arg2); -fprintf($fp, "\n"); +fprintf($fp, "\n"); vfprintf($fp, $format3, $arg3); -fprintf($fp, "\n"); +fprintf($fp, "\n"); fclose($fp); print_r(file_get_contents($data_file)); diff --git a/ext/standard/tests/strings/vfprintf_basic3.phpt b/ext/standard/tests/strings/vfprintf_basic3.phpt index 565079dc60..bd9efaa2e0 100644 --- a/ext/standard/tests/strings/vfprintf_basic3.phpt +++ b/ext/standard/tests/strings/vfprintf_basic3.phpt @@ -29,22 +29,22 @@ if (!($fp = fopen($data_file, 'wt'))) return; vfprintf($fp, $format1,$arg1); -fprintf($fp, "\n"); +fprintf($fp, "\n"); vfprintf($fp,$format11,$arg1); -fprintf($fp, "\n"); +fprintf($fp, "\n"); vfprintf($fp,$format2,$arg2); -fprintf($fp, "\n"); +fprintf($fp, "\n"); vfprintf($fp,$format22,$arg2); -fprintf($fp, "\n"); +fprintf($fp, "\n"); vfprintf($fp,$format3,$arg3); -fprintf($fp, "\n"); +fprintf($fp, "\n"); vfprintf($fp, $format33,$arg3); -fprintf($fp, "\n"); +fprintf($fp, "\n"); fclose($fp); print_r(file_get_contents($data_file)); diff --git a/ext/standard/tests/strings/vfprintf_basic5.phpt b/ext/standard/tests/strings/vfprintf_basic5.phpt index 84fbe33f1c..a7a7697dc2 100644 --- a/ext/standard/tests/strings/vfprintf_basic5.phpt +++ b/ext/standard/tests/strings/vfprintf_basic5.phpt @@ -22,7 +22,7 @@ $arg3 = array(65,66,67); $data_file = dirname(__FILE__) . '/vfprintf_basic5.txt'; if (!($fp = fopen($data_file, 'wt'))) return; - + vfprintf($fp, $format1,$arg1); fprintf($fp, "\n"); diff --git a/ext/standard/tests/strings/vfprintf_basic6.phpt b/ext/standard/tests/strings/vfprintf_basic6.phpt index 6c1bbf02a2..332370b5de 100644 --- a/ext/standard/tests/strings/vfprintf_basic6.phpt +++ b/ext/standard/tests/strings/vfprintf_basic6.phpt @@ -23,7 +23,7 @@ $arg3 = array(1000,2000,3000); $data_file = dirname(__FILE__) . '/vfprintf_basic6.txt'; if (!($fp = fopen($data_file, 'wt'))) return; - + vfprintf($fp, $format1,$arg1); fprintf($fp, "\n"); diff --git a/ext/standard/tests/strings/vfprintf_basic7.phpt b/ext/standard/tests/strings/vfprintf_basic7.phpt index f4c11edc15..f235c1cd6f 100644 --- a/ext/standard/tests/strings/vfprintf_basic7.phpt +++ b/ext/standard/tests/strings/vfprintf_basic7.phpt @@ -26,7 +26,7 @@ $arg3 = array(-1111,-1234567,-2345432); $data_file = dirname(__FILE__) . '/vfprintf_basic7.txt'; if (!($fp = fopen($data_file, 'wt'))) return; - + vfprintf($fp, $format1,$arg1); fprintf($fp, "\n"); diff --git a/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt b/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt index 14cd31ddd2..b5526a652f 100644 --- a/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt @@ -26,7 +26,7 @@ $arg3 = array(-1111,-1234567,-2345432); $data_file = dirname(__FILE__) . '/vfprintf_basic7_64bit.txt'; if (!($fp = fopen($data_file, 'wt'))) return; - + vfprintf($fp, $format1,$arg1); fprintf($fp, "\n"); diff --git a/ext/standard/tests/strings/vfprintf_basic8.phpt b/ext/standard/tests/strings/vfprintf_basic8.phpt index aad883c6e9..ed9d23c2ad 100644 --- a/ext/standard/tests/strings/vfprintf_basic8.phpt +++ b/ext/standard/tests/strings/vfprintf_basic8.phpt @@ -22,7 +22,7 @@ $arg3 = array(021,0347,0567); $data_file = dirname(__FILE__) . '/vfprintf_basic8.txt'; if (!($fp = fopen($data_file, 'wt'))) return; - + vfprintf($fp, $format1,$arg1); fprintf($fp, "\n"); diff --git a/ext/standard/tests/strings/vfprintf_error1.phpt b/ext/standard/tests/strings/vfprintf_error1.phpt index 8ef086d353..520c8eac3b 100644 --- a/ext/standard/tests/strings/vfprintf_error1.phpt +++ b/ext/standard/tests/strings/vfprintf_error1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test vfprintf() function : error conditions (more than expected arguments) +Test vfprintf() function : error conditions (more than expected arguments) --CREDITS-- Felix De Vliegher <felix.devliegher@gmail.com> --INI-- @@ -9,7 +9,7 @@ precision=14 /* Prototype : int vfprintf(resource stream, string format, array args) * Description: Output a formatted string into a stream * Source code: ext/standard/formatted_print.c - * Alias to functions: + * Alias to functions: */ // Open handle diff --git a/ext/standard/tests/strings/vfprintf_error2.phpt b/ext/standard/tests/strings/vfprintf_error2.phpt index bcf7e27690..746652fc5f 100644 --- a/ext/standard/tests/strings/vfprintf_error2.phpt +++ b/ext/standard/tests/strings/vfprintf_error2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test vfprintf() function : error conditions (less than expected arguments) +Test vfprintf() function : error conditions (less than expected arguments) --CREDITS-- Felix De Vliegher <felix.devliegher@gmail.com> --INI-- @@ -9,7 +9,7 @@ precision=14 /* Prototype : int vfprintf(resource stream, string format, array args) * Description: Output a formatted string into a stream * Source code: ext/standard/formatted_print.c - * Alias to functions: + * Alias to functions: */ // Open handle diff --git a/ext/standard/tests/strings/vfprintf_error3.phpt b/ext/standard/tests/strings/vfprintf_error3.phpt index 5a20780672..5afbdf706f 100644 --- a/ext/standard/tests/strings/vfprintf_error3.phpt +++ b/ext/standard/tests/strings/vfprintf_error3.phpt @@ -9,7 +9,7 @@ precision=14 /* Prototype : int vfprintf(resource stream, string format, array args) * Description: Output a formatted string into a stream * Source code: ext/standard/formatted_print.c - * Alias to functions: + * Alias to functions: */ // Open handle diff --git a/ext/standard/tests/strings/vfprintf_error4.phpt b/ext/standard/tests/strings/vfprintf_error4.phpt index 131b0477c4..8975d01a0f 100644 --- a/ext/standard/tests/strings/vfprintf_error4.phpt +++ b/ext/standard/tests/strings/vfprintf_error4.phpt @@ -9,7 +9,7 @@ precision=14 /* Prototype : int vfprintf(resource stream, string format, array args) * Description: Output a formatted string into a stream * Source code: ext/standard/formatted_print.c - * Alias to functions: + * Alias to functions: */ // Open handle diff --git a/ext/standard/tests/strings/vfprintf_variation1.phpt b/ext/standard/tests/strings/vfprintf_variation1.phpt index 0d3e70b3fe..184aa0e3f4 100644 --- a/ext/standard/tests/strings/vfprintf_variation1.phpt +++ b/ext/standard/tests/strings/vfprintf_variation1.phpt @@ -9,7 +9,7 @@ precision=14 /* Prototype : int vfprintf(resource stream, string format, array args) * Description: Output a formatted string into a stream * Source code: ext/standard/formatted_print.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing vfprintf() : variation functionality ***\n"; diff --git a/ext/standard/tests/strings/vfprintf_variation12.phpt b/ext/standard/tests/strings/vfprintf_variation12.phpt index f0fa354ea6..0afe7c8ac2 100644 --- a/ext/standard/tests/strings/vfprintf_variation12.phpt +++ b/ext/standard/tests/strings/vfprintf_variation12.phpt @@ -64,7 +64,7 @@ $args_array = array( true, false, TRUE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); /* creating dumping file */ @@ -86,7 +86,7 @@ print_r(file_get_contents($data_file)); echo "\n"; unlink($data_file); - + ?> ===DONE=== --EXPECT-- @@ -95,31 +95,31 @@ unlink($data_file); -- Iteration 1 -- 2 0 12 361100 o 37777775456 2322 - + 30071 14 37777777764 37777416700 12 361100 2 0 -- Iteration 2 -- 2 37777777776 2 361100 o 37720715133 57062645 - + 57060664 4475347 37721631371 37720717336 2 361100 2 37777777776 -- Iteration 3 -- 0 0 0 173 o 37777777605 173 - + 2322 0 $0 _0 0 173 0 0 -- Iteration 4 -- 1 1 1 1 o 1 1 - + #1 1 $1 _1 1 1 1 1 -- Iteration 5 -- 1 1 0 1 o 0 1 - + #0 1 $1 _0 0 1 1 1 ===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation14.phpt b/ext/standard/tests/strings/vfprintf_variation14.phpt index 0173a27fb7..03253b1917 100644 --- a/ext/standard/tests/strings/vfprintf_variation14.phpt +++ b/ext/standard/tests/strings/vfprintf_variation14.phpt @@ -64,7 +64,7 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); /* creating dumping file */ @@ -95,31 +95,31 @@ unlink($data_file); -- Iteration 1 -- 2 0 a 1e240 x fffffb2e 4d2 - + 3039 c fffffff4 fffe1dc0 a 1e240 2 0 -- Iteration 2 -- 2 fffffffe 2 1e240 x ff439a5b bc65a5 - + bc61b4 127ae7 ff4732f9 ff439ede 2 1e240 2 fffffffe -- Iteration 3 -- 0 0 0 7b x ffffff85 7b - + 4d2 0 $0 _0 0 7b 0 0 -- Iteration 4 -- 1 1 1 1 x 1 1 - + #1 1 $1 _1 1 1 1 1 -- Iteration 5 -- 1 1 0 1 x 0 1 - + #0 1 $1 _0 0 1 1 1 ===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation15.phpt b/ext/standard/tests/strings/vfprintf_variation15.phpt index 19e319a557..b513227836 100644 --- a/ext/standard/tests/strings/vfprintf_variation15.phpt +++ b/ext/standard/tests/strings/vfprintf_variation15.phpt @@ -20,9 +20,9 @@ echo "*** Testing vfprintf() : unsigned formats and unsigned values ***\n"; // defining array of unsigned formats $formats = array( - '%u %+u %-u', + '%u %+u %-u', '%lu %Lu %4u %-4u', - '%10.4u %-10.4u %.4u', + '%10.4u %-10.4u %.4u', '%\'#2u %\'2u %\'$2u %\'_2u', '%3$u %4$u %1$u %2$u' ); @@ -55,7 +55,7 @@ fclose($fp); print_r(file_get_contents($data_file)); echo "\n"; -unlink($data_file); +unlink($data_file); ?> ===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt index 7bb0d150e0..b31ffd3eb4 100644 --- a/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt @@ -20,9 +20,9 @@ echo "*** Testing vfprintf() : unsigned formats and unsigned values ***\n"; // defining array of unsigned formats $formats = array( - '%u %+u %-u', + '%u %+u %-u', '%lu %Lu %4u %-4u', - '%10.4u %-10.4u %.4u', + '%10.4u %-10.4u %.4u', '%\'#2u %\'2u %\'$2u %\'_2u', '%3$u %4$u %1$u %2$u' ); @@ -55,7 +55,7 @@ fclose($fp); print_r(file_get_contents($data_file)); echo "\n"; -unlink($data_file); +unlink($data_file); ?> ===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation16.phpt b/ext/standard/tests/strings/vfprintf_variation16.phpt index 4995ab02a4..fa81daee71 100644 --- a/ext/standard/tests/strings/vfprintf_variation16.phpt +++ b/ext/standard/tests/strings/vfprintf_variation16.phpt @@ -57,9 +57,9 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + /* creating dumping file */ $data_file = dirname(__FILE__) . '/vfprintf_variation16.txt'; if (!($fp = fopen($data_file, 'wt'))) @@ -78,7 +78,7 @@ fclose($fp); print_r(file_get_contents($data_file)); echo "\n"; -unlink($data_file); +unlink($data_file); ?> ===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt index 16d0624018..15b55a97dc 100644 --- a/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt @@ -57,9 +57,9 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + /* creating dumping file */ $data_file = dirname(__FILE__) . '/vfprintf_variation16_64bit.txt'; if (!($fp = fopen($data_file, 'wt'))) @@ -78,7 +78,7 @@ fclose($fp); print_r(file_get_contents($data_file)); echo "\n"; -unlink($data_file); +unlink($data_file); ?> ===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation17.phpt b/ext/standard/tests/strings/vfprintf_variation17.phpt index 6c17b801f6..545ae6d43d 100644 --- a/ext/standard/tests/strings/vfprintf_variation17.phpt +++ b/ext/standard/tests/strings/vfprintf_variation17.phpt @@ -16,9 +16,9 @@ echo "*** Testing vfprintf() : scientific formats and scientific values ***\n"; // defining array of scientific formats $formats = array( - '%e %+e %-e', + '%e %+e %-e', '%le %Le %4e %-4e', - '%10.4e %-10.4e %.4e', + '%10.4e %-10.4e %.4e', '%\'#20e %\'20e %\'$20e %\'_20e', '%3$e %4$e %1$e %2$e' ); @@ -37,7 +37,7 @@ $args_array = array( $data_file = dirname(__FILE__) . '/vfprintf_variation17.txt'; if (!($fp = fopen($data_file, 'wt'))) return; - + // looping to test vfprintf() with different scientific formats from the above $format array // and with signed and other types of values from the above $args_array array $counter = 1; @@ -51,7 +51,7 @@ fclose($fp); print_r(file_get_contents($data_file)); echo "\n"; -unlink($data_file); +unlink($data_file); ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/strings/vfprintf_variation18.phpt b/ext/standard/tests/strings/vfprintf_variation18.phpt index 5467753dc0..df43b2eeed 100644 --- a/ext/standard/tests/strings/vfprintf_variation18.phpt +++ b/ext/standard/tests/strings/vfprintf_variation18.phpt @@ -53,14 +53,14 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); /* creating dumping file */ $data_file = dirname(__FILE__) . '/vfprintf_variation18.txt'; if (!($fp = fopen($data_file, 'wt'))) return; - + // looping to test vfprintf() with different scientific formats from the above $format array // and with non-scientific values from the above $args_array array $counter = 1; @@ -74,7 +74,7 @@ fclose($fp); print_r(file_get_contents($data_file)); echo "\n"; -unlink($data_file); +unlink($data_file); ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/strings/vfprintf_variation19.phpt b/ext/standard/tests/strings/vfprintf_variation19.phpt index b2fbdd88cf..19aac7738b 100644 --- a/ext/standard/tests/strings/vfprintf_variation19.phpt +++ b/ext/standard/tests/strings/vfprintf_variation19.phpt @@ -49,7 +49,7 @@ $args_array = array( $data_file = dirname(__FILE__) . '/vfprintf_variation19.txt'; if (!($fp = fopen($data_file, 'wt'))) return; - + // looping to test vfprintf() with different scientific formats from the above $format array // and with non-scientific values from the above $args_array array $counter = 1; @@ -63,7 +63,7 @@ fclose($fp); print_r(file_get_contents($data_file)); echo "\n"; -unlink($data_file); +unlink($data_file); ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt index 8153ce8129..8ad2df0947 100644 --- a/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt @@ -49,7 +49,7 @@ $args_array = array( $data_file = dirname(__FILE__) . '/vfprintf_variation19_64bit.txt'; if (!($fp = fopen($data_file, 'wt'))) return; - + // looping to test vfprintf() with different scientific formats from the above $format array // and with non-scientific values from the above $args_array array $counter = 1; @@ -63,7 +63,7 @@ fclose($fp); print_r(file_get_contents($data_file)); echo "\n"; -unlink($data_file); +unlink($data_file); ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/strings/vfprintf_variation20.phpt b/ext/standard/tests/strings/vfprintf_variation20.phpt index 48fea341ed..3bc9bf6b29 100644 --- a/ext/standard/tests/strings/vfprintf_variation20.phpt +++ b/ext/standard/tests/strings/vfprintf_variation20.phpt @@ -41,44 +41,44 @@ $values = array( 1, 12345, -2345, - + // float data /*5*/ 10.5, -10.5, 10.1234567e10, 10.7654321E-10, .5, - + // array data /*10*/ array(), array(0), array(1), array(1,2), array('color' => 'red', 'item' => 'pen'), - + // null data /*15*/ NULL, null, - + // boolean data /*17*/ true, false, TRUE, FALSE, - + // empty data /*21*/ "", '', - + // object data /*23*/ new sample(), - + // undefined data /*24*/ @$undefined_var, - + // unset data /*25*/ @$unset_var, - + // resource data /*26*/ $file_handle ); diff --git a/ext/standard/tests/strings/vfprintf_variation21.phpt b/ext/standard/tests/strings/vfprintf_variation21.phpt index 09bf703957..5d8c63e207 100644 --- a/ext/standard/tests/strings/vfprintf_variation21.phpt +++ b/ext/standard/tests/strings/vfprintf_variation21.phpt @@ -41,41 +41,41 @@ $values = array( 1, 12345, -2345, - + // float data /*5*/ 10.5, -10.5, 10.1234567e10, 10.7654321E-10, .5, - + // null data /*10*/ NULL, null, - + // boolean data /*12*/ true, false, TRUE, FALSE, - + // empty data /*16*/ "", '', - + // string data /*18*/ "string", 'string', - + // object data /*20*/ new sample(), - + // undefined data /*21*/ @$undefined_var, - + // unset data /*22*/ @$unset_var, - + // resource data /*23*/ $file_handle ); diff --git a/ext/standard/tests/strings/vfprintf_variation4.phpt b/ext/standard/tests/strings/vfprintf_variation4.phpt index 642f35c46a..76ba79fca2 100644 --- a/ext/standard/tests/strings/vfprintf_variation4.phpt +++ b/ext/standard/tests/strings/vfprintf_variation4.phpt @@ -57,7 +57,7 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); diff --git a/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt index 6bf814003a..cbc74bfc69 100644 --- a/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt @@ -57,7 +57,7 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); diff --git a/ext/standard/tests/strings/vfprintf_variation6.phpt b/ext/standard/tests/strings/vfprintf_variation6.phpt index b5b82bbc62..465c21980b 100644 --- a/ext/standard/tests/strings/vfprintf_variation6.phpt +++ b/ext/standard/tests/strings/vfprintf_variation6.phpt @@ -53,7 +53,7 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); /* creating dumping file */ diff --git a/ext/standard/tests/strings/vfprintf_variation8.phpt b/ext/standard/tests/strings/vfprintf_variation8.phpt index a72e260e09..084947de45 100644 --- a/ext/standard/tests/strings/vfprintf_variation8.phpt +++ b/ext/standard/tests/strings/vfprintf_variation8.phpt @@ -34,7 +34,7 @@ $args_array = array( 2.1234567e10, +2.7654321e10, -2.7654321e10, 12345.780, 12.000000011111, -12.00000111111, -123456.234, 3.33, +4.44, 1.11,-2.22 ), - + // array of int values array(2, -2, +2, 123456, 123456234, -12346789, +12346789, @@ -56,7 +56,7 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); /* creating dumping file */ @@ -78,7 +78,7 @@ print_r(file_get_contents($data_file)); echo "\n"; unlink($data_file); - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/strings/vprintf_basic8.phpt b/ext/standard/tests/strings/vprintf_basic8.phpt index d5f6e222d0..64047882ec 100644 --- a/ext/standard/tests/strings/vprintf_basic8.phpt +++ b/ext/standard/tests/strings/vprintf_basic8.phpt @@ -20,15 +20,15 @@ $arg3 = array(021,0347,0567); $result = vprintf($format1,$arg1); echo "\n"; -var_dump($result); +var_dump($result); $result = vprintf($format2,$arg2); echo "\n"; -var_dump($result); +var_dump($result); $result = vprintf($format3,$arg3); echo "\n"; -var_dump($result); +var_dump($result); ?> ===DONE=== diff --git a/ext/standard/tests/strings/vprintf_error.phpt b/ext/standard/tests/strings/vprintf_error.phpt index 91fc1bdc32..0bd1e248ef 100644 --- a/ext/standard/tests/strings/vprintf_error.phpt +++ b/ext/standard/tests/strings/vprintf_error.phpt @@ -19,7 +19,7 @@ echo "\n-- Testing vprintf() function with Zero arguments --\n"; var_dump( vprintf() ); echo "\n-- Testing vprintf() function with less than expected no. of arguments --\n"; -var_dump( vprintf($format) ); +var_dump( vprintf($format) ); echo "\n-- testing vprintf() function with more than expected no. of arguments --\n"; var_dump( vprintf($format, $args, $extra_arg) ); diff --git a/ext/standard/tests/strings/vprintf_variation1.phpt b/ext/standard/tests/strings/vprintf_variation1.phpt index 18f314f284..d6bedcf1aa 100644 --- a/ext/standard/tests/strings/vprintf_variation1.phpt +++ b/ext/standard/tests/strings/vprintf_variation1.phpt @@ -41,44 +41,44 @@ $values = array( 1, 12345, -2345, - + // float data /*5*/ 10.5, -10.5, 10.1234567e10, 10.7654321E-10, .5, - + // array data /*10*/ array(), array(0), array(1), array(1,2), array('color' => 'red', 'item' => 'pen'), - + // null data /*15*/ NULL, null, - + // boolean data /*17*/ true, false, TRUE, FALSE, - + // empty data /*21*/ "", '', - + // object data /*23*/ new sample(), - + // undefined data /*24*/ @$undefined_var, - + // unset data /*25*/ @$unset_var, - + // resource data /*26*/ $file_handle ); @@ -90,9 +90,9 @@ foreach($values as $value) { echo "\n -- Iteration $counter --\n"; $result = vprintf($value,$args); echo "\n"; - var_dump($result); + var_dump($result); $counter++; - + }; // closing the resource diff --git a/ext/standard/tests/strings/vprintf_variation11.phpt b/ext/standard/tests/strings/vprintf_variation11.phpt index 4207bc294e..d058e91687 100644 --- a/ext/standard/tests/strings/vprintf_variation11.phpt +++ b/ext/standard/tests/strings/vprintf_variation11.phpt @@ -48,10 +48,10 @@ $args_array = array( // and with octal values from the above $args_array array $counter = 1; foreach($formats as $format) { - echo "\n-- Iteration $counter --\n"; + echo "\n-- Iteration $counter --\n"; $result = vprintf($format, $args_array[$counter-1]); echo "\n"; - var_dump($result); + var_dump($result); $counter++; } diff --git a/ext/standard/tests/strings/vprintf_variation11_64bit.phpt b/ext/standard/tests/strings/vprintf_variation11_64bit.phpt index 039006fdc6..76819386fd 100644 --- a/ext/standard/tests/strings/vprintf_variation11_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation11_64bit.phpt @@ -48,10 +48,10 @@ $args_array = array( // and with octal values from the above $args_array array $counter = 1; foreach($formats as $format) { - echo "\n-- Iteration $counter --\n"; + echo "\n-- Iteration $counter --\n"; $result = vprintf($format, $args_array[$counter-1]); echo "\n"; - var_dump($result); + var_dump($result); $counter++; } diff --git a/ext/standard/tests/strings/vprintf_variation12.phpt b/ext/standard/tests/strings/vprintf_variation12.phpt index 99938502d5..13b43624a1 100644 --- a/ext/standard/tests/strings/vprintf_variation12.phpt +++ b/ext/standard/tests/strings/vprintf_variation12.phpt @@ -64,16 +64,16 @@ $args_array = array( true, false, TRUE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + // looping to test vprintf() with different octal formats from the above $format array // and with non-octal values from the above $args_array array $counter = 1; foreach($args_array as $args) { echo "\n-- Iteration $counter --\n"; $result = vprintf($formats, $args); - echo "\n"; + echo "\n"; var_dump($result); $counter++; } @@ -86,7 +86,7 @@ foreach($args_array as $args) { -- Iteration 1 -- 2 0 12 361100 o 37777775456 2322 - + 30071 14 37777777764 37777416700 12 361100 2 0 int(116) @@ -94,7 +94,7 @@ int(116) -- Iteration 2 -- 2 37777777776 2 361100 o 37720715133 57062645 - + 57060664 4475347 37721631371 37720717336 2 361100 2 37777777776 int(146) @@ -102,7 +102,7 @@ int(146) -- Iteration 3 -- 0 0 0 173 o 37777777605 173 - + 2322 0 $0 _0 0 173 0 0 int(88) @@ -110,7 +110,7 @@ int(88) -- Iteration 4 -- 1 1 1 1 o 1 1 - + #1 1 $1 _1 1 1 1 1 int(75) @@ -118,7 +118,7 @@ int(75) -- Iteration 5 -- 1 1 0 1 o 0 1 - + #0 1 $1 _0 0 1 1 1 int(75) diff --git a/ext/standard/tests/strings/vprintf_variation13.phpt b/ext/standard/tests/strings/vprintf_variation13.phpt index 240db721e8..480faa12c9 100644 --- a/ext/standard/tests/strings/vprintf_variation13.phpt +++ b/ext/standard/tests/strings/vprintf_variation13.phpt @@ -48,7 +48,7 @@ $args_array = array( // and with octal values from the above $args_array array $counter = 1; foreach($formats as $format) { - echo "\n-- Iteration $counter --\n"; + echo "\n-- Iteration $counter --\n"; $result = vprintf($format, $args_array[$counter-1]); echo "\n"; var_dump($result); diff --git a/ext/standard/tests/strings/vprintf_variation13_64bit.phpt b/ext/standard/tests/strings/vprintf_variation13_64bit.phpt index 06d2bec26d..1fca830023 100644 --- a/ext/standard/tests/strings/vprintf_variation13_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation13_64bit.phpt @@ -48,7 +48,7 @@ $args_array = array( // and with octal values from the above $args_array array $counter = 1; foreach($formats as $format) { - echo "\n-- Iteration $counter --\n"; + echo "\n-- Iteration $counter --\n"; $result = vprintf($format, $args_array[$counter-1]); echo "\n"; var_dump($result); diff --git a/ext/standard/tests/strings/vprintf_variation14.phpt b/ext/standard/tests/strings/vprintf_variation14.phpt index bbb15e149a..a8ee21f4f8 100644 --- a/ext/standard/tests/strings/vprintf_variation14.phpt +++ b/ext/standard/tests/strings/vprintf_variation14.phpt @@ -64,12 +64,12 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); // looping to test vprintf() with different hexa formats from the above $format array // and with non-hexa values from the above $args_array array - + $counter = 1; foreach($args_array as $args) { echo "\n-- Iteration $counter --\n"; @@ -87,7 +87,7 @@ foreach($args_array as $args) { -- Iteration 1 -- 2 0 a 1e240 x fffffb2e 4d2 - + 3039 c fffffff4 fffe1dc0 a 1e240 2 0 int(101) @@ -95,7 +95,7 @@ int(101) -- Iteration 2 -- 2 fffffffe 2 1e240 x ff439a5b bc65a5 - + bc61b4 127ae7 ff4732f9 ff439ede 2 1e240 2 fffffffe int(124) @@ -103,7 +103,7 @@ int(124) -- Iteration 3 -- 0 0 0 7b x ffffff85 7b - + 4d2 0 $0 _0 0 7b 0 0 int(82) @@ -111,7 +111,7 @@ int(82) -- Iteration 4 -- 1 1 1 1 x 1 1 - + #1 1 $1 _1 1 1 1 1 int(75) @@ -119,7 +119,7 @@ int(75) -- Iteration 5 -- 1 1 0 1 x 0 1 - + #0 1 $1 _0 0 1 1 1 int(75) diff --git a/ext/standard/tests/strings/vprintf_variation14_64bit.phpt b/ext/standard/tests/strings/vprintf_variation14_64bit.phpt index 51b2f477b8..c3308be017 100644 --- a/ext/standard/tests/strings/vprintf_variation14_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation14_64bit.phpt @@ -75,7 +75,7 @@ foreach($args_array as $args) { echo "\n-- Iteration $counter --\n"; $result = vprintf($formats, $args); echo "\n"; - var_dump($result); + var_dump($result); $counter++; } diff --git a/ext/standard/tests/strings/vprintf_variation15.phpt b/ext/standard/tests/strings/vprintf_variation15.phpt index 97b1bc5c64..32618c00e1 100644 --- a/ext/standard/tests/strings/vprintf_variation15.phpt +++ b/ext/standard/tests/strings/vprintf_variation15.phpt @@ -20,9 +20,9 @@ echo "*** Testing vprintf() : unsigned formats and unsigned values ***\n"; // defining array of unsigned formats $formats = array( - '%u %+u %-u', + '%u %+u %-u', '%lu %Lu %4u %-4u', - '%10.4u %-10.4u %.4u', + '%10.4u %-10.4u %.4u', '%\'#2u %\'2u %\'$2u %\'_2u', '%3$u %4$u %1$u %2$u' ); @@ -36,7 +36,7 @@ $args_array = array( array(1, 0, 00, "10_"), array(3, 4, 1, 2) ); - + // looping to test vprintf() with different unsigned formats from the above $format array // and with signed and other types of values from the above $args_array array $counter = 1; @@ -44,7 +44,7 @@ foreach($formats as $format) { echo "\n-- Iteration $counter --\n"; $result = vprintf($format, $args_array[$counter-1]); echo "\n"; - var_dump($result); + var_dump($result); $counter++; } diff --git a/ext/standard/tests/strings/vprintf_variation15_64bit.phpt b/ext/standard/tests/strings/vprintf_variation15_64bit.phpt index 97bc9dcd8c..07dc6909bf 100644 --- a/ext/standard/tests/strings/vprintf_variation15_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation15_64bit.phpt @@ -20,9 +20,9 @@ echo "*** Testing vprintf() : unsigned formats and unsigned values ***\n"; // defining array of unsigned formats $formats = array( - '%u %+u %-u', + '%u %+u %-u', '%lu %Lu %4u %-4u', - '%10.4u %-10.4u %.4u', + '%10.4u %-10.4u %.4u', '%\'#2u %\'2u %\'$2u %\'_2u', '%3$u %4$u %1$u %2$u' ); @@ -36,7 +36,7 @@ $args_array = array( array(1, 0, 00, "10_"), array(3, 4, 1, 2) ); - + // looping to test vprintf() with different unsigned formats from the above $format array // and with signed and other types of values from the above $args_array array $counter = 1; diff --git a/ext/standard/tests/strings/vprintf_variation16.phpt b/ext/standard/tests/strings/vprintf_variation16.phpt index 8c3d66d02d..8c4fe3b260 100644 --- a/ext/standard/tests/strings/vprintf_variation16.phpt +++ b/ext/standard/tests/strings/vprintf_variation16.phpt @@ -57,9 +57,9 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + // looping to test vprintf() with different unsigned formats from the above $format array // and with signed and other types of values from the above $args_array array $counter = 1; diff --git a/ext/standard/tests/strings/vprintf_variation16_64bit.phpt b/ext/standard/tests/strings/vprintf_variation16_64bit.phpt index dab90d1e45..7b72080e0a 100644 --- a/ext/standard/tests/strings/vprintf_variation16_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation16_64bit.phpt @@ -57,9 +57,9 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + // looping to test vprintf() with different unsigned formats from the above $format array // and with signed and other types of values from the above $args_array array $counter = 1; @@ -67,7 +67,7 @@ foreach($args_array as $args) { echo "\n-- Iteration $counter --\n"; $result = vprintf($formats, $args); echo "\n"; - var_dump($result); + var_dump($result); $counter++; } diff --git a/ext/standard/tests/strings/vprintf_variation17.phpt b/ext/standard/tests/strings/vprintf_variation17.phpt index e2e8530153..657225af9e 100644 --- a/ext/standard/tests/strings/vprintf_variation17.phpt +++ b/ext/standard/tests/strings/vprintf_variation17.phpt @@ -16,9 +16,9 @@ echo "*** Testing vprintf() : scientific formats and scientific values ***\n"; // defining array of scientific formats $formats = array( - '%e %+e %-e', + '%e %+e %-e', '%le %Le %4e %-4e', - '%10.4e %-10.4e %.4e', + '%10.4e %-10.4e %.4e', '%\'#20e %\'20e %\'$20e %\'_20e', '%3$e %4$e %1$e %2$e' ); @@ -32,7 +32,7 @@ $args_array = array( array(1e1, +1e2, -1e3, "1e2_"), array(3e3, 4e3, 1e3, 2e3) ); - + // looping to test vprintf() with different scientific formats from the above $format array // and with signed and other types of values from the above $args_array array $counter = 1; diff --git a/ext/standard/tests/strings/vprintf_variation18.phpt b/ext/standard/tests/strings/vprintf_variation18.phpt index 8b30ae78d9..961287f2a3 100644 --- a/ext/standard/tests/strings/vprintf_variation18.phpt +++ b/ext/standard/tests/strings/vprintf_variation18.phpt @@ -53,7 +53,7 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); // looping to test vprintf() with different scientific formats from the above $format array diff --git a/ext/standard/tests/strings/vprintf_variation19_64bit.phpt b/ext/standard/tests/strings/vprintf_variation19_64bit.phpt index 6abc134549..ae9552021e 100644 --- a/ext/standard/tests/strings/vprintf_variation19_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation19_64bit.phpt @@ -49,7 +49,7 @@ foreach($formats as $format) { echo"\n-- Iteration $counter --\n"; $result = vprintf($format, $args_array[$counter-1]); echo "\n"; - var_dump($result); + var_dump($result); $counter++; } diff --git a/ext/standard/tests/strings/vprintf_variation2.phpt b/ext/standard/tests/strings/vprintf_variation2.phpt index 63c3dfe39e..97ddc67cb7 100644 --- a/ext/standard/tests/strings/vprintf_variation2.phpt +++ b/ext/standard/tests/strings/vprintf_variation2.phpt @@ -41,41 +41,41 @@ $values = array( 1, 12345, -2345, - + // float data /*5*/ 10.5, -10.5, 10.1234567e10, 10.7654321E-10, .5, - + // null data /*10*/ NULL, null, - + // boolean data /*12*/ true, false, TRUE, FALSE, - + // empty data /*16*/ "", '', - + // string data /*18*/ "string", 'string', - + // object data /*20*/ new sample(), - + // undefined data /*21*/ @$undefined_var, - + // unset data /*22*/ @$unset_var, - + // resource data /*23*/ $file_handle ); diff --git a/ext/standard/tests/strings/vprintf_variation3.phpt b/ext/standard/tests/strings/vprintf_variation3.phpt index 0b59ddda1f..8ec00844eb 100644 --- a/ext/standard/tests/strings/vprintf_variation3.phpt +++ b/ext/standard/tests/strings/vprintf_variation3.phpt @@ -45,7 +45,7 @@ $args_array = array( // and with int values from the above $args_array array $counter = 1; foreach($formats as $format) { - echo "\n-- Iteration $counter --\n"; + echo "\n-- Iteration $counter --\n"; $result = vprintf($format, $args_array[$counter-1]); echo "\n"; var_dump($result); diff --git a/ext/standard/tests/strings/vprintf_variation4.phpt b/ext/standard/tests/strings/vprintf_variation4.phpt index 8d56fc9cb1..d9566e2bf6 100644 --- a/ext/standard/tests/strings/vprintf_variation4.phpt +++ b/ext/standard/tests/strings/vprintf_variation4.phpt @@ -57,7 +57,7 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); // looping to test vprintf() with different int formats from the above $format array diff --git a/ext/standard/tests/strings/vprintf_variation4_64bit.phpt b/ext/standard/tests/strings/vprintf_variation4_64bit.phpt index f81dba32a1..27ab3f7ed1 100644 --- a/ext/standard/tests/strings/vprintf_variation4_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation4_64bit.phpt @@ -57,7 +57,7 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); // looping to test vprintf() with different int formats from the above $format array @@ -67,7 +67,7 @@ foreach($args_array as $args) { echo "\n-- Iteration $counter --\n"; $result = vprintf($formats, $args); echo "\n"; - var_dump($result); + var_dump($result); $counter++; } diff --git a/ext/standard/tests/strings/vprintf_variation5.phpt b/ext/standard/tests/strings/vprintf_variation5.phpt index f54d1e19c5..654f989267 100644 --- a/ext/standard/tests/strings/vprintf_variation5.phpt +++ b/ext/standard/tests/strings/vprintf_variation5.phpt @@ -45,7 +45,7 @@ $args_array = array( // and with float values from the above $args_array array $counter = 1; foreach($formats as $format) { - echo "\n-- Iteration $counter --\n"; + echo "\n-- Iteration $counter --\n"; $result = vprintf($format, $args_array[$counter-1]); echo "\n"; var_dump($result); diff --git a/ext/standard/tests/strings/vprintf_variation6.phpt b/ext/standard/tests/strings/vprintf_variation6.phpt index 265948b565..4614b9d1e1 100644 --- a/ext/standard/tests/strings/vprintf_variation6.phpt +++ b/ext/standard/tests/strings/vprintf_variation6.phpt @@ -53,9 +53,9 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + // looping to test vprintf() with different float formats from the above $format array // and with non-float values from the above $args_array array $counter = 1; diff --git a/ext/standard/tests/strings/vprintf_variation8.phpt b/ext/standard/tests/strings/vprintf_variation8.phpt index c0558ff6b7..bd472aca7d 100644 --- a/ext/standard/tests/strings/vprintf_variation8.phpt +++ b/ext/standard/tests/strings/vprintf_variation8.phpt @@ -34,7 +34,7 @@ $args_array = array( 2.1234567e10, +2.7654321e10, -2.7654321e10, 12345.780, 12.000000011111, -12.00000111111, -123456.234, 3.33, +4.44, 1.11,-2.22 ), - + // array of int values array(2, -2, +2, 123456, 123456234, -12346789, +12346789, @@ -56,9 +56,9 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + // looping to test vprintf() with different string formats from the above $format array // and with non-string values from the above $args_array array $counter = 1; @@ -66,7 +66,7 @@ foreach($args_array as $args) { echo "\n-- Iteration $counter --\n"; $result = vprintf($formats, $args); echo "\n"; - var_dump($result); + var_dump($result); $counter++; } diff --git a/ext/standard/tests/strings/vsprintf_error.phpt b/ext/standard/tests/strings/vsprintf_error.phpt index 8d581474b4..774779f2e5 100644 --- a/ext/standard/tests/strings/vsprintf_error.phpt +++ b/ext/standard/tests/strings/vsprintf_error.phpt @@ -19,7 +19,7 @@ echo "\n-- Testing vsprintf() function with Zero arguments --\n"; var_dump( vsprintf() ); echo "\n-- Testing vsprintf() function with less than expected no. of arguments --\n"; -var_dump( vsprintf($format) ); +var_dump( vsprintf($format) ); echo "\n-- testing vsprintf() function with more than expected no. of arguments --\n"; var_dump( vsprintf($format, $args, $extra_arg) ); diff --git a/ext/standard/tests/strings/vsprintf_variation1.phpt b/ext/standard/tests/strings/vsprintf_variation1.phpt index 3911587620..7e810d344d 100644 --- a/ext/standard/tests/strings/vsprintf_variation1.phpt +++ b/ext/standard/tests/strings/vsprintf_variation1.phpt @@ -78,7 +78,7 @@ $values = array( // unset data @$unset_var, - + // resource data $file_handle ); @@ -90,7 +90,7 @@ foreach($values as $value) { echo "\n -- Iteration $counter --\n"; var_dump( vsprintf($value,$args) ); $counter++; - + }; // closing the resource diff --git a/ext/standard/tests/strings/vsprintf_variation11.phpt b/ext/standard/tests/strings/vsprintf_variation11.phpt index 3d5eb1cfc3..5845c8b0ca 100644 --- a/ext/standard/tests/strings/vsprintf_variation11.phpt +++ b/ext/standard/tests/strings/vsprintf_variation11.phpt @@ -48,7 +48,7 @@ $args_array = array( // and with octal values from the above $args_array array $counter = 1; foreach($formats as $format) { - echo "\n-- Iteration $counter --\n"; + echo "\n-- Iteration $counter --\n"; var_dump( vsprintf($format, $args_array[$counter-1]) ); $counter++; } diff --git a/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt index 6d9c4c4b79..879c05b98b 100644 --- a/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt @@ -48,7 +48,7 @@ $args_array = array( // and with octal values from the above $args_array array $counter = 1; foreach($formats as $format) { - echo "\n-- Iteration $counter --\n"; + echo "\n-- Iteration $counter --\n"; var_dump( vsprintf($format, $args_array[$counter-1]) ); $counter++; } diff --git a/ext/standard/tests/strings/vsprintf_variation12.phpt b/ext/standard/tests/strings/vsprintf_variation12.phpt index 8437487904..ae625bd895 100644 --- a/ext/standard/tests/strings/vsprintf_variation12.phpt +++ b/ext/standard/tests/strings/vsprintf_variation12.phpt @@ -64,9 +64,9 @@ $args_array = array( true, false, TRUE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + // looping to test vsprintf() with different octal formats from the above $format array // and with non-octal values from the above $args_array array $counter = 1; @@ -84,35 +84,35 @@ echo "Done"; -- Iteration 1 -- string(116) "2 0 12 361100 o 37777775456 2322 - + 30071 14 37777777764 37777416700 12 361100 2 0" -- Iteration 2 -- string(146) "2 37777777776 2 361100 o 37720715133 57062645 - + 57060664 4475347 37721631371 37720717336 2 361100 2 37777777776" -- Iteration 3 -- string(88) "0 0 0 173 o 37777777605 173 - + 2322 0 $0 _0 0 173 0 0" -- Iteration 4 -- string(75) "1 1 1 1 o 1 1 - + #1 1 $1 _1 1 1 1 1" -- Iteration 5 -- string(75) "1 1 0 1 o 0 1 - + #0 1 $1 _0 0 1 1 1" Done diff --git a/ext/standard/tests/strings/vsprintf_variation13.phpt b/ext/standard/tests/strings/vsprintf_variation13.phpt index 6be9d4a9a8..e6509d08b0 100644 --- a/ext/standard/tests/strings/vsprintf_variation13.phpt +++ b/ext/standard/tests/strings/vsprintf_variation13.phpt @@ -48,7 +48,7 @@ $args_array = array( // and with octal values from the above $args_array array $counter = 1; foreach($formats as $format) { - echo "\n-- Iteration $counter --\n"; + echo "\n-- Iteration $counter --\n"; var_dump( vsprintf($format, $args_array[$counter-1]) ); $counter++; } diff --git a/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt index 59efbf9d22..0ec7a2ad77 100644 --- a/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt @@ -48,7 +48,7 @@ $args_array = array( // and with octal values from the above $args_array array $counter = 1; foreach($formats as $format) { - echo "\n-- Iteration $counter --\n"; + echo "\n-- Iteration $counter --\n"; var_dump( vsprintf($format, $args_array[$counter-1]) ); $counter++; } diff --git a/ext/standard/tests/strings/vsprintf_variation14.phpt b/ext/standard/tests/strings/vsprintf_variation14.phpt index d63165046c..37898cfff9 100644 --- a/ext/standard/tests/strings/vsprintf_variation14.phpt +++ b/ext/standard/tests/strings/vsprintf_variation14.phpt @@ -64,12 +64,12 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); // looping to test vsprintf() with different hexa formats from the above $format array // and with non-hexa values from the above $args_array array - + $counter = 1; foreach($args_array as $args) { echo "\n-- Iteration $counter --\n"; @@ -85,35 +85,35 @@ echo "Done"; -- Iteration 1 -- string(101) "2 0 a 1e240 x fffffb2e 4d2 - + 3039 c fffffff4 fffe1dc0 a 1e240 2 0" -- Iteration 2 -- string(124) "2 fffffffe 2 1e240 x ff439a5b bc65a5 - + bc61b4 127ae7 ff4732f9 ff439ede 2 1e240 2 fffffffe" -- Iteration 3 -- string(82) "0 0 0 7b x ffffff85 7b - + 4d2 0 $0 _0 0 7b 0 0" -- Iteration 4 -- string(75) "1 1 1 1 x 1 1 - + #1 1 $1 _1 1 1 1 1" -- Iteration 5 -- string(75) "1 1 0 1 x 0 1 - + #0 1 $1 _0 0 1 1 1" Done diff --git a/ext/standard/tests/strings/vsprintf_variation15.phpt b/ext/standard/tests/strings/vsprintf_variation15.phpt index bc1d786920..ee5b620491 100644 --- a/ext/standard/tests/strings/vsprintf_variation15.phpt +++ b/ext/standard/tests/strings/vsprintf_variation15.phpt @@ -20,9 +20,9 @@ echo "*** Testing vsprintf() : unsigned formats and unsigned values ***\n"; // defining array of unsigned formats $formats = array( - '%u %+u %-u', + '%u %+u %-u', '%lu %Lu %4u %-4u', - '%10.4u %-10.4u %.4u', + '%10.4u %-10.4u %.4u', '%\'#2u %\'2u %\'$2u %\'_2u', '%3$u %4$u %1$u %2$u' ); @@ -36,7 +36,7 @@ $args_array = array( array(1, 0, 00, "10_"), array(3, 4, 1, 2) ); - + // looping to test vsprintf() with different unsigned formats from the above $format array // and with signed and other types of values from the above $args_array array $counter = 1; diff --git a/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt index 35a78200a6..82660ea419 100644 --- a/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt @@ -20,9 +20,9 @@ echo "*** Testing vsprintf() : unsigned formats and unsigned values ***\n"; // defining array of unsigned formats $formats = array( - '%u %+u %-u', + '%u %+u %-u', '%lu %Lu %4u %-4u', - '%10.4u %-10.4u %.4u', + '%10.4u %-10.4u %.4u', '%\'#2u %\'2u %\'$2u %\'_2u', '%3$u %4$u %1$u %2$u' ); @@ -36,7 +36,7 @@ $args_array = array( array(1, 0, 00, "10_"), array(3, 4, 1, 2) ); - + // looping to test vsprintf() with different unsigned formats from the above $format array // and with signed and other types of values from the above $args_array array $counter = 1; diff --git a/ext/standard/tests/strings/vsprintf_variation16.phpt b/ext/standard/tests/strings/vsprintf_variation16.phpt index 8fb03d609d..e0933a3aa3 100644 --- a/ext/standard/tests/strings/vsprintf_variation16.phpt +++ b/ext/standard/tests/strings/vsprintf_variation16.phpt @@ -57,9 +57,9 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + // looping to test vsprintf() with different unsigned formats from the above $format array // and with signed and other types of values from the above $args_array array $counter = 1; diff --git a/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt index b138c32614..542202d95f 100644 --- a/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt @@ -57,9 +57,9 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + // looping to test vsprintf() with different unsigned formats from the above $format array // and with signed and other types of values from the above $args_array array $counter = 1; diff --git a/ext/standard/tests/strings/vsprintf_variation17.phpt b/ext/standard/tests/strings/vsprintf_variation17.phpt index 81dec4d89c..5346bd4a06 100644 --- a/ext/standard/tests/strings/vsprintf_variation17.phpt +++ b/ext/standard/tests/strings/vsprintf_variation17.phpt @@ -16,9 +16,9 @@ echo "*** Testing vsprintf() : scientific formats and scientific values ***\n"; // defining array of scientific formats $formats = array( - '%e %+e %-e', + '%e %+e %-e', '%le %Le %4e %-4e', - '%10.4e %-10.4e %.4e', + '%10.4e %-10.4e %.4e', '%\'#20e %\'20e %\'$20e %\'_20e', '%3$e %4$e %1$e %2$e' ); @@ -32,7 +32,7 @@ $args_array = array( array(1e1, +1e2, -1e3, "1e2_"), array(3e3, 4e3, 1e3, 2e3) ); - + // looping to test vsprintf() with different scientific formats from the above $format array // and with signed and other types of values from the above $args_array array $counter = 1; diff --git a/ext/standard/tests/strings/vsprintf_variation18.phpt b/ext/standard/tests/strings/vsprintf_variation18.phpt index 87ba0440e4..d2232d8fdc 100644 --- a/ext/standard/tests/strings/vsprintf_variation18.phpt +++ b/ext/standard/tests/strings/vsprintf_variation18.phpt @@ -53,7 +53,7 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); // looping to test vsprintf() with different scientific formats from the above $format array diff --git a/ext/standard/tests/strings/vsprintf_variation3.phpt b/ext/standard/tests/strings/vsprintf_variation3.phpt index e71bf1c178..195e4f1d60 100644 --- a/ext/standard/tests/strings/vsprintf_variation3.phpt +++ b/ext/standard/tests/strings/vsprintf_variation3.phpt @@ -45,7 +45,7 @@ $args_array = array( // and with int values from the above $args_array array $counter = 1; foreach($formats as $format) { - echo "\n-- Iteration $counter --\n"; + echo "\n-- Iteration $counter --\n"; var_dump( vsprintf($format, $args_array[$counter-1]) ); $counter++; } diff --git a/ext/standard/tests/strings/vsprintf_variation4.phpt b/ext/standard/tests/strings/vsprintf_variation4.phpt index 3decee6310..9291b04f37 100644 --- a/ext/standard/tests/strings/vsprintf_variation4.phpt +++ b/ext/standard/tests/strings/vsprintf_variation4.phpt @@ -57,7 +57,7 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); // looping to test vsprintf() with different int formats from the above $format array diff --git a/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt index 83f0327423..4698a1dbc4 100644 --- a/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt @@ -57,7 +57,7 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); // looping to test vsprintf() with different int formats from the above $format array diff --git a/ext/standard/tests/strings/vsprintf_variation5.phpt b/ext/standard/tests/strings/vsprintf_variation5.phpt index 42db3d4405..0be56f1f96 100644 --- a/ext/standard/tests/strings/vsprintf_variation5.phpt +++ b/ext/standard/tests/strings/vsprintf_variation5.phpt @@ -45,7 +45,7 @@ $args_array = array( // and with float values from the above $args_array array $counter = 1; foreach($formats as $format) { - echo "\n-- Iteration $counter --\n"; + echo "\n-- Iteration $counter --\n"; var_dump( vsprintf($format, $args_array[$counter-1]) ); $counter++; } diff --git a/ext/standard/tests/strings/vsprintf_variation6.phpt b/ext/standard/tests/strings/vsprintf_variation6.phpt index f638e51726..b10e3b11ba 100644 --- a/ext/standard/tests/strings/vsprintf_variation6.phpt +++ b/ext/standard/tests/strings/vsprintf_variation6.phpt @@ -53,9 +53,9 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + // looping to test vsprintf() with different float formats from the above $format array // and with non-float values from the above $args_array array $counter = 1; diff --git a/ext/standard/tests/strings/vsprintf_variation8.phpt b/ext/standard/tests/strings/vsprintf_variation8.phpt index f44eae2db2..0b6e3800bd 100644 --- a/ext/standard/tests/strings/vsprintf_variation8.phpt +++ b/ext/standard/tests/strings/vsprintf_variation8.phpt @@ -34,7 +34,7 @@ $args_array = array( 2.1234567e10, +2.7654321e10, -2.7654321e10, 2.1234567e10, 12345.780, 12.000000011111, -12.00000111111, -123456.234, 3.33, +4.44, 1.11,-2.22 ), - + // array of int values array(2, -2, +2, 123456, -12346789, +12346789, @@ -56,9 +56,9 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + // looping to test vsprintf() with different string formats from the above $format array // and with non-string values from the above $args_array array $counter = 1; diff --git a/ext/standard/tests/strings/wordwrap_variation5.phpt b/ext/standard/tests/strings/wordwrap_variation5.phpt index ebfffe4040..9efa096555 100644 --- a/ext/standard/tests/strings/wordwrap_variation5.phpt +++ b/ext/standard/tests/strings/wordwrap_variation5.phpt @@ -37,7 +37,7 @@ echo "-- with cut value as true --\n"; $cut = true; var_dump( wordwrap($str, $width, $break, $cut) ); var_dump( wordwrap($str, $width, $break1, $cut) ); - + echo "Done\n"; ?> --EXPECT-- diff --git a/ext/standard/tests/time/001.phpt b/ext/standard/tests/time/001.phpt index 0b76404ccb..b8498850f1 100644 --- a/ext/standard/tests/time/001.phpt +++ b/ext/standard/tests/time/001.phpt @@ -1,8 +1,8 @@ --TEST-- microtime() function --SKIPIF-- -<?php - if (!function_exists('microtime')) die('skip microtime() not available'); +<?php + if (!function_exists('microtime')) die('skip microtime() not available'); ?> --FILE-- <?php diff --git a/ext/standard/tests/time/strptime_basic.phpt b/ext/standard/tests/time/strptime_basic.phpt index 8fbe37cd82..d8456cd3de 100644 --- a/ext/standard/tests/time/strptime_basic.phpt +++ b/ext/standard/tests/time/strptime_basic.phpt @@ -1,10 +1,10 @@ --TEST-- Test strptime() function : basic functionality --SKIPIF-- -<?php - if (!function_exists('strptime')) { - die("skip - strptime() function not available in this build"); - } +<?php + if (!function_exists('strptime')) { + die("skip - strptime() function not available in this build"); + } if(PHP_OS == 'Darwin') die("skip - strptime() behaves differently on Darwin"); ?> @@ -16,13 +16,13 @@ Test strptime() function : basic functionality */ $orig = setlocale(LC_ALL, 'C'); -date_default_timezone_set("GMT"); +date_default_timezone_set("GMT"); echo "*** Testing strptime() : basic functionality ***\n"; $input = "10:00:00 AM July 2 1963"; $tstamp = strtotime($input); - + $str = strftime("%r %B%e %Y %Z", $tstamp); var_dump(strptime($str, '%H:%M:%S %p %B %d %Y')); diff --git a/ext/standard/tests/time/strptime_error.phpt b/ext/standard/tests/time/strptime_error.phpt index ae55028cb2..655204de62 100644 --- a/ext/standard/tests/time/strptime_error.phpt +++ b/ext/standard/tests/time/strptime_error.phpt @@ -1,17 +1,17 @@ --TEST-- Test localtime() function : error conditions --SKIPIF-- -<?php +<?php if (!function_exists('strptime')) { echo "SKIP strptime function not available in build"; -} -?> +} +?> --FILE-- <?php /* Prototype : array strptime ( string $date , string $format ) * Description: Parse a time/date generated with strftime() * Source code: ext/standard/datetime.c - * Alias to functions: + * Alias to functions: */ //Set the default time zone diff --git a/ext/standard/tests/time/strptime_parts.phpt b/ext/standard/tests/time/strptime_parts.phpt index fbe684b863..75609a70e8 100644 --- a/ext/standard/tests/time/strptime_parts.phpt +++ b/ext/standard/tests/time/strptime_parts.phpt @@ -1,10 +1,10 @@ --TEST-- Test strptime() function : basic functionality --SKIPIF-- -<?php - if (!function_exists('strptime')) { - die("skip - strptime() function not available in this build"); - } +<?php + if (!function_exists('strptime')) { + die("skip - strptime() function not available in this build"); + } ?> --FILE-- @@ -15,14 +15,14 @@ Test strptime() function : basic functionality */ $orig = setlocale(LC_ALL, 'C'); -date_default_timezone_set("GMT"); +date_default_timezone_set("GMT"); putenv("TZ=GMT"); echo "*** Testing strptime() : basic functionality ***\n"; $input = "10:01:20 AM July 2 1963"; $tstamp = strtotime($input); - + $str = strftime("%r %B%e %Y %Z", $tstamp); $res = strptime($str, '%H:%M:%S %p %B %d %Y %Z'); var_dump($res["tm_sec"]); diff --git a/ext/standard/tests/url/base64_decode_basic_001.phpt b/ext/standard/tests/url/base64_decode_basic_001.phpt index 516666c53c..452b79cf3e 100644 --- a/ext/standard/tests/url/base64_decode_basic_001.phpt +++ b/ext/standard/tests/url/base64_decode_basic_001.phpt @@ -5,7 +5,7 @@ Test base64_decode() function : basic functionality - ensure all base64 alphabet /* Prototype : proto string base64_decode(string str[, bool strict]) * Description: Decodes string using MIME base64 algorithm * Source code: ext/standard/base64.c - * Alias to functions: + * Alias to functions: */ echo "Decode an input string containing the whole base64 alphabet:\n"; diff --git a/ext/standard/tests/url/base64_decode_basic_002.phpt b/ext/standard/tests/url/base64_decode_basic_002.phpt index c6afffd389..05ff5606f9 100644 --- a/ext/standard/tests/url/base64_decode_basic_002.phpt +++ b/ext/standard/tests/url/base64_decode_basic_002.phpt @@ -5,7 +5,7 @@ Test base64_decode() function : basic functionality - strict vs non-strict with /* Prototype : proto string base64_decode(string str[, bool strict]) * Description: Decodes string using MIME base64 algorithm * Source code: ext/standard/base64.c - * Alias to functions: + * Alias to functions: */ echo "Decode 'hello world!':\n"; diff --git a/ext/standard/tests/url/base64_decode_error_001.phpt b/ext/standard/tests/url/base64_decode_error_001.phpt index 2725164464..d36482eacd 100644 --- a/ext/standard/tests/url/base64_decode_error_001.phpt +++ b/ext/standard/tests/url/base64_decode_error_001.phpt @@ -5,7 +5,7 @@ Test base64_decode() function : error conditions - wrong number of args /* Prototype : proto string base64_decode(string str[, bool strict]) * Description: Decodes string using MIME base64 algorithm * Source code: ext/standard/base64.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing base64_decode() : error conditions ***\n"; diff --git a/ext/standard/tests/url/base64_decode_variation_001.phpt b/ext/standard/tests/url/base64_decode_variation_001.phpt index f4906a774a..605267e143 100644 --- a/ext/standard/tests/url/base64_decode_variation_001.phpt +++ b/ext/standard/tests/url/base64_decode_variation_001.phpt @@ -5,7 +5,7 @@ Test base64_decode() function : usage variations - unexpected types for arg 1 /* Prototype : proto string base64_decode(string str[, bool strict]) * Description: Decodes string using MIME base64 algorithm * Source code: ext/standard/base64.c - * Alias to functions: + * Alias to functions: */ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { @@ -32,44 +32,44 @@ $values = array ( "1" => 1, "12345" => 12345, "-2345" => -2345, - + // float data "10.5" => 10.5, "-10.5" => -10.5, "10.1234567e10" => 10.1234567e10, "10.7654321E-10" => 10.7654321E-10, ".5" => .5, - + // array data "array()" => array(), "array(0)" => array(0), "array(1)" => array(1), "array(1, 2)" => array(1, 2), "array('color' => 'red', 'item' => 'pen'" => array('color' => 'red', 'item' => 'pen'), - + // null data "NULL" => NULL, "null" => null, - + // boolean data "true" => true, "false" => false, "TRUE" => TRUE, "FALSE" => FALSE, - + // empty data "\"\"" => "", "''" => '', - + // object data "stdClass object" => new stdclass(), - + // undefined data "undefined variable" => $undefined_var, - + // unset data "unset variable" => $unset_var, - + // resource data "resource" => $file_handle ); @@ -79,12 +79,12 @@ $values = array ( foreach($values as $key=>$value) { echo "\n-- Arg value $key --\n"; $output = base64_decode($value, $strict); - - if (is_string($output)) { + + if (is_string($output)) { var_dump(bin2hex($output)); } else { - var_dump($output); - } + var_dump($output); + } }; ?> diff --git a/ext/standard/tests/url/base64_decode_variation_002.phpt b/ext/standard/tests/url/base64_decode_variation_002.phpt index 0443eefaf8..810becfd24 100644 --- a/ext/standard/tests/url/base64_decode_variation_002.phpt +++ b/ext/standard/tests/url/base64_decode_variation_002.phpt @@ -5,7 +5,7 @@ Test base64_decode() function : usage variations - unexpected types for arg 2 /* Prototype : proto string base64_decode(string str[, bool strict]) * Description: Decodes string using MIME base64 algorithm * Source code: ext/standard/base64.c - * Alias to functions: + * Alias to functions: */ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { @@ -32,44 +32,44 @@ $values = array ( "1" => 1, "12345" => 12345, "-2345" => -2345, - + // float data "10.5" => 10.5, "-10.5" => -10.5, "10.1234567e10" => 10.1234567e10, "10.7654321E-10" => 10.7654321E-10, ".5" => .5, - + // array data "array()" => array(), "array(0)" => array(0), "array(1)" => array(1), "array(1, 2)" => array(1, 2), "array('color' => 'red', 'item' => 'pen'" => array('color' => 'red', 'item' => 'pen'), - + // null data "NULL" => NULL, "null" => null, - + // boolean data "true" => true, "false" => false, "TRUE" => TRUE, "FALSE" => FALSE, - + // empty data "\"\"" => "", "''" => '', - + // object data "stdClass object" => new stdclass(), - + // undefined data "undefined variable" => $undefined_var, - + // unset data "unset variable" => $unset_var, - + // resource data "resource" => $file_handle ); diff --git a/ext/standard/tests/url/base64_encode_basic_001.phpt b/ext/standard/tests/url/base64_encode_basic_001.phpt index 6f5e0a28da..825fabe8c5 100644 --- a/ext/standard/tests/url/base64_encode_basic_001.phpt +++ b/ext/standard/tests/url/base64_encode_basic_001.phpt @@ -5,7 +5,7 @@ Test base64_encode() function : basic functionality /* Prototype : proto string base64_encode(string str) * Description: Encodes string using MIME base64 algorithm * Source code: ext/standard/base64.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/standard/tests/url/base64_encode_basic_002.phpt b/ext/standard/tests/url/base64_encode_basic_002.phpt index e2304ec06e..cd066f9193 100644 --- a/ext/standard/tests/url/base64_encode_basic_002.phpt +++ b/ext/standard/tests/url/base64_encode_basic_002.phpt @@ -5,7 +5,7 @@ Test base64_encode() function : basic functionality - check algorithm round trip /* Prototype : proto string base64_encode(string str) * Description: Encodes string using MIME base64 algorithm * Source code: ext/standard/base64.c - * Alias to functions: + * Alias to functions: */ /* @@ -27,7 +27,7 @@ echo "\n--- Testing base64_encode() with binary string input ---\n"; $counter = 1; foreach($values as $str) { echo "-- Iteration $counter --\n"; - + $enc = base64_encode($str); $dec = base64_decode($enc); @@ -35,7 +35,7 @@ foreach($values as $str) { echo "TEST FAILED\n"; } else { echo "TEST PASSED\n"; - } + } $counter ++; } diff --git a/ext/standard/tests/url/base64_encode_error_001.phpt b/ext/standard/tests/url/base64_encode_error_001.phpt index a8883ac8f9..fbf595fcef 100644 --- a/ext/standard/tests/url/base64_encode_error_001.phpt +++ b/ext/standard/tests/url/base64_encode_error_001.phpt @@ -5,7 +5,7 @@ Test base64_encode() function : error conditions - wrong number of args /* Prototype : proto string base64_encode(string str) * Description: Encodes string using MIME base64 algorithm * Source code: ext/standard/base64.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing base64_encode() : error conditions - wrong number of args ***\n"; diff --git a/ext/standard/tests/url/base64_encode_variation_001.phpt b/ext/standard/tests/url/base64_encode_variation_001.phpt index f632bebf5d..d28eb13471 100644 --- a/ext/standard/tests/url/base64_encode_variation_001.phpt +++ b/ext/standard/tests/url/base64_encode_variation_001.phpt @@ -5,7 +5,7 @@ Test base64_encode() function : usage variations - unexpected types for argument /* Prototype : proto string base64_encode(string str) * Description: Encodes string using MIME base64 algorithm * Source code: ext/standard/base64.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing base64_encode() : usage variations ***\n"; diff --git a/ext/standard/tests/url/parse_url_basic_001.phpt b/ext/standard/tests/url/parse_url_basic_001.phpt index e963da377c..9d426f969f 100644 --- a/ext/standard/tests/url/parse_url_basic_001.phpt +++ b/ext/standard/tests/url/parse_url_basic_001.phpt @@ -5,7 +5,7 @@ Test parse_url() function: Parse a load of URLs without specifying the component /* Prototype : proto mixed parse_url(string url, [int url_component]) * Description: Parse a and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/standard/tests/url/parse_url_basic_002.phpt b/ext/standard/tests/url/parse_url_basic_002.phpt index fafc877502..c6027bd026 100644 --- a/ext/standard/tests/url/parse_url_basic_002.phpt +++ b/ext/standard/tests/url/parse_url_basic_002.phpt @@ -5,7 +5,7 @@ Test parse_url() function: Parse a load of URLs without specifying PHP_URL_SCHEM /* Prototype : proto mixed parse_url(string url, [int url_component]) * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/standard/tests/url/parse_url_basic_003.phpt b/ext/standard/tests/url/parse_url_basic_003.phpt index 76f70da4d8..e2c5c3767d 100644 --- a/ext/standard/tests/url/parse_url_basic_003.phpt +++ b/ext/standard/tests/url/parse_url_basic_003.phpt @@ -5,7 +5,7 @@ Test parse_url() function: Parse a load of URLs without specifying PHP_URL_HOST /* Prototype : proto mixed parse_url(string url, [int url_component]) * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/standard/tests/url/parse_url_basic_004.phpt b/ext/standard/tests/url/parse_url_basic_004.phpt index 5dda51372a..29049aa88d 100644 --- a/ext/standard/tests/url/parse_url_basic_004.phpt +++ b/ext/standard/tests/url/parse_url_basic_004.phpt @@ -5,7 +5,7 @@ Test parse_url() function: Parse a load of URLs without specifying PHP_URL_PORT /* Prototype : proto mixed parse_url(string url, [int url_component]) * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/standard/tests/url/parse_url_basic_005.phpt b/ext/standard/tests/url/parse_url_basic_005.phpt index 65ae06a469..fabee8cff3 100644 --- a/ext/standard/tests/url/parse_url_basic_005.phpt +++ b/ext/standard/tests/url/parse_url_basic_005.phpt @@ -5,7 +5,7 @@ Test parse_url() function: Parse a load of URLs without specifying PHP_URL_USER /* Prototype : proto mixed parse_url(string url, [int url_component]) * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/standard/tests/url/parse_url_basic_006.phpt b/ext/standard/tests/url/parse_url_basic_006.phpt index 3f06a50aef..5e91367ef3 100644 --- a/ext/standard/tests/url/parse_url_basic_006.phpt +++ b/ext/standard/tests/url/parse_url_basic_006.phpt @@ -5,7 +5,7 @@ Test parse_url() function: Parse a load of URLs without specifying PHP_URL_PASS /* Prototype : proto mixed parse_url(string url, [int url_component]) * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/standard/tests/url/parse_url_basic_007.phpt b/ext/standard/tests/url/parse_url_basic_007.phpt index 67827e05c0..ccf48970b9 100644 --- a/ext/standard/tests/url/parse_url_basic_007.phpt +++ b/ext/standard/tests/url/parse_url_basic_007.phpt @@ -5,7 +5,7 @@ Test parse_url() function: Parse a load of URLs without specifying PHP_URL_PATH /* Prototype : proto mixed parse_url(string url, [int url_component]) * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/standard/tests/url/parse_url_basic_008.phpt b/ext/standard/tests/url/parse_url_basic_008.phpt index f2b64da280..bc54c0bab1 100644 --- a/ext/standard/tests/url/parse_url_basic_008.phpt +++ b/ext/standard/tests/url/parse_url_basic_008.phpt @@ -5,7 +5,7 @@ Test parse_url() function: Parse a load of URLs without specifying PHP_URL_QUERY /* Prototype : proto mixed parse_url(string url, [int url_component]) * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/standard/tests/url/parse_url_basic_009.phpt b/ext/standard/tests/url/parse_url_basic_009.phpt index c38a69d0dd..e031d500bd 100644 --- a/ext/standard/tests/url/parse_url_basic_009.phpt +++ b/ext/standard/tests/url/parse_url_basic_009.phpt @@ -5,7 +5,7 @@ Test parse_url() function: Parse a load of URLs without specifying PHP_URL_FRAGM /* Prototype : proto mixed parse_url(string url, [int url_component]) * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/standard/tests/url/parse_url_basic_010.phpt b/ext/standard/tests/url/parse_url_basic_010.phpt index ff509e9744..9bab058816 100644 --- a/ext/standard/tests/url/parse_url_basic_010.phpt +++ b/ext/standard/tests/url/parse_url_basic_010.phpt @@ -5,7 +5,7 @@ Test parse_url() function : check values of URL related constants /* Prototype : proto mixed parse_url(string url, [int url_component]) * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/standard/tests/url/parse_url_error_001.phpt b/ext/standard/tests/url/parse_url_error_001.phpt index 0280a87cbc..32770b9a4f 100644 --- a/ext/standard/tests/url/parse_url_error_001.phpt +++ b/ext/standard/tests/url/parse_url_error_001.phpt @@ -5,7 +5,7 @@ Test parse_url() function : error conditions - wrong number of args /* Prototype : proto mixed parse_url(string url, [int url_component]) * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_url() : error conditions ***\n"; diff --git a/ext/standard/tests/url/parse_url_error_002.phpt b/ext/standard/tests/url/parse_url_error_002.phpt index 45c20f410d..b08c900d9f 100644 --- a/ext/standard/tests/url/parse_url_error_002.phpt +++ b/ext/standard/tests/url/parse_url_error_002.phpt @@ -5,7 +5,7 @@ Test parse_url() function: url component specifier out of range /* Prototype : proto mixed parse_url(string url, [int url_component]) * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_url() : error conditions: url component specifier out of range ***\n"; diff --git a/ext/standard/tests/url/parse_url_variation_001.phpt b/ext/standard/tests/url/parse_url_variation_001.phpt index 0b804eed57..4378e71354 100644 --- a/ext/standard/tests/url/parse_url_variation_001.phpt +++ b/ext/standard/tests/url/parse_url_variation_001.phpt @@ -5,7 +5,7 @@ Test parse_url() function : usage variations - unexpected type for arg 1. /* Prototype : proto mixed parse_url(string url, [int url_component]) * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { diff --git a/ext/standard/tests/url/parse_url_variation_002_32bit.phpt b/ext/standard/tests/url/parse_url_variation_002_32bit.phpt index fe4ca7bd09..9dfe00ceb4 100644 --- a/ext/standard/tests/url/parse_url_variation_002_32bit.phpt +++ b/ext/standard/tests/url/parse_url_variation_002_32bit.phpt @@ -7,7 +7,7 @@ Test parse_url() function : usage variations - unexpected type for arg 2. /* Prototype : proto mixed parse_url(string url, [int url_component]) * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { diff --git a/ext/standard/tests/url/parse_url_variation_002_64bit.phpt b/ext/standard/tests/url/parse_url_variation_002_64bit.phpt index adf9c03058..8bd4e8884f 100644 --- a/ext/standard/tests/url/parse_url_variation_002_64bit.phpt +++ b/ext/standard/tests/url/parse_url_variation_002_64bit.phpt @@ -7,7 +7,7 @@ Test parse_url() function : usage variations - unexpected type for arg 2. /* Prototype : proto mixed parse_url(string url, [int url_component]) * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { diff --git a/ext/standard/tests/url/rawurldecode_error_001.phpt b/ext/standard/tests/url/rawurldecode_error_001.phpt index 1dcaf40fd4..46343ec4f5 100644 --- a/ext/standard/tests/url/rawurldecode_error_001.phpt +++ b/ext/standard/tests/url/rawurldecode_error_001.phpt @@ -5,7 +5,7 @@ Test rawurldecode() function : error conditions - wrong number of args /* Prototype : proto string rawurldecode(string str) * Description: Decodes URL-encodes string * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ // NB: basic functionality tested in tests/strings/001.phpt diff --git a/ext/standard/tests/url/rawurldecode_variation_001.phpt b/ext/standard/tests/url/rawurldecode_variation_001.phpt index 9527fe6062..1d484b2cc7 100644 --- a/ext/standard/tests/url/rawurldecode_variation_001.phpt +++ b/ext/standard/tests/url/rawurldecode_variation_001.phpt @@ -5,7 +5,7 @@ Test rawurldecode() function : usage variations - unexpected type for arg 1. /* Prototype : proto string rawurldecode(string str) * Description: Decodes URL-encodes string * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ // NB: basic functionality tested in tests/strings/001.phpt diff --git a/ext/standard/tests/url/rawurlencode_error_001.phpt b/ext/standard/tests/url/rawurlencode_error_001.phpt index 7acce9e0c4..aaeada6f4b 100644 --- a/ext/standard/tests/url/rawurlencode_error_001.phpt +++ b/ext/standard/tests/url/rawurlencode_error_001.phpt @@ -5,7 +5,7 @@ Test rawurlencode() function : error conditions /* Prototype : proto string rawurlencode(string str) * Description: URL-encodes string * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ // NB: basic functionality tested in tests/strings/001.phpt diff --git a/ext/standard/tests/url/rawurlencode_variation_001.phpt b/ext/standard/tests/url/rawurlencode_variation_001.phpt index a3443361ec..b0d9180fe9 100644 --- a/ext/standard/tests/url/rawurlencode_variation_001.phpt +++ b/ext/standard/tests/url/rawurlencode_variation_001.phpt @@ -5,7 +5,7 @@ Test rawurlencode() function : usage variations - unexpected type for arg 1. /* Prototype : proto string rawurlencode(string str) * Description: URL-encodes string * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ // NB: basic functionality tested in tests/strings/001.phpt diff --git a/ext/standard/tests/url/urldecode_error_001.phpt b/ext/standard/tests/url/urldecode_error_001.phpt index f0e5ae0838..976da0b1b5 100644 --- a/ext/standard/tests/url/urldecode_error_001.phpt +++ b/ext/standard/tests/url/urldecode_error_001.phpt @@ -5,7 +5,7 @@ Test urldecode() function : error conditions /* Prototype : proto string urldecode(string str) * Description: Decodes URL-encoded string * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ // NB: basic functionality tested in tests/strings/001.phpt diff --git a/ext/standard/tests/url/urldecode_variation_001.phpt b/ext/standard/tests/url/urldecode_variation_001.phpt index 42026d103c..a9171473cc 100644 --- a/ext/standard/tests/url/urldecode_variation_001.phpt +++ b/ext/standard/tests/url/urldecode_variation_001.phpt @@ -5,7 +5,7 @@ Test urldecode() function : usage variations - <type here specifics of this var /* Prototype : proto string urldecode(string str) * Description: Decodes URL-encoded string * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ // NB: basic functionality tested in tests/strings/001.phpt diff --git a/ext/standard/tests/url/urlencode_error_001.phpt b/ext/standard/tests/url/urlencode_error_001.phpt index fc00b057d8..430c08a1ed 100644 --- a/ext/standard/tests/url/urlencode_error_001.phpt +++ b/ext/standard/tests/url/urlencode_error_001.phpt @@ -5,7 +5,7 @@ Test urlencode() function : error conditions /* Prototype : proto string urlencode(string str) * Description: URL-encodes string * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ // NB: basic functionality tested in tests/strings/001.phpt diff --git a/ext/standard/tests/url/urlencode_variation_001.phpt b/ext/standard/tests/url/urlencode_variation_001.phpt index 04d0921b2c..5c0cda66aa 100644 --- a/ext/standard/tests/url/urlencode_variation_001.phpt +++ b/ext/standard/tests/url/urlencode_variation_001.phpt @@ -5,7 +5,7 @@ Test urlencode() function : usage variations - <type here specifics of this var /* Prototype : proto string urlencode(string str) * Description: URL-encodes string * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ // NB: basic functionality tested in tests/strings/001.phpt diff --git a/ext/sysvmsg/tests/001.phpt b/ext/sysvmsg/tests/001.phpt index d3a5b1e3e6..666ad274e2 100644 --- a/ext/sysvmsg/tests/001.phpt +++ b/ext/sysvmsg/tests/001.phpt @@ -4,7 +4,7 @@ send/receive serialized message. <?php // vim600:syn=php if (!extension_loaded("sysvmsg")) print "skip"; ?> --FILE-- -<?php +<?php $key = ftok(dirname(__FILE__) . "/001.phpt", "p"); $q = msg_get_queue($key); msg_send($q, 1, "hello") or print "FAIL\n"; diff --git a/ext/sysvmsg/tests/002.phpt b/ext/sysvmsg/tests/002.phpt index e603ed02b5..76f966caa6 100644 --- a/ext/sysvmsg/tests/002.phpt +++ b/ext/sysvmsg/tests/002.phpt @@ -14,7 +14,7 @@ var_dump($res = msg_receive ($queue, 1, $msg_type, 16384, $msg, true, 0, $msg_er if (!msg_remove_queue($queue)) { echo "BAD: queue removal failed\n"; } - + echo "Done\n"; ?> --EXPECTF-- diff --git a/ext/sysvmsg/tests/005.phpt b/ext/sysvmsg/tests/005.phpt index d9437c63e4..a2680c21c0 100644 --- a/ext/sysvmsg/tests/005.phpt +++ b/ext/sysvmsg/tests/005.phpt @@ -13,7 +13,7 @@ foreach ($tests as $q) { do { $id = ftok(__FILE__, chr(mt_rand(0, 255))); } while (msg_queue_exists($id)); - + $q = msg_get_queue($id) or die("Failed to create queue"); msg_remove_queue($q) or die("Failed to close queue"); } @@ -21,7 +21,7 @@ foreach ($tests as $q) { echo "Using '$q' as queue resource:\n"; $errno = 0; - + var_dump(msg_set_queue($q, array('msg_qbytes' => 1))); var_dump(msg_stat_queue($q)); diff --git a/ext/sysvmsg/tests/006.phpt b/ext/sysvmsg/tests/006.phpt index cb4fd2457e..2d4976033c 100644 --- a/ext/sysvmsg/tests/006.phpt +++ b/ext/sysvmsg/tests/006.phpt @@ -23,7 +23,7 @@ foreach ($tests as $elem) { if (!msg_remove_queue($queue)) { echo "BAD: queue removal failed\n"; } - + echo "Done\n"; ?> --EXPECTF-- diff --git a/ext/sysvshm/tests/001.phpt b/ext/sysvshm/tests/001.phpt index 778b796dcc..55fd8eec1d 100644 --- a/ext/sysvshm/tests/001.phpt +++ b/ext/sysvshm/tests/001.phpt @@ -22,7 +22,7 @@ var_dump(ftok(__FILE__,"q")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: ftok() expects exactly 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/sysvshm/tests/002.phpt b/ext/sysvshm/tests/002.phpt index b28bd0c31a..3bfb28e5c6 100644 --- a/ext/sysvshm/tests/002.phpt +++ b/ext/sysvshm/tests/002.phpt @@ -35,7 +35,7 @@ shm_remove($s); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: shm_attach() expects at least 1 parameter, 0 given in %s on line %d NULL diff --git a/ext/sysvshm/tests/003.phpt b/ext/sysvshm/tests/003.phpt index 565c7c454e..010ac83cd3 100644 --- a/ext/sysvshm/tests/003.phpt +++ b/ext/sysvshm/tests/003.phpt @@ -33,7 +33,7 @@ $s = shm_attach($key); shm_remove($s); ?> ---EXPECTF-- +--EXPECTF-- Warning: shm_detach() expects exactly 1 parameter, 0 given in %s003.php on line %d NULL diff --git a/ext/sysvshm/tests/004.phpt b/ext/sysvshm/tests/004.phpt index ea931cbca2..ee64491840 100644 --- a/ext/sysvshm/tests/004.phpt +++ b/ext/sysvshm/tests/004.phpt @@ -25,7 +25,7 @@ shm_remove($s); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: shm_put_var() expects exactly 3 parameters, 0 given in %s004.php on line %d NULL diff --git a/ext/sysvshm/tests/005.phpt b/ext/sysvshm/tests/005.phpt index 6608aba2c7..9a2fc895f6 100644 --- a/ext/sysvshm/tests/005.phpt +++ b/ext/sysvshm/tests/005.phpt @@ -40,7 +40,7 @@ shm_remove($s); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: shm_get_var() expects exactly 2 parameters, 0 given in %s005.php on line %d NULL diff --git a/ext/sysvshm/tests/006.phpt b/ext/sysvshm/tests/006.phpt index a8f5064b4b..d5418f3f26 100644 --- a/ext/sysvshm/tests/006.phpt +++ b/ext/sysvshm/tests/006.phpt @@ -28,7 +28,7 @@ var_dump(shm_get_var($s, 1)); shm_remove($s); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: shm_remove_var() expects exactly 2 parameters, 0 given in %s006.php on line %d NULL diff --git a/ext/sysvshm/tests/007.phpt b/ext/sysvshm/tests/007.phpt index 89e32e6c4f..86ac09d6c2 100644 --- a/ext/sysvshm/tests/007.phpt +++ b/ext/sysvshm/tests/007.phpt @@ -23,7 +23,7 @@ var_dump(shm_remove($s)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: shm_remove() expects exactly 1 parameter, 0 given in %s007.php on line %d NULL diff --git a/ext/sysvshm/tests/bug72858.phpt b/ext/sysvshm/tests/bug72858.phpt index 793099f893..079c899993 100644 --- a/ext/sysvshm/tests/bug72858.phpt +++ b/ext/sysvshm/tests/bug72858.phpt @@ -15,6 +15,6 @@ shm_attach($v1,$v2); ?> ==DONE== ---EXPECTF-- +--EXPECTF-- Warning: shm_attach(): failed for key 0x64: Not enough space in %s on line %d ==DONE== diff --git a/ext/sysvshm/tests/shutdown_crash_0.phpt b/ext/sysvshm/tests/shutdown_crash_0.phpt index c547c7e859..8509316fa1 100644 --- a/ext/sysvshm/tests/shutdown_crash_0.phpt +++ b/ext/sysvshm/tests/shutdown_crash_0.phpt @@ -16,7 +16,7 @@ shm_remove($s); var_dump($s = shm_attach($key, 1024)); shm_remove($s); ---EXPECTF-- +--EXPECTF-- resource(%d) of type (sysvshm) resource(%d) of type (sysvshm) diff --git a/ext/tidy/tests/001.phpt b/ext/tidy/tests/001.phpt index bfd3782078..277fd03f5e 100644 --- a/ext/tidy/tests/001.phpt +++ b/ext/tidy/tests/001.phpt @@ -3,7 +3,7 @@ Check for tidy presence --SKIPIF-- <?php if (!extension_loaded("tidy")) print "skip"; ?> --FILE-- -<?php +<?php echo "tidy extension is available"; ?> --EXPECT-- diff --git a/ext/tidy/tests/002.phpt b/ext/tidy/tests/002.phpt index 89c3804b89..cd06733a2c 100644 --- a/ext/tidy/tests/002.phpt +++ b/ext/tidy/tests/002.phpt @@ -6,7 +6,7 @@ tidy_parse_string() <?php $a = tidy_parse_string("<HTML></HTML>"); echo tidy_get_output($a); - + ?> --EXPECT-- <html> diff --git a/ext/tidy/tests/003.phpt b/ext/tidy/tests/003.phpt index 1a63d44dfd..df4cd18f5f 100644 --- a/ext/tidy/tests/003.phpt +++ b/ext/tidy/tests/003.phpt @@ -3,7 +3,7 @@ tidy_clean_repair() --SKIPIF-- <?php if (!extension_loaded("tidy")) print "skip"; ?> --FILE-- -<?php +<?php $a = tidy_parse_string("<HTML></HTML>"); tidy_clean_repair($a); diff --git a/ext/tidy/tests/004.phpt b/ext/tidy/tests/004.phpt index 9d3cd2ef5a..0c73b6c687 100644 --- a/ext/tidy/tests/004.phpt +++ b/ext/tidy/tests/004.phpt @@ -3,7 +3,7 @@ tidy_diagnose() --SKIPIF-- <?php if (!extension_loaded("tidy")) print "skip"; ?> --FILE-- -<?php +<?php $a = tidy_parse_string('<HTML></HTML>'); var_dump(tidy_diagnose($a)); echo str_replace("\r", "", tidy_get_error_buffer($a)); diff --git a/ext/tidy/tests/005-mb.phpt b/ext/tidy/tests/005-mb.phpt index b63ec09635..1e5f021463 100644 --- a/ext/tidy/tests/005-mb.phpt +++ b/ext/tidy/tests/005-mb.phpt @@ -3,10 +3,10 @@ tidy_parse_file() --SKIPIF-- <?php if (!extension_loaded("tidy")) print "skip"; ?> --FILE-- -<?php +<?php $a = tidy_parse_file(dirname(__FILE__)."/005私はガラスを食べられます.html"); echo tidy_get_output($a); - + ?> --EXPECT-- <html> diff --git a/ext/tidy/tests/005.phpt b/ext/tidy/tests/005.phpt index 1d3a10c2ff..144a5862d4 100644 --- a/ext/tidy/tests/005.phpt +++ b/ext/tidy/tests/005.phpt @@ -3,10 +3,10 @@ tidy_parse_file() --SKIPIF-- <?php if (!extension_loaded("tidy")) print "skip"; ?> --FILE-- -<?php +<?php $a = tidy_parse_file(dirname(__FILE__)."/005.html"); echo tidy_get_output($a); - + ?> --EXPECT-- <html> diff --git a/ext/tidy/tests/006.phpt b/ext/tidy/tests/006.phpt index c826181314..3c00fb452e 100644 --- a/ext/tidy/tests/006.phpt +++ b/ext/tidy/tests/006.phpt @@ -3,10 +3,10 @@ Verbose tidy_get_error_buffer() --SKIPIF-- <?php if (!extension_loaded("tidy")) print "skip"; ?> --FILE-- -<?php +<?php $a = tidy_parse_string("<HTML><asd asdf></HTML>"); echo tidy_get_error_buffer($a); - + ?> --EXPECT-- line 1 column 1 - Warning: missing <!DOCTYPE> declaration diff --git a/ext/tidy/tests/008.phpt b/ext/tidy/tests/008.phpt index 150b98f560..7c1c945ba0 100644 --- a/ext/tidy/tests/008.phpt +++ b/ext/tidy/tests/008.phpt @@ -3,7 +3,7 @@ Accessing the error buffer via $obj->error_buf... --SKIPIF-- <?php if (!extension_loaded("tidy")) print "skip"; ?> --FILE-- -<?php +<?php $a = tidy_parse_string("<HTML><asd asdf></HTML>"); echo $a->errorBuffer; ?> diff --git a/ext/tidy/tests/009.phpt b/ext/tidy/tests/009.phpt index 02c65df7cb..d04a684e8e 100644 --- a/ext/tidy/tests/009.phpt +++ b/ext/tidy/tests/009.phpt @@ -3,11 +3,11 @@ tidy_doc object overloading --SKIPIF-- <?php if (!extension_loaded("tidy")) print "skip"; ?> --FILE-- -<?php - +<?php + $a = tidy_parse_string("<HTML></HTML>"); echo $a; - + ?> --EXPECT-- <html> diff --git a/ext/tidy/tests/010.phpt b/ext/tidy/tests/010.phpt index 695e1c9ce5..42a8676ff6 100644 --- a/ext/tidy/tests/010.phpt +++ b/ext/tidy/tests/010.phpt @@ -3,7 +3,7 @@ Accessing root, body, html, and head nodes.. --SKIPIF-- <?php if (!extension_loaded("tidy")) print "skip"; ?> --FILE-- -<?php +<?php $a = tidy_parse_string("<HTML><BODY BGCOLOR=#FFFFFF ALINK=#000000></BODY></HTML>", array('newline' => 'LF')); var_dump($a->root()); var_dump($a->body()); diff --git a/ext/tidy/tests/011.phpt b/ext/tidy/tests/011.phpt index 2a94616759..f664c50a3e 100644 --- a/ext/tidy/tests/011.phpt +++ b/ext/tidy/tests/011.phpt @@ -3,7 +3,7 @@ Accessing attributes of a node --SKIPIF-- <?php if (!extension_loaded("tidy")) print "skip"; ?> --FILE-- -<?php +<?php $a = tidy_parse_string("<HTML><BODY BGCOLOR=#FFFFFF ALINK=#000000></BODY></HTML>"); $body = $a->body(); var_dump($body->attribute); diff --git a/ext/tidy/tests/012.phpt b/ext/tidy/tests/012.phpt index e86aa6c45c..eae6eca44c 100644 --- a/ext/tidy/tests/012.phpt +++ b/ext/tidy/tests/012.phpt @@ -28,7 +28,7 @@ Accessing children nodes $a = tidy_parse_string("<HTML><BODY BGCOLOR=#FFFFFF ALINK=#000000><B>Hi</B><I>Bye<U>Test</U></I></BODY></HTML>", array('newline' => 'LF')); $html = $a->html(); dump_nodes($html); - + ?> --EXPECTF-- bool(true) diff --git a/ext/tidy/tests/014.phpt b/ext/tidy/tests/014.phpt index a391b3dc9e..a2389f0b7e 100644 --- a/ext/tidy/tests/014.phpt +++ b/ext/tidy/tests/014.phpt @@ -8,7 +8,7 @@ Passing configuration options through tidy_parse_string(). $tidy = tidy_parse_string($text, array('show-body-only'=>true)); tidy_clean_repair($tidy); echo tidy_get_output($tidy); - + ?> --EXPECT-- <b>testing</b>
\ No newline at end of file diff --git a/ext/tidy/tests/015.phpt b/ext/tidy/tests/015.phpt index 03018ffa19..ae2e9d3b02 100644 --- a/ext/tidy/tests/015.phpt +++ b/ext/tidy/tests/015.phpt @@ -7,7 +7,7 @@ Passing configuration options through tidy_parse_file(). $tidy = tidy_parse_file(dirname(__FILE__)."/015.html", array('show-body-only'=>true)); tidy_clean_repair($tidy); echo tidy_get_output($tidy); - + ?> --EXPECT-- <b>testing</b>
\ No newline at end of file diff --git a/ext/tidy/tests/018.phpt b/ext/tidy/tests/018.phpt index 405a46d42b..d2f1d1e0f3 100644 --- a/ext/tidy/tests/018.phpt +++ b/ext/tidy/tests/018.phpt @@ -4,8 +4,8 @@ binary safety <?php if (!extension_loaded("tidy")) print "skip"; ?> --FILE-- <?php -$x = tidy_repair_string("<p>abra\0cadabra</p>", - array( 'show-body-only' => true, +$x = tidy_repair_string("<p>abra\0cadabra</p>", + array( 'show-body-only' => true, 'clean' => false, 'newline' => "\n") ); diff --git a/ext/tidy/tests/019.phpt b/ext/tidy/tests/019.phpt index 5e9c38d75a..188b8cd4e9 100644 --- a/ext/tidy/tests/019.phpt +++ b/ext/tidy/tests/019.phpt @@ -21,7 +21,7 @@ tidy_repair_file($a, $a, $a, $a); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: tidy_repair_string(): Could not load configuration file '1' in %s on line %d Warning: tidy_repair_string(): Could not set encoding '1' in %s on line %d diff --git a/ext/tidy/tests/029.phpt b/ext/tidy/tests/029.phpt index 1709cd6f09..e46181f005 100644 --- a/ext/tidy/tests/029.phpt +++ b/ext/tidy/tests/029.phpt @@ -13,7 +13,7 @@ $inputs = array( ); -foreach ($inputs as $input) { +foreach ($inputs as $input) { $t = tidy_parse_string($input); $t->cleanRepair(); diff --git a/ext/tokenizer/tests/001.phpt b/ext/tokenizer/tests/001.phpt index a09e5ef19c..4c6295cdf8 100644 --- a/ext/tokenizer/tests/001.phpt +++ b/ext/tokenizer/tests/001.phpt @@ -131,7 +131,7 @@ echo token_name(array()), "\n"; echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- T_INCLUDE T_INCLUDE_ONCE T_EVAL diff --git a/ext/tokenizer/tests/003.phpt b/ext/tokenizer/tests/003.phpt index fdcf7748a8..3ba6d594df 100644 --- a/ext/tokenizer/tests/003.phpt +++ b/ext/tokenizer/tests/003.phpt @@ -13,7 +13,7 @@ var_dump(token_get_all(-1)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: token_get_all() expects parameter 1 to be string, array given in %s on line %d NULL diff --git a/ext/tokenizer/tests/bug54089.phpt b/ext/tokenizer/tests/bug54089.phpt index 77a4c1f324..ff461ecb78 100644 --- a/ext/tokenizer/tests/bug54089.phpt +++ b/ext/tokenizer/tests/bug54089.phpt @@ -15,7 +15,7 @@ $codes = array( foreach ($codes as $code) { $tokens = token_get_all($code); var_dump($tokens); - + $code = ''; foreach ($tokens as $t) { diff --git a/ext/tokenizer/tests/token_get_all_variation1.phpt b/ext/tokenizer/tests/token_get_all_variation1.phpt index 276453fd15..485f112565 100644 --- a/ext/tokenizer/tests/token_get_all_variation1.phpt +++ b/ext/tokenizer/tests/token_get_all_variation1.phpt @@ -71,7 +71,7 @@ $source_values = array( // object data /*23*/ new MyClass(), - + // resource data $fp, diff --git a/ext/tokenizer/tests/token_get_all_variation10.phpt b/ext/tokenizer/tests/token_get_all_variation10.phpt index 55e9d7edf8..af2e413d38 100644 --- a/ext/tokenizer/tests/token_get_all_variation10.phpt +++ b/ext/tokenizer/tests/token_get_all_variation10.phpt @@ -25,17 +25,17 @@ $b = 0; $source = array ( // int const - '<?php $a = 1 + 034; $b = $a + 0x3F; ?>', - + '<?php $a = 1 + 034; $b = $a + 0x3F; ?>', + // float const '<?php $a = 0.23E-2 + 0.43e2 + 0.5; ?>', // string const - '<?php $a = "hello ".\'world\'; ?>', + '<?php $a = "hello ".\'world\'; ?>', // bool const - "<?php \$a = (\$b)? true : false; ?>", - "<?php \$b = (\$a)? FALSE : TRUE; ?>", + "<?php \$a = (\$b)? true : false; ?>", + "<?php \$b = (\$a)? FALSE : TRUE; ?>", // null const '<?php $b = null | NULL; ?>' diff --git a/ext/wddx/tests/bug27287.phpt b/ext/wddx/tests/bug27287.phpt index 72ac317aa0..f709b71a99 100644 --- a/ext/wddx/tests/bug27287.phpt +++ b/ext/wddx/tests/bug27287.phpt @@ -4,12 +4,12 @@ Bug #27287 (segfault with deserializing object data) <?php if (!extension_loaded("wddx")) print "skip"; ?> --FILE-- <?php - + class foo { } $foo = new foo(); $foo->abc = 'def'; - + $string = wddx_serialize_value($foo); $bar = wddx_deserialize($string); diff --git a/ext/wddx/tests/bug35410.phpt b/ext/wddx/tests/bug35410.phpt index 3b4b9b62cf..27655c7bdc 100644 --- a/ext/wddx/tests/bug35410.phpt +++ b/ext/wddx/tests/bug35410.phpt @@ -1,8 +1,8 @@ --TEST-- #35410 (wddx_deserialize() doesn't handle large ints as keys properly) --SKIPIF-- -<?php - if (!extension_loaded("wddx")) print "skip"; +<?php + if (!extension_loaded("wddx")) print "skip"; if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?> --FILE-- diff --git a/ext/wddx/tests/bug35410_64bit.phpt b/ext/wddx/tests/bug35410_64bit.phpt index 15377b175e..8514170fcb 100644 --- a/ext/wddx/tests/bug35410_64bit.phpt +++ b/ext/wddx/tests/bug35410_64bit.phpt @@ -1,8 +1,8 @@ --TEST-- #35410 (wddx_deserialize() doesn't handle large ints as keys properly) --SKIPIF-- -<?php - if (!extension_loaded("wddx")) print "skip"; +<?php + if (!extension_loaded("wddx")) print "skip"; if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- diff --git a/ext/wddx/tests/bug70661.phpt b/ext/wddx/tests/bug70661.phpt index b5629c85d6..402f81f276 100644 --- a/ext/wddx/tests/bug70661.phpt +++ b/ext/wddx/tests/bug70661.phpt @@ -43,12 +43,12 @@ var_dump($y); function ptr2str($ptr) { $out = ''; - + for ($i = 0; $i < 8; $i++) { $out .= chr($ptr & 0xff); $ptr >>= 8; } - + return $out; } ?> diff --git a/ext/wddx/tests/bug73065.phpt b/ext/wddx/tests/bug73065.phpt index ebf14858eb..056d95ca54 100644 --- a/ext/wddx/tests/bug73065.phpt +++ b/ext/wddx/tests/bug73065.phpt @@ -25,7 +25,7 @@ $xml1 = <<<XML </array> </wddxPacket> XML; - + $xml2 = <<<XML <?xml version='1.0' ?> <!DOCTYPE et SYSTEM 'w'> diff --git a/ext/xml/tests/bug26528.phpt b/ext/xml/tests/bug26528.phpt index 40a1c53c9b..96da841004 100644 --- a/ext/xml/tests/bug26528.phpt +++ b/ext/xml/tests/bug26528.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #26528 (HTML entities are not being decoded) --SKIPIF-- -<?php +<?php require_once("skipif.inc"); ?> --FILE-- diff --git a/ext/xml/tests/bug26614.phpt b/ext/xml/tests/bug26614.phpt index e1df1bbfde..2d94bbfad3 100644 --- a/ext/xml/tests/bug26614.phpt +++ b/ext/xml/tests/bug26614.phpt @@ -1,9 +1,9 @@ --TEST-- Bug #26614 (CDATA sections skipped on line count) --SKIPIF-- -<?php +<?php require_once("skipif.inc"); -if (defined("LIBXML_VERSION")) die('skip expat test'); +if (defined("LIBXML_VERSION")) die('skip expat test'); ?> --FILE-- <?php @@ -76,7 +76,7 @@ foreach ($xmls as $desc => $xml) { $xml_parser = xml_parser_create(); xml_set_element_handler($xml_parser, "startElement", "endElement"); xml_set_character_data_handler($xml_parser, "characterData"); - if (!xml_parse($xml_parser, $xml, true)) + if (!xml_parse($xml_parser, $xml, true)) echo "Error: ".xml_error_string(xml_get_error_code($xml_parser))."\n"; xml_parser_free($xml_parser); } diff --git a/ext/xml/tests/bug26614_libxml.phpt b/ext/xml/tests/bug26614_libxml.phpt index 782bdb1936..c88b154f65 100644 --- a/ext/xml/tests/bug26614_libxml.phpt +++ b/ext/xml/tests/bug26614_libxml.phpt @@ -1,9 +1,9 @@ --TEST-- Bug #26614 (CDATA sections skipped on line count) --SKIPIF-- -<?php +<?php require_once("skipif.inc"); -if (!defined("LIBXML_VERSION")) die('skip libxml2 test'); +if (!defined("LIBXML_VERSION")) die('skip libxml2 test'); ?> --FILE-- <?php @@ -76,7 +76,7 @@ foreach ($xmls as $desc => $xml) { $xml_parser = xml_parser_create(); xml_set_element_handler($xml_parser, "startElement", "endElement"); xml_set_character_data_handler($xml_parser, "characterData"); - if (!xml_parse($xml_parser, $xml, true)) + if (!xml_parse($xml_parser, $xml, true)) echo "Error: ".xml_error_string(xml_get_error_code($xml_parser))."\n"; xml_parser_free($xml_parser); } diff --git a/ext/xml/tests/bug27908.phpt b/ext/xml/tests/bug27908.phpt index e60466fa19..b1e583efa1 100644 --- a/ext/xml/tests/bug27908.phpt +++ b/ext/xml/tests/bug27908.phpt @@ -7,14 +7,14 @@ require_once("skipif.inc"); --FILE-- <?php -function x_default_handler($xp,$data) -{ - echo "x_default_handler $data\n"; -} -$xp = xml_parser_create(); -xml_set_default_handler($xp,'x_default_handler'); -xml_parse($xp, '<root></root>',TRUE); -xml_parser_free($xp); +function x_default_handler($xp,$data) +{ + echo "x_default_handler $data\n"; +} +$xp = xml_parser_create(); +xml_set_default_handler($xp,'x_default_handler'); +xml_parse($xp, '<root></root>',TRUE); +xml_parser_free($xp); echo "Done\n"; ?> --EXPECT-- diff --git a/ext/xml/tests/bug30266.phpt b/ext/xml/tests/bug30266.phpt index 0a3a5ca46b..2cf0a68cde 100644 --- a/ext/xml/tests/bug30266.phpt +++ b/ext/xml/tests/bug30266.phpt @@ -43,7 +43,7 @@ class XML_Parser $p1 = new Xml_Parser(); try { - $p1->parse('<tag1><tag2></tag2></tag1>'); + $p1->parse('<tag1><tag2></tag2></tag1>'); } catch (Exception $e) { echo "OK\n"; } diff --git a/ext/xml/tests/bug32001.phpt b/ext/xml/tests/bug32001.phpt index 2e9e67d4ca..ff27038a8d 100644 --- a/ext/xml/tests/bug32001.phpt +++ b/ext/xml/tests/bug32001.phpt @@ -122,7 +122,7 @@ HERE; echo "Chunk size: ".($this->chunk_size ? "$this->chunk_size byte(s)\n": "all data at once\n"); echo "BOM: ".($this->bom ? 'prepended': 'not prepended'), "\n"; - if ($success) { + if ($success) { var_dump($this->tags); } else { echo "[Error] ", xml_error_string(xml_get_error_code($parser)), "\n"; @@ -155,7 +155,7 @@ $suite = array( if (XML_SAX_IMPL == 'libxml') { echo "libxml2 Version => " . LIBXML_DOTTED_VERSION. "\n"; } else { - echo "libxml2 Version => NONE\n"; + echo "libxml2 Version => NONE\n"; } foreach ($suite as $testcase) { diff --git a/ext/xml/tests/bug32001b.phpt b/ext/xml/tests/bug32001b.phpt index ddf26ce3cb..21c20e40de 100644 --- a/ext/xml/tests/bug32001b.phpt +++ b/ext/xml/tests/bug32001b.phpt @@ -78,7 +78,7 @@ HERE; echo "Chunk size: ".($this->chunk_size ? "$this->chunk_size byte(s)\n": "all data at once\n"); echo "BOM: ".($this->bom ? 'prepended': 'not prepended'), "\n"; - if ($success) { + if ($success) { var_dump($this->tags); } else { echo "[Error] ", xml_error_string(xml_get_error_code($parser)), "\n"; @@ -97,7 +97,7 @@ $suite = array( if (XML_SAX_IMPL == 'libxml') { echo "libxml2 Version => " . LIBXML_DOTTED_VERSION. "\n"; } else { - echo "libxml2 Version => NONE\n"; + echo "libxml2 Version => NONE\n"; } foreach ($suite as $testcase) { diff --git a/ext/xml/tests/xml001.phpt b/ext/xml/tests/xml001.phpt index 987991e8a8..6d22e5526f 100644 --- a/ext/xml/tests/xml001.phpt +++ b/ext/xml/tests/xml001.phpt @@ -16,7 +16,7 @@ xml_set_character_data_handler($xml_parser, "characterData"); xml_set_processing_instruction_handler($xml_parser, "PIHandler"); xml_set_default_handler($xml_parser, "defaultHandler"); xml_set_external_entity_ref_handler($xml_parser, "externalEntityRefHandler"); - + if (!($fp = @fopen("xmltest.xml", "r"))) { die("could not open XML input"); } diff --git a/ext/xml/tests/xml003.phpt b/ext/xml/tests/xml003.phpt index 973431104b..dd5d8d1e44 100644 --- a/ext/xml/tests/xml003.phpt +++ b/ext/xml/tests/xml003.phpt @@ -11,7 +11,7 @@ chdir(dirname(__FILE__)); class myclass { - function startElement($parser, $name, $attribs) + function startElement($parser, $name, $attribs) { print '{'.$name; if (sizeof($attribs)) { diff --git a/ext/xml/tests/xml010.phpt b/ext/xml/tests/xml010.phpt index e968442123..511129c699 100644 --- a/ext/xml/tests/xml010.phpt +++ b/ext/xml/tests/xml010.phpt @@ -9,7 +9,7 @@ if (! @xml_parser_create_ns('ISO-8859-1')) { die("skip xml_parser_create_ns is n <?php function start_elem($parser,$name,$attribs) { print "$name "; - + foreach($attribs as $key => $value) { print "$key = $value "; } diff --git a/ext/xml/tests/xml_error_string_error.phpt b/ext/xml/tests/xml_error_string_error.phpt index 866346fdd2..0aa847c5cf 100644 --- a/ext/xml/tests/xml_error_string_error.phpt +++ b/ext/xml/tests/xml_error_string_error.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_error_string() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto string xml_error_string(int code) * Description: Get XML parser error string * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_error_string() : error conditions ***\n"; diff --git a/ext/xml/tests/xml_error_string_variation1.phpt b/ext/xml/tests/xml_error_string_variation1.phpt index ff152f8238..39b63e3e35 100644 --- a/ext/xml/tests/xml_error_string_variation1.phpt +++ b/ext/xml/tests/xml_error_string_variation1.phpt @@ -3,15 +3,15 @@ Test xml_error_string() function : usage variations - test different types for --SKIPIF-- <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64-bit only"); if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto string xml_error_string(int code) * Description: Get XML parser error string * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_error_string() : usage variations ***\n"; diff --git a/ext/xml/tests/xml_get_current_byte_index_error.phpt b/ext/xml/tests/xml_get_current_byte_index_error.phpt index 74fa2e7dd1..08a8f1069e 100644 --- a/ext/xml/tests/xml_get_current_byte_index_error.phpt +++ b/ext/xml/tests/xml_get_current_byte_index_error.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_get_current_byte_index() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_get_current_byte_index(resource parser) * Description: Get current byte index for an XML parser * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_get_current_byte_index() : error conditions ***\n"; diff --git a/ext/xml/tests/xml_get_current_byte_index_variation1.phpt b/ext/xml/tests/xml_get_current_byte_index_variation1.phpt index 9f5393bcae..149eeebe42 100644 --- a/ext/xml/tests/xml_get_current_byte_index_variation1.phpt +++ b/ext/xml/tests/xml_get_current_byte_index_variation1.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_get_current_byte_index() function : usage variations - <type here specifics of this variation> --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_get_current_byte_index(resource parser) * Description: Get current byte index for an XML parser * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_get_current_byte_index() : usage variations ***\n"; @@ -73,7 +73,7 @@ $values = array( // object data new aClass(), - + // resource data $fp, diff --git a/ext/xml/tests/xml_get_current_column_number_error.phpt b/ext/xml/tests/xml_get_current_column_number_error.phpt index 1fd28cc0b2..568b6493be 100644 --- a/ext/xml/tests/xml_get_current_column_number_error.phpt +++ b/ext/xml/tests/xml_get_current_column_number_error.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_get_current_column_number() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_get_current_column_number(resource parser) * Description: Get current column number for an XML parser * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_get_current_column_number() : error conditions ***\n"; diff --git a/ext/xml/tests/xml_get_current_column_number_variation1.phpt b/ext/xml/tests/xml_get_current_column_number_variation1.phpt index 7431e10843..f421a70c3e 100644 --- a/ext/xml/tests/xml_get_current_column_number_variation1.phpt +++ b/ext/xml/tests/xml_get_current_column_number_variation1.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_get_current_column_number() function : usage variations --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} -?> + print "skip - XML extension not loaded"; +} +?> --FILE-- <?php /* Prototype : proto int xml_get_current_column_number(resource parser) * Description: Get current column number for an XML parser * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ @@ -74,7 +74,7 @@ $values = array( // object data new aClass(), - + // resource data $fp, diff --git a/ext/xml/tests/xml_get_current_line_number_error.phpt b/ext/xml/tests/xml_get_current_line_number_error.phpt index 282c120f0f..1b79a2a704 100644 --- a/ext/xml/tests/xml_get_current_line_number_error.phpt +++ b/ext/xml/tests/xml_get_current_line_number_error.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_get_current_line_number() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} -?> + print "skip - XML extension not loaded"; +} +?> --FILE-- <?php /* Prototype : proto int xml_get_current_line_number(resource parser) * Description: Get current line number for an XML parser * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_get_current_line_number() : error conditions ***\n"; diff --git a/ext/xml/tests/xml_get_current_line_number_variation1.phpt b/ext/xml/tests/xml_get_current_line_number_variation1.phpt index 4c85f0a13d..4b19de57c9 100644 --- a/ext/xml/tests/xml_get_current_line_number_variation1.phpt +++ b/ext/xml/tests/xml_get_current_line_number_variation1.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_get_current_line_number() function : usage variations --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} -?> + print "skip - XML extension not loaded"; +} +?> --FILE-- <?php /* Prototype : proto int xml_get_current_line_number(resource parser) * Description: Get current line number for an XML parser * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_get_current_line_number() : usage variations ***\n"; @@ -73,7 +73,7 @@ $values = array( // object data new aClass(), - + // resource data $fp, diff --git a/ext/xml/tests/xml_get_error_code_error.phpt b/ext/xml/tests/xml_get_error_code_error.phpt index 683734ae34..1b58a24ccd 100644 --- a/ext/xml/tests/xml_get_error_code_error.phpt +++ b/ext/xml/tests/xml_get_error_code_error.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_get_error_code() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_get_error_code(resource parser) * Description: Get XML parser error code * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_get_error_code() : error conditions ***\n"; diff --git a/ext/xml/tests/xml_get_error_code_variation1.phpt b/ext/xml/tests/xml_get_error_code_variation1.phpt index 58247ac01e..6824870159 100644 --- a/ext/xml/tests/xml_get_error_code_variation1.phpt +++ b/ext/xml/tests/xml_get_error_code_variation1.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_get_error_code() function : usage variations --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_get_error_code(resource parser) * Description: Get XML parser error code * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_get_error_code() : usage variations ***\n"; @@ -73,7 +73,7 @@ $values = array( // object data new aClass(), - + // resource data $fp, diff --git a/ext/xml/tests/xml_parse_error.phpt b/ext/xml/tests/xml_parse_error.phpt index d8d8fffa80..aa1debdb5a 100644 --- a/ext/xml/tests/xml_parse_error.phpt +++ b/ext/xml/tests/xml_parse_error.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_parse() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_parse(resource parser, string data [, int isFinal]) * Description: Start parsing an XML document * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_parse() : error conditions ***\n"; diff --git a/ext/xml/tests/xml_parse_into_struct_error.phpt b/ext/xml/tests/xml_parse_into_struct_error.phpt index 82a26ad05e..311486f3bb 100644 --- a/ext/xml/tests/xml_parse_into_struct_error.phpt +++ b/ext/xml/tests/xml_parse_into_struct_error.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_parse_into_struct() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_parse_into_struct(resource parser, string data, array &struct, array &index) * Description: Parsing a XML document * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_parse_into_struct() : error conditions ***\n"; diff --git a/ext/xml/tests/xml_parse_into_struct_variation.phpt b/ext/xml/tests/xml_parse_into_struct_variation.phpt index a353e51419..e78a00ab9e 100644 --- a/ext/xml/tests/xml_parse_into_struct_variation.phpt +++ b/ext/xml/tests/xml_parse_into_struct_variation.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_parse_into_struct() function : variation --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_parse_into_struct(resource parser, string data, array &struct, array &index) * Description: Parsing a XML document * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_parse_into_struct() : variation ***\n"; diff --git a/ext/xml/tests/xml_parse_into_struct_variation1.phpt b/ext/xml/tests/xml_parse_into_struct_variation1.phpt index e9c41e8f24..bc7c817516 100644 --- a/ext/xml/tests/xml_parse_into_struct_variation1.phpt +++ b/ext/xml/tests/xml_parse_into_struct_variation1.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_parse_into_struct() function : usage variations - different types for parser --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_parse_into_struct(resource parser, string data, array &struct, array &index) * Description: Parsing a XML document * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_parse_into_struct() : usage variations ***\n"; @@ -74,7 +74,7 @@ $values = array( // object data new aClass(), - + // resource data $fp, diff --git a/ext/xml/tests/xml_parse_variation1.phpt b/ext/xml/tests/xml_parse_variation1.phpt index 35a3810ad1..69aae7403b 100644 --- a/ext/xml/tests/xml_parse_variation1.phpt +++ b/ext/xml/tests/xml_parse_variation1.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_parse() function : usage variations - different types of parser --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_parse(resource parser, string data [, int isFinal]) * Description: Start parsing an XML document * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_parse() : usage variations ***\n"; @@ -75,7 +75,7 @@ $values = array( // object data new aClass(), - + // resource data $fp, diff --git a/ext/xml/tests/xml_parser_create_error.phpt b/ext/xml/tests/xml_parser_create_error.phpt index 571350e873..820a3c1b1b 100644 --- a/ext/xml/tests/xml_parser_create_error.phpt +++ b/ext/xml/tests/xml_parser_create_error.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_parser_create() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto resource xml_parser_create([string encoding]) * Description: Create an XML parser * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_parser_create() : error conditions ***\n"; diff --git a/ext/xml/tests/xml_parser_create_ns_error.phpt b/ext/xml/tests/xml_parser_create_ns_error.phpt index fd50f29488..2349e0df3c 100644 --- a/ext/xml/tests/xml_parser_create_ns_error.phpt +++ b/ext/xml/tests/xml_parser_create_ns_error.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_parser_create_ns() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto resource xml_parser_create_ns([string encoding [, string sep]]) * Description: Create an XML parser * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_parser_create_ns() : error conditions ***\n"; diff --git a/ext/xml/tests/xml_parser_create_ns_variation1.phpt b/ext/xml/tests/xml_parser_create_ns_variation1.phpt index 2818b82fe8..098df877a1 100644 --- a/ext/xml/tests/xml_parser_create_ns_variation1.phpt +++ b/ext/xml/tests/xml_parser_create_ns_variation1.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_parser_create_ns() function : usage variations --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto resource xml_parser_create_ns([string encoding [, string sep]]) * Description: Create an XML parser * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_parser_create_ns() : usage variations ***\n"; @@ -77,7 +77,7 @@ $values = array( // object data new aClass(), - + // resource data $fp, @@ -92,7 +92,7 @@ $values = array( foreach($values as $value) { echo @"\nArg value $value \n"; - $res = xml_parser_create_ns($value); + $res = xml_parser_create_ns($value); var_dump($res); if ($res !== false) { xml_parser_free($res); diff --git a/ext/xml/tests/xml_parser_create_variation1.phpt b/ext/xml/tests/xml_parser_create_variation1.phpt index c5d588fec3..641dbf4578 100644 --- a/ext/xml/tests/xml_parser_create_variation1.phpt +++ b/ext/xml/tests/xml_parser_create_variation1.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_parser_create() function : usage variations --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto resource xml_parser_create([string encoding]) * Description: Create an XML parser * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_parser_create() : usage variations ***\n"; @@ -77,7 +77,7 @@ $values = array( // object data new aClass(), - + // resource data $fp, diff --git a/ext/xml/tests/xml_parser_free_error.phpt b/ext/xml/tests/xml_parser_free_error.phpt index 13afb95a71..602fa900b1 100644 --- a/ext/xml/tests/xml_parser_free_error.phpt +++ b/ext/xml/tests/xml_parser_free_error.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_parser_free() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_parser_free(resource parser) * Description: Free an XML parser * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_parser_free() : error conditions ***\n"; diff --git a/ext/xml/tests/xml_parser_free_variation1.phpt b/ext/xml/tests/xml_parser_free_variation1.phpt index b488b481b6..5db31f902c 100644 --- a/ext/xml/tests/xml_parser_free_variation1.phpt +++ b/ext/xml/tests/xml_parser_free_variation1.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_parser_free() function : usage variations --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_parser_free(resource parser) * Description: Free an XML parser * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_parser_free() : usage variations ***\n"; @@ -73,7 +73,7 @@ $values = array( // object data new aClass(), - + // resource data $fp, diff --git a/ext/xml/tests/xml_parser_get_option_error.phpt b/ext/xml/tests/xml_parser_get_option_error.phpt index a35536934c..ff289e9635 100644 --- a/ext/xml/tests/xml_parser_get_option_error.phpt +++ b/ext/xml/tests/xml_parser_get_option_error.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_parser_get_option() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} -?> + print "skip - XML extension not loaded"; +} +?> --FILE-- <?php /* Prototype : proto int xml_parser_get_option(resource parser, int option) * Description: Get options from an XML parser * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_parser_get_option() : error conditions ***\n"; diff --git a/ext/xml/tests/xml_parser_get_option_variation1.phpt b/ext/xml/tests/xml_parser_get_option_variation1.phpt index fd08670d9e..8983c428f2 100644 --- a/ext/xml/tests/xml_parser_get_option_variation1.phpt +++ b/ext/xml/tests/xml_parser_get_option_variation1.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_parser_get_option() function : usage variations --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_parser_get_option(resource parser, int option) * Description: Get options from an XML parser * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_parser_get_option() : usage variations ***\n"; @@ -74,7 +74,7 @@ $values = array( // object data new aClass(), - + // resource data $fp, diff --git a/ext/xml/tests/xml_parser_get_option_variation2.phpt b/ext/xml/tests/xml_parser_get_option_variation2.phpt index 367128727c..c792a0a130 100644 --- a/ext/xml/tests/xml_parser_get_option_variation2.phpt +++ b/ext/xml/tests/xml_parser_get_option_variation2.phpt @@ -3,15 +3,15 @@ Test xml_parser_get_option() function : usage variations --SKIPIF-- <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64-bit only"); if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_parser_get_option(resource parser, int option) * Description: Get options from an XML parser * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_parser_get_option() : usage variations ***\n"; diff --git a/ext/xml/tests/xml_parser_set_option_basic.phpt b/ext/xml/tests/xml_parser_set_option_basic.phpt index 61316a4b0f..d51309d022 100644 --- a/ext/xml/tests/xml_parser_set_option_basic.phpt +++ b/ext/xml/tests/xml_parser_set_option_basic.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_set_notation_decl_handler function : basic --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto bool xml_set_notation_decl_handler ( resource $parser , callback $handler ) * Description: Sets the notation declaration handler function for the XML parser. * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "Simple testcase for xml_parser_get_option() function\n"; diff --git a/ext/xml/tests/xml_parser_set_option_error.phpt b/ext/xml/tests/xml_parser_set_option_error.phpt index 28829bcfa5..9f6498e961 100644 --- a/ext/xml/tests/xml_parser_set_option_error.phpt +++ b/ext/xml/tests/xml_parser_set_option_error.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_parser_set_option() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_parser_set_option(resource parser, int option, mixed value) * Description: Set options in an XML parser * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_parser_set_option() : error conditions ***\n"; diff --git a/ext/xml/tests/xml_parser_set_option_variation1.phpt b/ext/xml/tests/xml_parser_set_option_variation1.phpt index 528fcf8bde..6843fda3f2 100644 --- a/ext/xml/tests/xml_parser_set_option_variation1.phpt +++ b/ext/xml/tests/xml_parser_set_option_variation1.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_parser_set_option() function : usage variations --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_parser_set_option(resource parser, int option, mixed value) * Description: Set options in an XML parser * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_parser_set_option() : usage variations ***\n"; @@ -74,7 +74,7 @@ $values = array( // object data new aClass(), - + // resource data $fp, diff --git a/ext/xml/tests/xml_parser_set_option_variation2.phpt b/ext/xml/tests/xml_parser_set_option_variation2.phpt index 3432e11d73..40f6edf8c8 100644 --- a/ext/xml/tests/xml_parser_set_option_variation2.phpt +++ b/ext/xml/tests/xml_parser_set_option_variation2.phpt @@ -1,18 +1,18 @@ --TEST-- Test xml_parser_set_option() function : usage variations --SKIPIF-- -<?php +<?php if (PHP_INT_SIZE != 8) die("skip this test is for 64-bit only"); if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_parser_set_option(resource parser, int option, mixed value) * Description: Set options in an XML parser * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_parser_set_option() : usage variations ***\n"; diff --git a/ext/xml/tests/xml_parser_set_option_variation3.phpt b/ext/xml/tests/xml_parser_set_option_variation3.phpt index c215ef5fde..262a820ce3 100644 --- a/ext/xml/tests/xml_parser_set_option_variation3.phpt +++ b/ext/xml/tests/xml_parser_set_option_variation3.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_parser_set_option() function : usage variations --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_parser_set_option(resource parser, int option, mixed value) * Description: Set options in an XML parser * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_parser_set_option() : usage variations ***\n"; diff --git a/ext/xml/tests/xml_set_character_data_handler_error.phpt b/ext/xml/tests/xml_set_character_data_handler_error.phpt index 16faaa4f67..d4e91ac2d5 100644 --- a/ext/xml/tests/xml_set_character_data_handler_error.phpt +++ b/ext/xml/tests/xml_set_character_data_handler_error.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_set_character_data_handler() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_set_character_data_handler(resource parser, string hdl) * Description: Set up character data handler * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_set_character_data_handler() : error conditions ***\n"; diff --git a/ext/xml/tests/xml_set_character_data_handler_variation1.phpt b/ext/xml/tests/xml_set_character_data_handler_variation1.phpt index 2270ded5ea..c06f0a96b5 100644 --- a/ext/xml/tests/xml_set_character_data_handler_variation1.phpt +++ b/ext/xml/tests/xml_set_character_data_handler_variation1.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_set_character_data_handler() function : usage variations --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_set_character_data_handler(resource parser, string hdl) * Description: Set up character data handler * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_set_character_data_handler() : usage variations ***\n"; @@ -78,7 +78,7 @@ $values = array( // object data new aClass(), - + // resource data $fp, diff --git a/ext/xml/tests/xml_set_default_handler_error.phpt b/ext/xml/tests/xml_set_default_handler_error.phpt index a4b1b7cbee..9ca7819580 100644 --- a/ext/xml/tests/xml_set_default_handler_error.phpt +++ b/ext/xml/tests/xml_set_default_handler_error.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_set_default_handler() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_set_default_handler(resource parser, string hdl) * Description: Set up default handler * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_set_default_handler() : error conditions ***\n"; diff --git a/ext/xml/tests/xml_set_default_handler_variation1.phpt b/ext/xml/tests/xml_set_default_handler_variation1.phpt index f4d3175ced..2f9a3d5777 100644 --- a/ext/xml/tests/xml_set_default_handler_variation1.phpt +++ b/ext/xml/tests/xml_set_default_handler_variation1.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_set_default_handler() function : usage variations - test different types for parser --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_set_default_handler(resource parser, string hdl) * Description: Set up default handler * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_set_default_handler() : usage variations ***\n"; @@ -78,7 +78,7 @@ $values = array( // object data new aClass(), - + // resource data $fp, diff --git a/ext/xml/tests/xml_set_element_handler_error.phpt b/ext/xml/tests/xml_set_element_handler_error.phpt index 6ccaea1552..00a64163ff 100644 --- a/ext/xml/tests/xml_set_element_handler_error.phpt +++ b/ext/xml/tests/xml_set_element_handler_error.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_set_element_handler() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} -?> + print "skip - XML extension not loaded"; +} +?> --FILE-- <?php /* Prototype : proto int xml_set_element_handler(resource parser, string shdl, string ehdl) * Description: Set up start and end element handlers * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_set_element_handler() : error conditions ***\n"; diff --git a/ext/xml/tests/xml_set_element_handler_variation1.phpt b/ext/xml/tests/xml_set_element_handler_variation1.phpt index 4bfd18fa4b..461b8fab6e 100644 --- a/ext/xml/tests/xml_set_element_handler_variation1.phpt +++ b/ext/xml/tests/xml_set_element_handler_variation1.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_set_element_handler() function : usage variations - test different types for parser --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_set_element_handler(resource parser, string shdl, string ehdl) * Description: Set up start and end element handlers * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_set_element_handler() : usage variations ***\n"; @@ -78,7 +78,7 @@ $values = array( // object data new aClass(), - + // resource data $fp, diff --git a/ext/xml/tests/xml_set_end_namespace_decl_handler_error.phpt b/ext/xml/tests/xml_set_end_namespace_decl_handler_error.phpt index 81bb3f6233..4e69c29563 100644 --- a/ext/xml/tests/xml_set_end_namespace_decl_handler_error.phpt +++ b/ext/xml/tests/xml_set_end_namespace_decl_handler_error.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_set_end_namespace_decl_handler() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_set_end_namespace_decl_handler(resource parser, string hdl) * Description: Set up character data handler * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_set_end_namespace_decl_handler() : error conditions ***\n"; diff --git a/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt index f8333c236b..c9c9fa862d 100644 --- a/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt +++ b/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_set_end_namespace_decl_handler() function : usage variations --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} -?> + print "skip - XML extension not loaded"; +} +?> --FILE-- <?php /* Prototype : proto int xml_set_end_namespace_decl_handler(resource parser, string hdl) * Description: Set up character data handler * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_set_end_namespace_decl_handler() : usage variations ***\n"; @@ -78,7 +78,7 @@ $values = array( // object data new aClass(), - + // resource data $fp, diff --git a/ext/xml/tests/xml_set_external_entity_ref_handler_error.phpt b/ext/xml/tests/xml_set_external_entity_ref_handler_error.phpt index 6dd400ac84..75cfcaabd4 100644 --- a/ext/xml/tests/xml_set_external_entity_ref_handler_error.phpt +++ b/ext/xml/tests/xml_set_external_entity_ref_handler_error.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_set_external_entity_ref_handler() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_set_external_entity_ref_handler(resource parser, string hdl) * Description: Set up external entity reference handler * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_set_external_entity_ref_handler() : error conditions ***\n"; diff --git a/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt b/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt index cd03b5b8b1..f1cef86bf6 100644 --- a/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt +++ b/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_set_external_entity_ref_handler() function : usage variations --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_set_external_entity_ref_handler(resource parser, string hdl) * Description: Set up external entity reference handler * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_set_external_entity_ref_handler() : usage variations ***\n"; @@ -78,7 +78,7 @@ $values = array( // object data new aClass(), - + // resource data $fp, diff --git a/ext/xml/tests/xml_set_notation_decl_handler_basic.phpt b/ext/xml/tests/xml_set_notation_decl_handler_basic.phpt index 6616681ff8..9414216beb 100644 --- a/ext/xml/tests/xml_set_notation_decl_handler_basic.phpt +++ b/ext/xml/tests/xml_set_notation_decl_handler_basic.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_set_notation_decl_handler function : basic --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto bool xml_set_notation_decl_handler ( resource $parser , callback $handler ) * Description: Sets the notation declaration handler function for the XML parser. * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ class XML_Parser @@ -26,16 +26,16 @@ class XML_Parser echo "...Public ID=" . $public_ID . "\n"; echo "...Notation name=" . $notation_name . "\n"; } - + function notation_decl_handler($parser, $name, $base, $system_ID,$public_ID) { - echo "notation_decl_handler called\n"; + echo "notation_decl_handler called\n"; echo "...Name=" . $name . "\n"; echo "...Base=" . $base . "\n"; echo "...System ID=" . $system_ID . "\n"; echo "...Public ID=" . $public_ID . "\n"; } - + function parse($data) { $parser = xml_parser_create(); @@ -59,10 +59,10 @@ $xml = <<<HERE ]> HERE; -echo "Simple test of xml_set_notation_decl_handler(() function\n"; +echo "Simple test of xml_set_notation_decl_handler(() function\n"; $p1 = new Xml_Parser(); -$p1->parse($xml); -echo "Done\n"; +$p1->parse($xml); +echo "Done\n"; ?> --EXPECT-- Simple test of xml_set_notation_decl_handler(() function diff --git a/ext/xml/tests/xml_set_notation_decl_handler_error.phpt b/ext/xml/tests/xml_set_notation_decl_handler_error.phpt index fccc135f76..e3aff7d4f3 100644 --- a/ext/xml/tests/xml_set_notation_decl_handler_error.phpt +++ b/ext/xml/tests/xml_set_notation_decl_handler_error.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_set_notation_decl_handler() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_set_notation_decl_handler(resource parser, string hdl) * Description: Set up notation declaration handler * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_set_notation_decl_handler() : error conditions ***\n"; diff --git a/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt index 10910f6530..b7668dd4b0 100644 --- a/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt +++ b/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_set_notation_decl_handler() function : usage variations --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_set_notation_decl_handler(resource parser, string hdl) * Description: Set up notation declaration handler * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_set_notation_decl_handler() : usage variations ***\n"; @@ -78,7 +78,7 @@ $values = array( // object data new aClass(), - + // resource data $fp, diff --git a/ext/xml/tests/xml_set_object_error.phpt b/ext/xml/tests/xml_set_object_error.phpt index db3266ea13..f9f056ba92 100644 --- a/ext/xml/tests/xml_set_object_error.phpt +++ b/ext/xml/tests/xml_set_object_error.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_set_object() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_set_object(resource parser, object &obj) * Description: Set up object which should be used for callbacks * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_set_object() : error conditions ***\n"; diff --git a/ext/xml/tests/xml_set_object_variation1.phpt b/ext/xml/tests/xml_set_object_variation1.phpt index 92c3d875f0..2c90b8cc38 100644 --- a/ext/xml/tests/xml_set_object_variation1.phpt +++ b/ext/xml/tests/xml_set_object_variation1.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_set_object() function : usage variations --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_set_object(resource parser, object &obj) * Description: Set up object which should be used for callbacks * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_set_object() : usage variations ***\n"; @@ -74,7 +74,7 @@ $values = array( // object data new aClass(), - + // resource data $fp, diff --git a/ext/xml/tests/xml_set_object_variation2.phpt b/ext/xml/tests/xml_set_object_variation2.phpt index 739c091241..fe428ec8a1 100644 --- a/ext/xml/tests/xml_set_object_variation2.phpt +++ b/ext/xml/tests/xml_set_object_variation2.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_set_object() function : usage variations --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_set_object(resource parser, object &obj) * Description: Set up object which should be used for callbacks * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_set_object() : usage variations ***\n"; @@ -66,7 +66,7 @@ $values = array( // string data "string", 'string', - + // resource data $fp, diff --git a/ext/xml/tests/xml_set_processing_instruction_handler_basic.phpt b/ext/xml/tests/xml_set_processing_instruction_handler_basic.phpt index e5589cee29..61193c079f 100644 --- a/ext/xml/tests/xml_set_processing_instruction_handler_basic.phpt +++ b/ext/xml/tests/xml_set_processing_instruction_handler_basic.phpt @@ -1,28 +1,28 @@ --TEST-- Test xml_set_processing_instruction_handler function : basic --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto bool xml_set_processing_instruction_handler ( resource $parser , callback $handler ) * Description: Sets the processing instruction (PI) handler function for the XML parser. * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ class XML_Parser { - + function PIHandler($parser, $target, $data) { echo "Target: " . $target. "\n"; echo "Data: " . $data . "\n"; } - + function parse($data) { $parser = xml_parser_create(); @@ -32,7 +32,7 @@ class XML_Parser xml_parser_free($parser); } - + } $xml = <<<HERE @@ -40,10 +40,10 @@ $xml = <<<HERE <?xml-stylesheet href="default.xsl" type="text/xml"?> HERE; -echo "Simple test of xml_set_processing_instruction_handler() function\n"; +echo "Simple test of xml_set_processing_instruction_handler() function\n"; $p1 = new Xml_Parser(); -$p1->parse($xml); -echo "Done\n"; +$p1->parse($xml); +echo "Done\n"; ?> --EXPECT-- Simple test of xml_set_processing_instruction_handler() function diff --git a/ext/xml/tests/xml_set_processing_instruction_handler_error.phpt b/ext/xml/tests/xml_set_processing_instruction_handler_error.phpt index f2a8494d54..0d6deb9fd8 100644 --- a/ext/xml/tests/xml_set_processing_instruction_handler_error.phpt +++ b/ext/xml/tests/xml_set_processing_instruction_handler_error.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_set_processing_instruction_handler() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_set_processing_instruction_handler(resource parser, string hdl) * Description: Set up processing instruction (PI) handler * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_set_processing_instruction_handler() : error conditions ***\n"; diff --git a/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt b/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt index a05d0e60e7..227337b338 100644 --- a/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt +++ b/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_set_processing_instruction_handler() function : usage variations --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_set_processing_instruction_handler(resource parser, string hdl) * Description: Set up processing instruction (PI) handler * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_set_processing_instruction_handler() : usage variations ***\n"; @@ -78,7 +78,7 @@ $values = array( // object data new aClass(), - + // resource data $fp, diff --git a/ext/xml/tests/xml_set_start_namespace_decl_handler_basic.phpt b/ext/xml/tests/xml_set_start_namespace_decl_handler_basic.phpt index 79b8cb88fc..9fa02f66ab 100644 --- a/ext/xml/tests/xml_set_start_namespace_decl_handler_basic.phpt +++ b/ext/xml/tests/xml_set_start_namespace_decl_handler_basic.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_set_start_namespace_decl_handler function: basic --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : bool xml_set_start_namespace_decl_handler ( resource $parser , callback $handler ) * Description: Set up start namespace declaration handler. * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ $xml = <<<HERE @@ -34,13 +34,13 @@ xml_parser_free( $parser ); echo "Done\n"; function Namespace_Start_Handler( $parser, $prefix, $uri ) { - echo "Namespace_Start_Handler called\n"; + echo "Namespace_Start_Handler called\n"; echo "...Prefix: ". $prefix . "\n"; echo "...Uri: ". $uri . "\n"; } function Namespace_End_Handler($parser, $prefix) { - echo "Namespace_End_Handler called\n"; + echo "Namespace_End_Handler called\n"; echo "...Prefix: ". $prefix . "\n\n"; } diff --git a/ext/xml/tests/xml_set_start_namespace_decl_handler_error.phpt b/ext/xml/tests/xml_set_start_namespace_decl_handler_error.phpt index 221b005dfd..3b4163e1ef 100644 --- a/ext/xml/tests/xml_set_start_namespace_decl_handler_error.phpt +++ b/ext/xml/tests/xml_set_start_namespace_decl_handler_error.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_set_start_namespace_decl_handler() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_set_start_namespace_decl_handler(resource parser, string hdl) * Description: Set up character data handler * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_set_start_namespace_decl_handler() : error conditions ***\n"; diff --git a/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt index 5139499f1d..90faa2caf2 100644 --- a/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt +++ b/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_set_start_namespace_decl_handler() function : usage variations --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_set_start_namespace_decl_handler(resource parser, string hdl) * Description: Set up character data handler * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_set_start_namespace_decl_handler() : usage variations ***\n"; @@ -78,7 +78,7 @@ $values = array( // object data new aClass(), - + // resource data $fp, diff --git a/ext/xml/tests/xml_set_unparsed_entity_decl_handler_error.phpt b/ext/xml/tests/xml_set_unparsed_entity_decl_handler_error.phpt index 952a6984b4..a8119ca344 100644 --- a/ext/xml/tests/xml_set_unparsed_entity_decl_handler_error.phpt +++ b/ext/xml/tests/xml_set_unparsed_entity_decl_handler_error.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_set_unparsed_entity_decl_handler() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} -?> + print "skip - XML extension not loaded"; +} +?> --FILE-- <?php /* Prototype : proto int xml_set_unparsed_entity_decl_handler(resource parser, string hdl) * Description: Set up unparsed entity declaration handler * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_set_unparsed_entity_decl_handler() : error conditions ***\n"; diff --git a/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt index b5d822ed89..1f9fe4bfd3 100644 --- a/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt +++ b/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt @@ -1,17 +1,17 @@ --TEST-- Test xml_set_unparsed_entity_decl_handler() function : usage variations --SKIPIF-- -<?php +<?php if (!extension_loaded("xml")) { - print "skip - XML extension not loaded"; -} + print "skip - XML extension not loaded"; +} ?> --FILE-- <?php /* Prototype : proto int xml_set_unparsed_entity_decl_handler(resource parser, string hdl) * Description: Set up unparsed entity declaration handler * Source code: ext/xml/xml.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing xml_set_unparsed_entity_decl_handler() : usage variations ***\n"; @@ -78,7 +78,7 @@ $values = array( // object data new aClass(), - + // resource data $fp, diff --git a/ext/xmlreader/tests/001.phpt b/ext/xmlreader/tests/001.phpt index 75d9b12b76..64f59ee26a 100644 --- a/ext/xmlreader/tests/001.phpt +++ b/ext/xmlreader/tests/001.phpt @@ -3,7 +3,7 @@ XMLReader: libxml2 XML Reader, string data --SKIPIF-- <?php if (!extension_loaded("xmlreader")) print "skip"; ?> --FILE-- -<?php +<?php $xmlstring = '<?xml version="1.0" encoding="UTF-8"?> <books></books>'; diff --git a/ext/xmlreader/tests/002.phpt b/ext/xmlreader/tests/002.phpt index 5904b22d6e..48e1e4f74e 100644 --- a/ext/xmlreader/tests/002.phpt +++ b/ext/xmlreader/tests/002.phpt @@ -3,7 +3,7 @@ XMLReader: libxml2 XML Reader, file data --SKIPIF-- <?php if (!extension_loaded("xmlreader")) print "skip"; ?> --FILE-- -<?php +<?php $filename = dirname(__FILE__) . '/_002.xml'; $xmlstring = '<?xml version="1.0" encoding="UTF-8"?> <books></books>'; diff --git a/ext/xmlreader/tests/003-mb.phpt b/ext/xmlreader/tests/003-mb.phpt index 43d47f5908..3dba1f5daf 100644 --- a/ext/xmlreader/tests/003-mb.phpt +++ b/ext/xmlreader/tests/003-mb.phpt @@ -3,7 +3,7 @@ XMLReader: libxml2 XML Reader, attributes test --SKIPIF-- <?php if (!extension_loaded("xmlreader")) print "skip"; ?> --FILE-- -<?php +<?php $filename = dirname(__FILE__) . '/私はガラスを食べられます_003.xml'; $xmlstring = '<?xml version="1.0" encoding="UTF-8"?> diff --git a/ext/xmlreader/tests/003.phpt b/ext/xmlreader/tests/003.phpt index d93a93a85b..8e5b18f68b 100644 --- a/ext/xmlreader/tests/003.phpt +++ b/ext/xmlreader/tests/003.phpt @@ -3,7 +3,7 @@ XMLReader: libxml2 XML Reader, attributes test --SKIPIF-- <?php if (!extension_loaded("xmlreader")) print "skip"; ?> --FILE-- -<?php +<?php $filename = dirname(__FILE__) . '/_003.xml'; $xmlstring = '<?xml version="1.0" encoding="UTF-8"?> diff --git a/ext/xmlreader/tests/004.phpt b/ext/xmlreader/tests/004.phpt index 55fca4ee7a..13d9024304 100644 --- a/ext/xmlreader/tests/004.phpt +++ b/ext/xmlreader/tests/004.phpt @@ -3,7 +3,7 @@ XMLReader: libxml2 XML Reader, attributes test --SKIPIF-- <?php if (!extension_loaded("xmlreader")) print "skip"; ?> --FILE-- -<?php +<?php $filename = dirname(__FILE__) . '/_004.xml'; $xmlstring = '<?xml version="1.0" encoding="UTF-8"?> diff --git a/ext/xmlreader/tests/005.phpt b/ext/xmlreader/tests/005.phpt index a1fd6c110e..07a616acff 100644 --- a/ext/xmlreader/tests/005.phpt +++ b/ext/xmlreader/tests/005.phpt @@ -3,7 +3,7 @@ XMLReader: libxml2 XML Reader, parser property set/get --SKIPIF-- <?php if (!extension_loaded("xmlreader")) print "skip"; ?> --FILE-- -<?php +<?php $xmlstring = '<?xml version="1.0" encoding="UTF-8"?> <books></books>'; @@ -16,14 +16,14 @@ $reader->XML($xmlstring); $a = $reader->setParserProperty(XMLReader::LOADDTD, false); $b = $reader->getParserProperty(XMLReader::LOADDTD); -if (!$a && !$b) { +if (!$a && !$b) { echo "ok\n"; } $a = $reader->setParserProperty(XMLReader::SUBST_ENTITIES, true); $b = $reader->getParserProperty(XMLReader::SUBST_ENTITIES); -if ($a && $b) { +if ($a && $b) { echo "ok\n"; } // Only go through diff --git a/ext/xmlreader/tests/006.phpt b/ext/xmlreader/tests/006.phpt index f1e482d955..f3c37f7dad 100644 --- a/ext/xmlreader/tests/006.phpt +++ b/ext/xmlreader/tests/006.phpt @@ -3,7 +3,7 @@ XMLReader: libxml2 XML Reader, moveToElement --SKIPIF-- <?php if (!extension_loaded("xmlreader")) print "skip"; ?> --FILE-- -<?php +<?php $xmlstring = '<?xml version="1.0" encoding="UTF-8"?> <books><book num="1"></book><test /></books>'; diff --git a/ext/xmlreader/tests/007.phpt b/ext/xmlreader/tests/007.phpt index 17b181a67f..acbb574721 100644 --- a/ext/xmlreader/tests/007.phpt +++ b/ext/xmlreader/tests/007.phpt @@ -3,10 +3,10 @@ XMLReader: libxml2 XML Reader, setRelaxNGSchema --SKIPIF-- <?php if (!extension_loaded("xmlreader")) print "skip"; ?> --FILE-- -<?php +<?php $xmlstring = '<TEI.2>hello</TEI.2>'; -$relaxngfile = dirname(__FILE__) . '/relaxNG.rng'; +$relaxngfile = dirname(__FILE__) . '/relaxNG.rng'; $file = dirname(__FILE__) . '/_007.xml'; file_put_contents($file, $xmlstring); diff --git a/ext/xmlreader/tests/008.phpt b/ext/xmlreader/tests/008.phpt index 0a7583741d..e3a29c8e4f 100644 --- a/ext/xmlreader/tests/008.phpt +++ b/ext/xmlreader/tests/008.phpt @@ -3,7 +3,7 @@ XMLReader: libxml2 XML Reader, DTD --SKIPIF-- <?php if (!extension_loaded("xmlreader")) print "skip"; ?> --FILE-- -<?php +<?php $xmlstring = '<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!DOCTYPE LIST SYSTEM "dtdexample.dtd"> @@ -21,7 +21,7 @@ $xmlstring = '<?xml version="1.0" encoding="UTF-8" standalone="no"?> </MOVIE> </LIST>'; -$dtdfile = rawurlencode(dirname(__FILE__)) . '/dtdexample.dtd'; +$dtdfile = rawurlencode(dirname(__FILE__)) . '/dtdexample.dtd'; $file = dirname(__FILE__) . '/_008.xml'; file_put_contents($file, $xmlstring); diff --git a/ext/xmlreader/tests/009.phpt b/ext/xmlreader/tests/009.phpt index 3124d91306..937e771835 100644 --- a/ext/xmlreader/tests/009.phpt +++ b/ext/xmlreader/tests/009.phpt @@ -3,7 +3,7 @@ XMLReader: libxml2 XML Reader, next --SKIPIF-- <?php if (!extension_loaded("xmlreader")) print "skip"; ?> --FILE-- -<?php +<?php $xmlstring = '<?xml version="1.0" encoding="UTF-8"?> <books><book num="1"><test /></book><book num="2" /></books>'; diff --git a/ext/xmlreader/tests/010.phpt b/ext/xmlreader/tests/010.phpt index b9d9f7b005..085a3ac38f 100644 --- a/ext/xmlreader/tests/010.phpt +++ b/ext/xmlreader/tests/010.phpt @@ -3,7 +3,7 @@ XMLReader: libxml2 XML Reader, next --SKIPIF-- <?php if (!extension_loaded("xmlreader")) print "skip"; ?> --FILE-- -<?php +<?php $xmlstring = '<?xml version="1.0" encoding="UTF-8"?> <prefix:books xmlns:prefix="uri" isbn="" prefix:isbn="12isbn">book1</prefix:books>'; diff --git a/ext/xmlreader/tests/011.phpt b/ext/xmlreader/tests/011.phpt index cb135f7bf4..016c7cd334 100644 --- a/ext/xmlreader/tests/011.phpt +++ b/ext/xmlreader/tests/011.phpt @@ -6,7 +6,7 @@ $reader = new XMLReader(); if (!method_exists($reader, 'readInnerXml')) print "skip"; ?> --FILE-- -<?php +<?php $xmlstring = '<?xml version="1.0" encoding="UTF-8"?> <books><book>test</book></books>'; diff --git a/ext/xmlreader/tests/012.phpt b/ext/xmlreader/tests/012.phpt index d176979e5b..cb0d121e83 100644 --- a/ext/xmlreader/tests/012.phpt +++ b/ext/xmlreader/tests/012.phpt @@ -3,7 +3,7 @@ XMLReader: accessing empty and non existing attributes --SKIPIF-- <?php if (!extension_loaded("xmlreader")) print "skip"; ?> --FILE-- -<?php +<?php $xmlstring =<<<EOF <?xml version="1.0" encoding="UTF-8"?> diff --git a/ext/xmlreader/tests/bug36743.phpt b/ext/xmlreader/tests/bug36743.phpt index 374941b0c7..93cd7ca4f7 100644 --- a/ext/xmlreader/tests/bug36743.phpt +++ b/ext/xmlreader/tests/bug36743.phpt @@ -19,7 +19,7 @@ $t = new test; echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(1) { [0]=> int(1) diff --git a/ext/xmlreader/tests/bug42139.phpt b/ext/xmlreader/tests/bug42139.phpt index 0ef2d355dd..a3efb59d0b 100644 --- a/ext/xmlreader/tests/bug42139.phpt +++ b/ext/xmlreader/tests/bug42139.phpt @@ -22,7 +22,7 @@ while ( $reader->read() ) { $reader->close(); ?> ---EXPECT-- +--EXPECT-- 10, root, 1, root, 3, #text, y diff --git a/ext/xmlreader/tests/expand.phpt b/ext/xmlreader/tests/expand.phpt index c77e6c31b7..9b8b7258b7 100644 --- a/ext/xmlreader/tests/expand.phpt +++ b/ext/xmlreader/tests/expand.phpt @@ -7,7 +7,7 @@ $reader = new XMLReader(); if (!method_exists($reader, 'expand')) print "skip"; ?> --FILE-- -<?php +<?php $basexml = '<?xml version="1.0" encoding="UTF-8"?> <books><book>base book</book></books>'; diff --git a/ext/xmlrpc/tests/001.phpt b/ext/xmlrpc/tests/001.phpt index 2625096714..49dfba8f10 100644 --- a/ext/xmlrpc/tests/001.phpt +++ b/ext/xmlrpc/tests/001.phpt @@ -12,7 +12,7 @@ var_dump(xmlrpc_encode_request(3.4, 1)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(174) "<?xml version="1.0" encoding="iso-8859-1"?> <methodCall> <methodName>-1</methodName> diff --git a/ext/xmlrpc/tests/002.phpt b/ext/xmlrpc/tests/002.phpt index 83586464bc..cb4b4aa818 100644 --- a/ext/xmlrpc/tests/002.phpt +++ b/ext/xmlrpc/tests/002.phpt @@ -27,7 +27,7 @@ var_dump($method); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(0) { } string(6) "method" diff --git a/ext/xmlrpc/tests/bug37057.phpt b/ext/xmlrpc/tests/bug37057.phpt index 013cc9192c..e656a7c654 100644 --- a/ext/xmlrpc/tests/bug37057.phpt +++ b/ext/xmlrpc/tests/bug37057.phpt @@ -48,7 +48,7 @@ var_dump($retval[0]); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(1) { [50]=> string(4) "0.29" diff --git a/ext/xmlrpc/tests/bug38431.phpt b/ext/xmlrpc/tests/bug38431.phpt index 8cc9eeaf97..2b03378b81 100644 --- a/ext/xmlrpc/tests/bug38431.phpt +++ b/ext/xmlrpc/tests/bug38431.phpt @@ -16,7 +16,7 @@ var_dump(xmlrpc_get_type($var)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(5) "array" string(5) "array" string(5) "array" diff --git a/ext/xmlrpc/tests/bug40576.phpt b/ext/xmlrpc/tests/bug40576.phpt index fedf53ee84..e8aafc3535 100644 --- a/ext/xmlrpc/tests/bug40576.phpt +++ b/ext/xmlrpc/tests/bug40576.phpt @@ -19,7 +19,7 @@ var_dump(xmlrpc_encode("1.22222222222222222222222")); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(125) "<?xml version="1.0" encoding="utf-8"?> <params> <param> diff --git a/ext/xmlrpc/tests/bug40576_64bit.phpt b/ext/xmlrpc/tests/bug40576_64bit.phpt index 74f8f0cbea..926980d5b2 100644 --- a/ext/xmlrpc/tests/bug40576_64bit.phpt +++ b/ext/xmlrpc/tests/bug40576_64bit.phpt @@ -19,7 +19,7 @@ var_dump(xmlrpc_encode("1.22222222222222222222222")); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(125) "<?xml version="1.0" encoding="utf-8"?> <params> <param> diff --git a/ext/xmlrpc/tests/bug42189.phpt b/ext/xmlrpc/tests/bug42189.phpt index 55e726cf68..68b29025ef 100644 --- a/ext/xmlrpc/tests/bug42189.phpt +++ b/ext/xmlrpc/tests/bug42189.phpt @@ -10,6 +10,6 @@ var_dump($ok); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- bool(false) Done diff --git a/ext/xmlrpc/tests/bug42736.phpt b/ext/xmlrpc/tests/bug42736.phpt index 1dfe1c65f1..9ab2818169 100644 --- a/ext/xmlrpc/tests/bug42736.phpt +++ b/ext/xmlrpc/tests/bug42736.phpt @@ -28,7 +28,7 @@ var_dump($response); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(402) "<?xml version="1.0" encoding="iso-8859-1"?> <methodResponse> <params> diff --git a/ext/xmlrpc/tests/bug50285.phpt b/ext/xmlrpc/tests/bug50285.phpt index 0a5fb962b4..41da3c8aac 100644 --- a/ext/xmlrpc/tests/bug50285.phpt +++ b/ext/xmlrpc/tests/bug50285.phpt @@ -33,7 +33,7 @@ EOD; $response = xmlrpc_server_call_method($server, $HTTP_RAW_POST_DATA, null); var_dump(xmlrpc_decode($response)); -// ------------ +// ------------ $server = xmlrpc_server_create(); $result = xmlrpc_server_register_method($server, 'test2', 'test2'); @@ -47,7 +47,7 @@ EOD; $response = xmlrpc_server_call_method($server, $HTTP_RAW_POST_DATA, null); var_dump(xmlrpc_decode($response)); -// ------------ +// ------------ $server = xmlrpc_server_create(); $result = xmlrpc_server_register_method($server, 'test3', 'test3'); @@ -61,7 +61,7 @@ EOD; $response = xmlrpc_server_call_method($server, $HTTP_RAW_POST_DATA, null); var_dump(xmlrpc_decode($response)); -// ------------ +// ------------ $server = xmlrpc_server_create(); $result = xmlrpc_server_register_method($server, 'test4', 'test4'); diff --git a/ext/xmlrpc/tests/bug68027.phpt b/ext/xmlrpc/tests/bug68027.phpt index a5c96f1cf2..cc9f6beb2b 100644 --- a/ext/xmlrpc/tests/bug68027.phpt +++ b/ext/xmlrpc/tests/bug68027.phpt @@ -20,7 +20,7 @@ print_r($obj); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- object(stdClass)#1 (3) { ["scalar"]=> string(16) "6-01-01 20:00:00" diff --git a/ext/xmlrpc/tests/bug70526.phpt b/ext/xmlrpc/tests/bug70526.phpt index 6ed3e1b997..f5f8ea3865 100644 --- a/ext/xmlrpc/tests/bug70526.phpt +++ b/ext/xmlrpc/tests/bug70526.phpt @@ -10,5 +10,5 @@ $params = date("Ymd\TH:i:s", time()); $rv = xmlrpc_set_type($params, 'datetime'); var_dump($rv); ?> ---EXPECT-- +--EXPECT-- bool(true) diff --git a/ext/xmlrpc/tests/bug70728.phpt b/ext/xmlrpc/tests/bug70728.phpt index 52e1aa9843..0314f1db69 100644 --- a/ext/xmlrpc/tests/bug70728.phpt +++ b/ext/xmlrpc/tests/bug70728.phpt @@ -13,7 +13,7 @@ $obj->scalar = 0x1122334455; var_dump(xmlrpc_encode($obj)); var_dump($obj); ?> ---EXPECT-- +--EXPECT-- string(135) "<?xml version="1.0" encoding="utf-8"?> <params> <param> diff --git a/ext/xmlrpc/tests/bug70728_64bit.phpt b/ext/xmlrpc/tests/bug70728_64bit.phpt index b5e96a9d88..37a4f6b74b 100644 --- a/ext/xmlrpc/tests/bug70728_64bit.phpt +++ b/ext/xmlrpc/tests/bug70728_64bit.phpt @@ -13,7 +13,7 @@ $obj->scalar = 0x1122334455; var_dump(xmlrpc_encode($obj)); var_dump($obj); ?> ---EXPECT-- +--EXPECT-- string(135) "<?xml version="1.0" encoding="utf-8"?> <params> <param> diff --git a/ext/xmlrpc/tests/bug74975.phpt b/ext/xmlrpc/tests/bug74975.phpt index 46a5af28e2..1b3529813f 100644 --- a/ext/xmlrpc/tests/bug74975.phpt +++ b/ext/xmlrpc/tests/bug74975.phpt @@ -8,14 +8,14 @@ if (!extension_loaded("xmlrpc")) print "skip"; <?php class Foo { - + } class Bar { - + public $xmlrpc_type; public $scalar; - + } $foo = new Foo(); diff --git a/ext/xmlwriter/tests/005-mb.phpt b/ext/xmlwriter/tests/005-mb.phpt index 348b7cf73c..eaa10920b5 100644 --- a/ext/xmlwriter/tests/005-mb.phpt +++ b/ext/xmlwriter/tests/005-mb.phpt @@ -2,11 +2,11 @@ XMLWriter: libxml2 XML Writer, comments --SKIPIF-- <?php -if (!extension_loaded("xmlwriter")) die("skip"); +if (!extension_loaded("xmlwriter")) die("skip"); if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ required"); ?> --FILE-- -<?php +<?php $doc_dest = '私はガラスを食べられます001.xml'; $xw = xmlwriter_open_uri($doc_dest); diff --git a/ext/xmlwriter/tests/005.phpt b/ext/xmlwriter/tests/005.phpt index acf0a5fdbe..278eaf9648 100644 --- a/ext/xmlwriter/tests/005.phpt +++ b/ext/xmlwriter/tests/005.phpt @@ -2,11 +2,11 @@ XMLWriter: libxml2 XML Writer, comments --SKIPIF-- <?php -if (!extension_loaded("xmlwriter")) die("skip"); +if (!extension_loaded("xmlwriter")) die("skip"); if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ required"); ?> --FILE-- -<?php +<?php $doc_dest = '001.xml'; $xw = xmlwriter_open_uri($doc_dest); diff --git a/ext/xmlwriter/tests/006.phpt b/ext/xmlwriter/tests/006.phpt index 4533c566a6..9b32be3aee 100644 --- a/ext/xmlwriter/tests/006.phpt +++ b/ext/xmlwriter/tests/006.phpt @@ -1,11 +1,11 @@ --TEST-- XMLWriter: libxml2 XML Writer, startDTD/writeElementNS --SKIPIF-- -<?php -if (!extension_loaded("xmlwriter")) die("skip"); +<?php +if (!extension_loaded("xmlwriter")) die("skip"); ?> --FILE-- -<?php +<?php $doc_dest = '001.xml'; $xw = xmlwriter_open_uri($doc_dest); diff --git a/ext/xmlwriter/tests/007.phpt b/ext/xmlwriter/tests/007.phpt index f1b980a9cc..9a1b7c2c3b 100644 --- a/ext/xmlwriter/tests/007.phpt +++ b/ext/xmlwriter/tests/007.phpt @@ -1,11 +1,11 @@ --TEST-- -XMLWriter: libxml2 XML Writer, Elements & Attributes +XMLWriter: libxml2 XML Writer, Elements & Attributes --SKIPIF-- -<?php -if (!extension_loaded("xmlwriter")) die("skip"); +<?php +if (!extension_loaded("xmlwriter")) die("skip"); ?> --FILE-- -<?php +<?php $xw = xmlwriter_open_memory(); xmlwriter_set_indent($xw, TRUE); diff --git a/ext/xmlwriter/tests/008.phpt b/ext/xmlwriter/tests/008.phpt index 0bb65c8a23..e14abe23d2 100644 --- a/ext/xmlwriter/tests/008.phpt +++ b/ext/xmlwriter/tests/008.phpt @@ -1,11 +1,11 @@ --TEST-- XMLWriter: libxml2 XML Writer DTD Element & Attlist --SKIPIF-- -<?php -if (!extension_loaded("xmlwriter")) die("skip"); +<?php +if (!extension_loaded("xmlwriter")) die("skip"); ?> --FILE-- -<?php +<?php $xw = xmlwriter_open_memory(); xmlwriter_set_indent($xw, TRUE); diff --git a/ext/xmlwriter/tests/009.phpt b/ext/xmlwriter/tests/009.phpt index 397b922f7c..bec88befbd 100644 --- a/ext/xmlwriter/tests/009.phpt +++ b/ext/xmlwriter/tests/009.phpt @@ -1,12 +1,12 @@ --TEST-- XMLWriter: PI, Comment, CDATA --SKIPIF-- -<?php -if (!extension_loaded("xmlwriter")) die("skip"); +<?php +if (!extension_loaded("xmlwriter")) die("skip"); if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ required"); ?> --FILE-- -<?php +<?php /* Libxml 2.6.24 and up adds a new line after a processing instruction (PI) */ diff --git a/ext/xmlwriter/tests/010.phpt b/ext/xmlwriter/tests/010.phpt index 9f066a7c3e..a32a9696a6 100644 --- a/ext/xmlwriter/tests/010.phpt +++ b/ext/xmlwriter/tests/010.phpt @@ -1,8 +1,8 @@ --TEST-- xmlwriter_start/end_attribute() --SKIPIF-- -<?php -if (!extension_loaded("xmlwriter")) die("skip"); +<?php +if (!extension_loaded("xmlwriter")) die("skip"); ?> --FILE-- <?php diff --git a/ext/xmlwriter/tests/011.phpt b/ext/xmlwriter/tests/011.phpt index 07d987c2ee..1af76f81d4 100644 --- a/ext/xmlwriter/tests/011.phpt +++ b/ext/xmlwriter/tests/011.phpt @@ -1,14 +1,14 @@ --TEST-- XMLWriter: libxml2 XML Writer, write_attribute_ns function ---CREDITS-- +--CREDITS-- Mauricio Vieira <mauricio [at] @mauriciovieira [dot] net> #testfest PHPSP on 2014-07-05 --SKIPIF-- -<?php -if (!extension_loaded("xmlwriter")) die("skip"); +<?php +if (!extension_loaded("xmlwriter")) die("skip"); ?> --FILE-- -<?php +<?php $xw = xmlwriter_open_memory(); xmlwriter_set_indent($xw, TRUE); diff --git a/ext/xmlwriter/tests/OO_005.phpt b/ext/xmlwriter/tests/OO_005.phpt index 9e59c0b2ed..e84628d446 100644 --- a/ext/xmlwriter/tests/OO_005.phpt +++ b/ext/xmlwriter/tests/OO_005.phpt @@ -1,12 +1,12 @@ --TEST-- XMLWriter: libxml2 XML Writer, comments --SKIPIF-- -<?php -if (!extension_loaded("xmlwriter")) die("skip"); +<?php +if (!extension_loaded("xmlwriter")) die("skip"); if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ required"); ?> --FILE-- -<?php +<?php $doc_dest = '001.xml'; $xw = new XMLWriter(); diff --git a/ext/xmlwriter/tests/OO_006.phpt b/ext/xmlwriter/tests/OO_006.phpt index e873b58813..1b543192b1 100644 --- a/ext/xmlwriter/tests/OO_006.phpt +++ b/ext/xmlwriter/tests/OO_006.phpt @@ -1,11 +1,11 @@ --TEST-- XMLWriter: libxml2 XML Writer, startDTD/writeElementNS --SKIPIF-- -<?php -if (!extension_loaded("xmlwriter")) die("skip"); +<?php +if (!extension_loaded("xmlwriter")) die("skip"); ?> --FILE-- -<?php +<?php $doc_dest = '001.xml'; $xw = new XMLWriter(); diff --git a/ext/xmlwriter/tests/OO_007.phpt b/ext/xmlwriter/tests/OO_007.phpt index 5b41896b75..b7172cf76a 100644 --- a/ext/xmlwriter/tests/OO_007.phpt +++ b/ext/xmlwriter/tests/OO_007.phpt @@ -1,11 +1,11 @@ --TEST-- -XMLWriter: libxml2 XML Writer, Elements & Attributes +XMLWriter: libxml2 XML Writer, Elements & Attributes --SKIPIF-- -<?php -if (!extension_loaded("xmlwriter")) die("skip"); +<?php +if (!extension_loaded("xmlwriter")) die("skip"); ?> --FILE-- -<?php +<?php $xw = new XMLWriter(); $xw->openMemory(); diff --git a/ext/xmlwriter/tests/OO_008.phpt b/ext/xmlwriter/tests/OO_008.phpt index dd0570a8a3..b85a2919b5 100644 --- a/ext/xmlwriter/tests/OO_008.phpt +++ b/ext/xmlwriter/tests/OO_008.phpt @@ -1,11 +1,11 @@ --TEST-- XMLWriter: libxml2 XML Writer DTD Element & Attlist --SKIPIF-- -<?php -if (!extension_loaded("xmlwriter")) die("skip"); +<?php +if (!extension_loaded("xmlwriter")) die("skip"); ?> --FILE-- -<?php +<?php $xw = new XMLWriter(); $xw->openMemory(); diff --git a/ext/xmlwriter/tests/OO_009.phpt b/ext/xmlwriter/tests/OO_009.phpt index e28086c03d..65f6e75862 100644 --- a/ext/xmlwriter/tests/OO_009.phpt +++ b/ext/xmlwriter/tests/OO_009.phpt @@ -1,11 +1,11 @@ --TEST-- XMLWriter: PI, Comment, CDATA --SKIPIF-- -<?php -if (!extension_loaded("xmlwriter")) die("skip"); +<?php +if (!extension_loaded("xmlwriter")) die("skip"); ?> --FILE-- -<?php +<?php /* Libxml 2.6.24 and up adds a new line after a processing instruction (PI) */ diff --git a/ext/xmlwriter/tests/OO_010.phpt b/ext/xmlwriter/tests/OO_010.phpt index 5c384797d2..e69aaed428 100644 --- a/ext/xmlwriter/tests/OO_010.phpt +++ b/ext/xmlwriter/tests/OO_010.phpt @@ -1,14 +1,14 @@ --TEST-- XMLWriter: libxml2 XML Writer, writeAttributeNS method ---CREDITS-- +--CREDITS-- Mauricio Vieira <mauricio [at] @mauriciovieira [dot] net> #testfest PHPSP on 2014-07-05 --SKIPIF-- -<?php -if (!extension_loaded("xmlwriter")) die("skip"); +<?php +if (!extension_loaded("xmlwriter")) die("skip"); ?> --FILE-- -<?php +<?php $xw = new XMLWriter(); $xw->openMemory(); @@ -17,7 +17,7 @@ $xw->setIndentString(' '); $xw->startDocument('1.0', "UTF-8"); $xw->startElement('root'); $xw->startElementNS('ns1', 'child1', 'urn:ns1'); -$xw->writeAttributeNS('ns1', 'att1', 'urn:ns1', '<>"\'&'); +$xw->writeAttributeNS('ns1', 'att1', 'urn:ns1', '<>"\'&'); $xw->writeElement('chars', "special characters: <>\"'&"); $xw->endElement(); $xw->endDocument(); diff --git a/ext/xmlwriter/tests/bug39504.phpt b/ext/xmlwriter/tests/bug39504.phpt index 4b6ceda4fd..267c5331de 100644 --- a/ext/xmlwriter/tests/bug39504.phpt +++ b/ext/xmlwriter/tests/bug39504.phpt @@ -1,8 +1,8 @@ --TEST-- Bug #39504 (xmlwriter_write_dtd_entity() creates Attlist tag, not enity) --SKIPIF-- -<?php -if (!extension_loaded("xmlwriter")) die("skip"); +<?php +if (!extension_loaded("xmlwriter")) die("skip"); ?> --FILE-- <?php diff --git a/ext/xmlwriter/tests/bug41287.phpt b/ext/xmlwriter/tests/bug41287.phpt index 3bdc63cd93..17e2ad4686 100644 --- a/ext/xmlwriter/tests/bug41287.phpt +++ b/ext/xmlwriter/tests/bug41287.phpt @@ -1,8 +1,8 @@ --TEST-- Bug #41287 (Namespace functions don't allow xmlns definition to be optional) --SKIPIF-- -<?php -if (!extension_loaded("xmlwriter")) die("skip"); +<?php +if (!extension_loaded("xmlwriter")) die("skip"); ?> --FILE-- <?php diff --git a/ext/xmlwriter/tests/bug41326.phpt b/ext/xmlwriter/tests/bug41326.phpt index c69cab1795..c87af84722 100644 --- a/ext/xmlwriter/tests/bug41326.phpt +++ b/ext/xmlwriter/tests/bug41326.phpt @@ -1,8 +1,8 @@ --TEST-- Bug #41287 (Writing empty tags with Xmlwriter::WriteElement[ns]) --SKIPIF-- -<?php -if (!extension_loaded("xmlwriter")) die("skip"); +<?php +if (!extension_loaded("xmlwriter")) die("skip"); ?> --FILE-- <?php diff --git a/ext/xmlwriter/tests/bug48204.phpt b/ext/xmlwriter/tests/bug48204.phpt index 638512b274..1ce6b06fb6 100644 --- a/ext/xmlwriter/tests/bug48204.phpt +++ b/ext/xmlwriter/tests/bug48204.phpt @@ -3,7 +3,7 @@ xmlwriter_open_uri with PHP_MAXPATHLEN + 1 --SKIPIF-- <?php if (!extension_loaded("xmlwriter")) print "skip"; ?> --FILE-- -<?php +<?php $path = str_repeat('a', PHP_MAXPATHLEN + 1); var_dump(xmlwriter_open_uri('file:///' . $path)); ?> diff --git a/ext/xmlwriter/tests/xmlwriter_open_uri_error_001.phpt b/ext/xmlwriter/tests/xmlwriter_open_uri_error_001.phpt index fb7602b539..1e97b02f16 100644 --- a/ext/xmlwriter/tests/xmlwriter_open_uri_error_001.phpt +++ b/ext/xmlwriter/tests/xmlwriter_open_uri_error_001.phpt @@ -3,7 +3,7 @@ xmlwriter_open_uri with empty string as parameter --SKIPIF-- <?php if (!extension_loaded("xmlwriter")) print "skip"; ?> --FILE-- -<?php +<?php var_dump(xmlwriter_open_uri('')); ?> --CREDITS-- diff --git a/ext/xmlwriter/tests/xmlwriter_open_uri_error_002.phpt b/ext/xmlwriter/tests/xmlwriter_open_uri_error_002.phpt index 9cd33f7313..c8410604cf 100644 --- a/ext/xmlwriter/tests/xmlwriter_open_uri_error_002.phpt +++ b/ext/xmlwriter/tests/xmlwriter_open_uri_error_002.phpt @@ -3,7 +3,7 @@ xmlwriter_open_uri without parameter --SKIPIF-- <?php if (!extension_loaded("xmlwriter")) print "skip"; ?> --FILE-- -<?php +<?php var_dump(xmlwriter_open_uri()); ?> --CREDITS-- diff --git a/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt b/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt index 0e56d891dc..7065eed54d 100644 --- a/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt +++ b/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt @@ -3,7 +3,7 @@ xmlwriter_open_uri with non existing file --SKIPIF-- <?php if (!extension_loaded("xmlwriter")) print "skip"; ?> --FILE-- -<?php +<?php var_dump(xmlwriter_open_uri('foo/bar.tmp')); ?> --CREDITS-- diff --git a/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt b/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt index 6970c0eda1..8f5be51c5b 100644 --- a/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt +++ b/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt @@ -3,7 +3,7 @@ xmlwriter_open_uri with file:/// --SKIPIF-- <?php if (!extension_loaded("xmlwriter")) print "skip"; ?> --FILE-- -<?php +<?php var_dump(xmlwriter_open_uri('file:///')); ?> --CREDITS-- diff --git a/ext/xmlwriter/tests/xmlwriter_open_uri_error_005.phpt b/ext/xmlwriter/tests/xmlwriter_open_uri_error_005.phpt index 9d08716ccf..0df6ce06d1 100644 --- a/ext/xmlwriter/tests/xmlwriter_open_uri_error_005.phpt +++ b/ext/xmlwriter/tests/xmlwriter_open_uri_error_005.phpt @@ -3,7 +3,7 @@ xmlwriter_open_uri with file://localhost/ --SKIPIF-- <?php if (!extension_loaded("xmlwriter")) print "skip"; ?> --FILE-- -<?php +<?php var_dump(xmlwriter_open_uri('file://localhost/')); ?> --CREDITS-- diff --git a/ext/xmlwriter/tests/xmlwriter_set_indent_string_basic_001.phpt b/ext/xmlwriter/tests/xmlwriter_set_indent_string_basic_001.phpt index 8c3e7d9257..9db8b55346 100644 --- a/ext/xmlwriter/tests/xmlwriter_set_indent_string_basic_001.phpt +++ b/ext/xmlwriter/tests/xmlwriter_set_indent_string_basic_001.phpt @@ -3,7 +3,7 @@ xmlwriter_set_indent_string passing xmlwriter resource --SKIPIF-- <?php if (!extension_loaded("xmlwriter")) print "skip"; ?> --FILE-- -<?php +<?php $temp_filename = dirname(__FILE__)."/xmlwriter_set_indent_string.tmp"; $fp = fopen($temp_filename, "w"); fwrite ($fp, "Hi"); diff --git a/ext/xmlwriter/tests/xmlwriter_set_indent_string_error_001.phpt b/ext/xmlwriter/tests/xmlwriter_set_indent_string_error_001.phpt index 5bb9ef8b65..c10ed7bf66 100644 --- a/ext/xmlwriter/tests/xmlwriter_set_indent_string_error_001.phpt +++ b/ext/xmlwriter/tests/xmlwriter_set_indent_string_error_001.phpt @@ -3,7 +3,7 @@ xmlwriter_set_indent_string with missing param(s) --SKIPIF-- <?php if (!extension_loaded("xmlwriter")) print "skip"; ?> --FILE-- -<?php +<?php $temp_filename = dirname(__FILE__)."/xmlwriter_set_indent_string_error.tmp"; $fp = fopen($temp_filename, "w"); fwrite ($fp, "Hi"); diff --git a/ext/xsl/tests/bug54446.phpt b/ext/xsl/tests/bug54446.phpt index f960a9822d..61a79a9e11 100644 --- a/ext/xsl/tests/bug54446.phpt +++ b/ext/xsl/tests/bug54446.phpt @@ -6,7 +6,7 @@ if (!extension_loaded('xsl')) die("skip Extension XSL is required\n"); ?> --FILE-- <?php -include("prepare.inc"); +include("prepare.inc"); $outputfile = dirname(__FILE__)."/bug54446test.txt"; if (file_exists($outputfile)) { @@ -31,10 +31,10 @@ EOT; $xsl->loadXML( $sXsl ); # START XSLT -$proc->importStylesheet( $xsl ); +$proc->importStylesheet( $xsl ); # TRASNFORM & PRINT -print $proc->transformToXML( $dom ); +print $proc->transformToXML( $dom ); if (file_exists($outputfile)) { @@ -47,7 +47,7 @@ if (file_exists($outputfile)) { $proc->setSecurityPrefs(XSL_SECPREF_NONE); # TRASNFORM & PRINT -print $proc->transformToXML( $dom ); +print $proc->transformToXML( $dom ); if (file_exists($outputfile)) { @@ -62,7 +62,7 @@ unlink($outputfile); $proc->setSecurityPrefs( XSL_SECPREF_WRITE_FILE | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_CREATE_DIRECTORY); # TRASNFORM & PRINT -print $proc->transformToXML( $dom ); +print $proc->transformToXML( $dom ); if (file_exists($outputfile)) { print "$outputfile exists, but shouldn't!\n"; diff --git a/ext/xsl/tests/bug54446_with_ini.phpt b/ext/xsl/tests/bug54446_with_ini.phpt index 03756bbc8e..bed6a7d34e 100644 --- a/ext/xsl/tests/bug54446_with_ini.phpt +++ b/ext/xsl/tests/bug54446_with_ini.phpt @@ -6,7 +6,7 @@ if (!extension_loaded('xsl')) die("skip Extension XSL is required\n"); ?> --FILE-- <?php -include("prepare.inc"); +include("prepare.inc"); $outputfile = dirname(__FILE__)."/bug54446test.txt"; if (file_exists($outputfile)) { @@ -31,10 +31,10 @@ EOT; $xsl->loadXML( $sXsl ); # START XSLT -$proc->importStylesheet( $xsl ); +$proc->importStylesheet( $xsl ); # TRASNFORM & PRINT -print $proc->transformToXML( $dom ); +print $proc->transformToXML( $dom ); if (file_exists($outputfile)) { @@ -47,7 +47,7 @@ if (file_exists($outputfile)) { $proc->setSecurityPrefs(XSL_SECPREF_NONE); # TRANSFORM & PRINT -print $proc->transformToXML( $dom ); +print $proc->transformToXML( $dom ); if (file_exists($outputfile)) { @@ -62,7 +62,7 @@ unlink($outputfile); $proc->setSecurityPrefs(XSL_SECPREF_WRITE_FILE | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_CREATE_DIRECTORY); # TRANSFORM & PRINT -print $proc->transformToXML( $dom ); +print $proc->transformToXML( $dom ); if (file_exists($outputfile)) { print "$outputfile exists, but shouldn't!\n"; diff --git a/ext/xsl/tests/xsl-phpinfo.phpt b/ext/xsl/tests/xsl-phpinfo.phpt index 83e6729ce6..5f830356b7 100644 --- a/ext/xsl/tests/xsl-phpinfo.phpt +++ b/ext/xsl/tests/xsl-phpinfo.phpt @@ -1,7 +1,7 @@ --TEST-- Test phpinfo() displays xsl info --SKIPIF-- -<?php +<?php if (!extension_loaded("xsl")) { die("SKIP extension gettext not loaded\n"); } diff --git a/ext/xsl/tests/xslt009.phpt b/ext/xsl/tests/xslt009.phpt index 67b0d67faf..9d1110ddeb 100644 --- a/ext/xsl/tests/xslt009.phpt +++ b/ext/xsl/tests/xslt009.phpt @@ -1,5 +1,5 @@ --TEST-- -Test 9: Stream Wrapper XPath-Document() +Test 9: Stream Wrapper XPath-Document() --SKIPIF-- <?php require_once dirname(__FILE__) .'/skipif.inc'; diff --git a/ext/xsl/tests/xslt011.phpt b/ext/xsl/tests/xslt011.phpt index 5ddb3dbbe6..2ca4e91fe9 100644 --- a/ext/xsl/tests/xslt011.phpt +++ b/ext/xsl/tests/xslt011.phpt @@ -14,12 +14,12 @@ $dom = new domDocument(); $dom->load(dirname(__FILE__)."/xslt011.xsl"); $proc = new xsltprocessor; $xsl = $proc->importStylesheet($dom); - + $xml = new DomDocument(); $xml->load(dirname(__FILE__)."/xslt011.xml"); $proc->registerPHPFunctions(); print $proc->transformToXml($xml); - + function foobar($id, $secondArg = "" ) { if (is_array($id)) { return $id[0]->value . " - " . $secondArg; @@ -39,13 +39,13 @@ $dom = new domDocument(); function nonDomNode() { return new foo(); } - + class aClass { static function aStaticFunction($id) { return $id; } } - + --EXPECTF-- Test 11: php:function Support diff --git a/ext/xsl/tests/xsltprocessor_getParameter-invalidparam.phpt b/ext/xsl/tests/xsltprocessor_getParameter-invalidparam.phpt index 858cd93119..41bcf4ad10 100644 --- a/ext/xsl/tests/xsltprocessor_getParameter-invalidparam.phpt +++ b/ext/xsl/tests/xsltprocessor_getParameter-invalidparam.phpt @@ -1,7 +1,7 @@ --TEST-- Check xsltprocessor::getParameter with undefined parameter --SKIPIF-- -<?php +<?php if (!extension_loaded('xsl')) { die("skip\n"); } diff --git a/ext/xsl/tests/xsltprocessor_getParameter-wrongparam.phpt b/ext/xsl/tests/xsltprocessor_getParameter-wrongparam.phpt index f6d9a8852f..aa5ddcf15c 100644 --- a/ext/xsl/tests/xsltprocessor_getParameter-wrongparam.phpt +++ b/ext/xsl/tests/xsltprocessor_getParameter-wrongparam.phpt @@ -1,7 +1,7 @@ --TEST-- Check xsltprocessor::getparameter error handling --SKIPIF-- -<?php +<?php if (!extension_loaded('xsl')) { die("skip\n"); } diff --git a/ext/xsl/tests/xsltprocessor_getParameter.phpt b/ext/xsl/tests/xsltprocessor_getParameter.phpt index ec6378df26..8f2974ec0f 100644 --- a/ext/xsl/tests/xsltprocessor_getParameter.phpt +++ b/ext/xsl/tests/xsltprocessor_getParameter.phpt @@ -1,7 +1,7 @@ --TEST-- Check xsltprocessor::getparameter functionality --SKIPIF-- -<?php +<?php if (!extension_loaded('xsl')) { die("skip\n"); } diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-allfuncs.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-allfuncs.phpt index be67f2261b..af9d633d1d 100644 --- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-allfuncs.phpt +++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-allfuncs.phpt @@ -1,7 +1,7 @@ --TEST-- Check xsltprocessor::registerPHPFunctions --SKIPIF-- -<?php +<?php if (!extension_loaded('xsl')) { die("skip\n"); } diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array-multiple.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array-multiple.phpt index 6147819269..9879fb38f7 100644 --- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array-multiple.phpt +++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array-multiple.phpt @@ -5,7 +5,7 @@ When being called multiple times with an array, registerPHPFunctions adds the new functions to the allowed parameter list - it does not replace the previously allowed functions. --SKIPIF-- -<?php +<?php if (!extension_loaded('xsl')) { die("skip\n"); } diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array-notallowed.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array-notallowed.phpt index 9492fc6861..cc49371fe6 100644 --- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array-notallowed.phpt +++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array-notallowed.phpt @@ -1,7 +1,7 @@ --TEST-- Check xsltprocessor::registerPHPFunctions with array and a not allowed function --SKIPIF-- -<?php +<?php if (!extension_loaded('xsl')) { die("skip\n"); } diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array.phpt index 90e5788350..642b58e74a 100644 --- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array.phpt +++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array.phpt @@ -1,7 +1,7 @@ --TEST-- Check xsltprocessor::registerPHPFunctions with array --SKIPIF-- -<?php +<?php if (!extension_loaded('xsl')) { die("skip\n"); } diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt index 90d9c68208..f66632d2be 100644 --- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt +++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt @@ -4,7 +4,7 @@ Check xsltprocessor::registerPHPFunctions and a non-string function in xsl The XSL script tries to call a php function that is not a string which is expected to fail --SKIPIF-- -<?php +<?php if (!extension_loaded('xsl')) { die("skip\n"); } diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt index a26c210333..e4cf0e816a 100644 --- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt +++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt @@ -3,7 +3,7 @@ Check xsltprocessor::registerPHPFunctions and a undefined php function --DESCRIPTION-- The XSL script tries to call a php function that is not defined --SKIPIF-- -<?php +<?php if (!extension_loaded('xsl')) { die("skip\n"); } diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-null.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-null.phpt index 80016e425b..a142dfa431 100644 --- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-null.phpt +++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-null.phpt @@ -5,7 +5,7 @@ When being called multiple times with an array, registerPHPFunctions adds the new functions to the allowed parameter list - it does not replace the previously allowed functions. --SKIPIF-- -<?php +<?php if (!extension_loaded('xsl')) { die("skip\n"); } diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string-multiple.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string-multiple.phpt index 31e2edea51..5eeb793ed5 100644 --- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string-multiple.phpt +++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string-multiple.phpt @@ -5,7 +5,7 @@ When being called multiple times with a stringular function name only, registerPHPFunctions adds the new function to the allowed parameter list - it does not replace the old function. --SKIPIF-- -<?php +<?php if (!extension_loaded('xsl')) { die("skip\n"); } diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string-notallowed.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string-notallowed.phpt index 9257749714..1e7092c8bd 100644 --- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string-notallowed.phpt +++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string-notallowed.phpt @@ -1,7 +1,7 @@ --TEST-- Check xsltprocessor::registerPHPFunctions with string and not allowed function --SKIPIF-- -<?php +<?php if (!extension_loaded('xsl')) { die("skip\n"); } diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string.phpt index d9408630e7..2a3474eee3 100644 --- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string.phpt +++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string.phpt @@ -1,7 +1,7 @@ --TEST-- Check xsltprocessor::registerPHPFunctions with string --SKIPIF-- -<?php +<?php if (!extension_loaded('xsl')) { die("skip\n"); } diff --git a/ext/xsl/tests/xsltprocessor_removeParameter-invalidparam.phpt b/ext/xsl/tests/xsltprocessor_removeParameter-invalidparam.phpt index f35b470840..a5a62286c1 100644 --- a/ext/xsl/tests/xsltprocessor_removeParameter-invalidparam.phpt +++ b/ext/xsl/tests/xsltprocessor_removeParameter-invalidparam.phpt @@ -1,7 +1,7 @@ --TEST-- Check xsltprocessor::removeParameter with invalid parameter --SKIPIF-- -<?php +<?php if (!extension_loaded('xsl')) { die("skip\n"); } diff --git a/ext/xsl/tests/xsltprocessor_removeParameter-wrongparams.phpt b/ext/xsl/tests/xsltprocessor_removeParameter-wrongparams.phpt index bbfdc20cd7..2cea8884d9 100644 --- a/ext/xsl/tests/xsltprocessor_removeParameter-wrongparams.phpt +++ b/ext/xsl/tests/xsltprocessor_removeParameter-wrongparams.phpt @@ -1,7 +1,7 @@ --TEST-- Check xsltprocessor::removeParameter wrong parameter handling --SKIPIF-- -<?php +<?php if (!extension_loaded('xsl')) { die("skip\n"); } diff --git a/ext/xsl/tests/xsltprocessor_removeParameter.phpt b/ext/xsl/tests/xsltprocessor_removeParameter.phpt index 92be056985..6568e2bae3 100644 --- a/ext/xsl/tests/xsltprocessor_removeParameter.phpt +++ b/ext/xsl/tests/xsltprocessor_removeParameter.phpt @@ -1,7 +1,7 @@ --TEST-- Check xsltprocessor::removeParameter functionality --SKIPIF-- -<?php +<?php if (!extension_loaded('xsl')) { die("skip\n"); } diff --git a/ext/xsl/tests/xsltprocessor_setparameter-errorquote.phpt b/ext/xsl/tests/xsltprocessor_setparameter-errorquote.phpt index 44e49de601..a3114bb755 100644 --- a/ext/xsl/tests/xsltprocessor_setparameter-errorquote.phpt +++ b/ext/xsl/tests/xsltprocessor_setparameter-errorquote.phpt @@ -3,7 +3,7 @@ Check xsltprocessor::setparameter error handling with both single and double quo --DESCRIPTION-- Memleak: http://bugs.php.net/bug.php?id=48221 --SKIPIF-- -<?php +<?php if (!extension_loaded('xsl')) { die("skip\n"); } diff --git a/ext/xsl/tests/xsltprocessor_setparameter-nostring.phpt b/ext/xsl/tests/xsltprocessor_setparameter-nostring.phpt index c4fcd709ea..dd17a72d49 100644 --- a/ext/xsl/tests/xsltprocessor_setparameter-nostring.phpt +++ b/ext/xsl/tests/xsltprocessor_setparameter-nostring.phpt @@ -3,7 +3,7 @@ Check xsltprocessor::setparameter error handling with no-string --DESCRIPTION-- Memleak: http://bugs.php.net/bug.php?id=48221 --SKIPIF-- -<?php +<?php if (!extension_loaded('xsl')) { die("skip\n"); } diff --git a/ext/zip/tests/bug38944.phpt b/ext/zip/tests/bug38944.phpt index ede6b67e77..b4ff2b2f19 100644 --- a/ext/zip/tests/bug38944.phpt +++ b/ext/zip/tests/bug38944.phpt @@ -19,7 +19,7 @@ var_dump($foo); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(0) int(0) int(0) diff --git a/ext/zip/tests/bug47667.phpt b/ext/zip/tests/bug47667.phpt index 749a5ef6b8..6914b5b109 100644 --- a/ext/zip/tests/bug47667.phpt +++ b/ext/zip/tests/bug47667.phpt @@ -21,7 +21,7 @@ for ($i = 0; $i < 10; $i++) { $zip = new ZipArchive(); if ($zip->open($filename, ZipArchive::OVERWRITE) !== true) { exit("Unable to open the zip file"); - } + } $zip->addFromString("foo_{$i}.txt", 'foo bar foobar'); $zip->close(); } diff --git a/ext/zip/tests/oo_encryption.phpt b/ext/zip/tests/oo_encryption.phpt index fb5caef495..7567111dbb 100644 --- a/ext/zip/tests/oo_encryption.phpt +++ b/ext/zip/tests/oo_encryption.phpt @@ -15,7 +15,7 @@ echo "== Write\n"; $zip = new ZipArchive; $r = $zip->open($name, ZIPARCHIVE::CREATE); // Clear -$zip->addFromString('foo.txt', 'foo'); +$zip->addFromString('foo.txt', 'foo'); // Encrypted $zip->addFromString('bar.txt', 'bar'); var_dump($zip->setEncryptionName('bar.txt', 9999, $pass)); // Fails diff --git a/ext/zlib/tests/004-mb.phpt b/ext/zlib/tests/004-mb.phpt index a9371f414f..92f7db1b70 100644 --- a/ext/zlib/tests/004-mb.phpt +++ b/ext/zlib/tests/004-mb.phpt @@ -14,7 +14,7 @@ var_dump(gzfile(dirname(__FILE__)."/004私はガラスを食べられます.txt. echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: gzfile() expects at least 1 parameter, 0 given in %s on line %d NULL diff --git a/ext/zlib/tests/004.phpt b/ext/zlib/tests/004.phpt index ebc7d82b95..b8d0f0eccd 100644 --- a/ext/zlib/tests/004.phpt +++ b/ext/zlib/tests/004.phpt @@ -14,7 +14,7 @@ var_dump(gzfile(dirname(__FILE__)."/004.txt.gz", 1)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: gzfile() expects at least 1 parameter, 0 given in %s on line %d NULL diff --git a/ext/zlib/tests/006.phpt b/ext/zlib/tests/006.phpt index 8c03ea068d..ec5d8dc577 100644 --- a/ext/zlib/tests/006.phpt +++ b/ext/zlib/tests/006.phpt @@ -34,7 +34,7 @@ var_dump(gzinflate($data2)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: gzdeflate() expects at least 1 parameter, 0 given in %s on line %d NULL diff --git a/ext/zlib/tests/007.phpt b/ext/zlib/tests/007.phpt index c55d78d126..6c42bf67db 100644 --- a/ext/zlib/tests/007.phpt +++ b/ext/zlib/tests/007.phpt @@ -26,7 +26,7 @@ var_dump(gzencode($string, 9, ZLIB_ENCODING_DEFLATE)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: gzencode() expects at least 1 parameter, 0 given in %s on line %d NULL diff --git a/ext/zlib/tests/bug51269.phpt b/ext/zlib/tests/bug51269.phpt index 89ad7b6269..97b2e55bca 100644 --- a/ext/zlib/tests/bug51269.phpt +++ b/ext/zlib/tests/bug51269.phpt @@ -5,7 +5,7 @@ zlib.output_compression=1 --ENV-- HTTP_ACCEPT_ENCODING=gzip --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) die("skip zlib required"); ?> --FILE-- diff --git a/ext/zlib/tests/bug60761.phpt b/ext/zlib/tests/bug60761.phpt index 1e9fe69a01..14c45cb4c8 100644 --- a/ext/zlib/tests/bug60761.phpt +++ b/ext/zlib/tests/bug60761.phpt @@ -28,8 +28,8 @@ for ( $i=0 ; $i < 100 ; $i++ ) { $len = strlen($html); $lens[$len] = $len; -} - +} + $lens = array_values($lens); echo "Compressed Lengths\n"; @@ -42,7 +42,7 @@ echo "Compressed Lengths\n"; // just check that there is only one length // var_dump($lens); // show lengths to help triage in case of failure - + // expected headers since its CGI ?> diff --git a/ext/zlib/tests/bug61139.phpt b/ext/zlib/tests/bug61139.phpt index 71961a64dc..ab7c74e9cc 100644 --- a/ext/zlib/tests/bug61139.phpt +++ b/ext/zlib/tests/bug61139.phpt @@ -1,18 +1,18 @@ --TEST-- Bug #61139 (gzopen leaks when specifying invalid mode) --SKIPIF-- -<?php +<?php if (!extension_loaded('zlib')) { - die('skip - zlib extension not loaded'); -} + die('skip - zlib extension not loaded'); +} ?> --FILE-- <?php gzopen('someFile', 'c'); --CLEAN-- -<?php - unlink('someFile'); +<?php + unlink('someFile'); ?> --EXPECTF-- Warning: gzopen(): gzopen failed in %s on line %d diff --git a/ext/zlib/tests/bug61443.phpt b/ext/zlib/tests/bug61443.phpt index 6d562fe995..bfe3c0b597 100644 --- a/ext/zlib/tests/bug61443.phpt +++ b/ext/zlib/tests/bug61443.phpt @@ -6,7 +6,7 @@ extension_loaded("zlib") or die("skip"); ?> --FILE-- <?php -ob_start(); echo "foo\n"; ob_get_clean(); +ob_start(); echo "foo\n"; ob_get_clean(); if(!headers_sent()) ini_set('zlib.output_compression', true); echo "end\n"; ?> DONE diff --git a/ext/zlib/tests/bug_34821.phpt b/ext/zlib/tests/bug_34821.phpt index b378ec4097..53ef4d229e 100644 --- a/ext/zlib/tests/bug_34821.phpt +++ b/ext/zlib/tests/bug_34821.phpt @@ -7,9 +7,9 @@ Bug #34821 (zlib encoders fail on widely varying binary data) // test 50 bytes to 50k $b = array( - 50, - 500, - 5000, + 50, + 500, + 5000, 50000, // 1000000, // works, but test would take too long ); diff --git a/ext/zlib/tests/deflate_add_basic.phpt b/ext/zlib/tests/deflate_add_basic.phpt index 288b04a24d..900492f35b 100644 --- a/ext/zlib/tests/deflate_add_basic.phpt +++ b/ext/zlib/tests/deflate_add_basic.phpt @@ -1,9 +1,9 @@ --TEST-- Test incremental deflate_add() functionality --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- diff --git a/ext/zlib/tests/deflate_add_block_v123.phpt b/ext/zlib/tests/deflate_add_block_v123.phpt index 3fe03f99ba..786f8aed56 100644 --- a/ext/zlib/tests/deflate_add_block_v123.phpt +++ b/ext/zlib/tests/deflate_add_block_v123.phpt @@ -1,7 +1,7 @@ --TEST-- Test deflate_add() errors with ZLIB_BLOCK in zlib < 1.2.4 --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { print "skip - ZLIB extension not loaded"; } diff --git a/ext/zlib/tests/deflate_add_buffer_full.phpt b/ext/zlib/tests/deflate_add_buffer_full.phpt index d89d240ea2..dc6012dc13 100644 --- a/ext/zlib/tests/deflate_add_buffer_full.phpt +++ b/ext/zlib/tests/deflate_add_buffer_full.phpt @@ -1,9 +1,9 @@ --TEST-- Test deflate_add() buffer issue with data that fills deflate buffer while using ZLIB_SYNC_FLUSH on ZLIB_ENCODING_RAW. --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- diff --git a/ext/zlib/tests/deflate_add_error.phpt b/ext/zlib/tests/deflate_add_error.phpt index 159f1648c9..e02cec3832 100644 --- a/ext/zlib/tests/deflate_add_error.phpt +++ b/ext/zlib/tests/deflate_add_error.phpt @@ -1,9 +1,9 @@ --TEST-- Test incremental deflate_add() error functionality --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- diff --git a/ext/zlib/tests/deflate_init_error.phpt b/ext/zlib/tests/deflate_init_error.phpt index 424272c124..e7166455a9 100644 --- a/ext/zlib/tests/deflate_init_error.phpt +++ b/ext/zlib/tests/deflate_init_error.phpt @@ -1,9 +1,9 @@ --TEST-- Test deflate_init() error --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- diff --git a/ext/zlib/tests/deflate_init_reuse.phpt b/ext/zlib/tests/deflate_init_reuse.phpt index 310b781820..e83cc04243 100644 --- a/ext/zlib/tests/deflate_init_reuse.phpt +++ b/ext/zlib/tests/deflate_init_reuse.phpt @@ -1,9 +1,9 @@ --TEST-- Test incremental deflate_init() context reuse --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- diff --git a/ext/zlib/tests/gzclose_basic.phpt b/ext/zlib/tests/gzclose_basic.phpt index acad3b2f07..9a84111781 100644 --- a/ext/zlib/tests/gzclose_basic.phpt +++ b/ext/zlib/tests/gzclose_basic.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gzclose() by calling it with its expected arguments --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- diff --git a/ext/zlib/tests/gzclose_error.phpt b/ext/zlib/tests/gzclose_error.phpt index ec4b6eb246..3e1a035060 100644 --- a/ext/zlib/tests/gzclose_error.phpt +++ b/ext/zlib/tests/gzclose_error.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gzclose() by calling it more than or less than its expected arguments --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- @@ -11,7 +11,7 @@ if (!extension_loaded("zlib")) { $f = dirname(__FILE__)."/004.txt.gz"; $h = gzopen($f, 'r'); -$extra_arg = 'nothing'; +$extra_arg = 'nothing'; diff --git a/ext/zlib/tests/gzcompress_basic1.phpt b/ext/zlib/tests/gzcompress_basic1.phpt index 1506d0c1ee..4bd3206bee 100644 --- a/ext/zlib/tests/gzcompress_basic1.phpt +++ b/ext/zlib/tests/gzcompress_basic1.phpt @@ -1,17 +1,17 @@ --TEST-- Test gzcompress() function : basic functionality --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php /* Prototype : string gzcompress(string data [, int level, [int encoding]]) * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/zlib/tests/gzcompress_error1.phpt b/ext/zlib/tests/gzcompress_error1.phpt index 9db0a56fa1..93c22964b6 100644 --- a/ext/zlib/tests/gzcompress_error1.phpt +++ b/ext/zlib/tests/gzcompress_error1.phpt @@ -1,17 +1,17 @@ --TEST-- Test gzcompress() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php /* Prototype : string gzcompress(string data [, int level, [int encoding]]) * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c - * Alias to functions: + * Alias to functions: */ /* @@ -45,7 +45,7 @@ echo "\n-- Testing with incorrect parameters --\n"; class Tester { function Hello() { - echo "Hello\n"; + echo "Hello\n"; } } diff --git a/ext/zlib/tests/gzcompress_variation1.phpt b/ext/zlib/tests/gzcompress_variation1.phpt index 0d4b4c0abb..1b234797c2 100644 --- a/ext/zlib/tests/gzcompress_variation1.phpt +++ b/ext/zlib/tests/gzcompress_variation1.phpt @@ -1,17 +1,17 @@ --TEST-- Test gzcompress() function : variation --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php /* Prototype : string gzcompress(string data [, int level, [int encoding]]) * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c - * Alias to functions: + * Alias to functions: */ include(dirname(__FILE__) . '/data.inc'); diff --git a/ext/zlib/tests/gzdeflate_basic1.phpt b/ext/zlib/tests/gzdeflate_basic1.phpt index a2ae0f01da..a1b89b9376 100644 --- a/ext/zlib/tests/gzdeflate_basic1.phpt +++ b/ext/zlib/tests/gzdeflate_basic1.phpt @@ -1,17 +1,17 @@ --TEST-- Test gzdeflate() function : basic functionality --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php /* Prototype : string gzdeflate(string data [, int level, [int encoding]]) * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/zlib/tests/gzdeflate_error1.phpt b/ext/zlib/tests/gzdeflate_error1.phpt index 39c4714033..00e3c01e1a 100644 --- a/ext/zlib/tests/gzdeflate_error1.phpt +++ b/ext/zlib/tests/gzdeflate_error1.phpt @@ -1,17 +1,17 @@ --TEST-- Test gzdeflate() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php /* Prototype : string gzdeflate(string data [, int level, [int encoding]]) * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c - * Alias to functions: + * Alias to functions: */ /* @@ -33,16 +33,16 @@ $extra_arg = 10; var_dump( gzdeflate($data, $level, $encoding, $extra_arg) ); echo "\n-- Testing with incorrect compression level --\n"; -$bad_level = 99; +$bad_level = 99; var_dump(gzdeflate($data, $bad_level)); echo "\n-- Testing with incorrect encoding --\n"; -$bad_encoding = 99; +$bad_encoding = 99; var_dump(gzdeflate($data, $level, $bad_encoding)); class Tester { function Hello() { - echo "Hello\n"; + echo "Hello\n"; } } diff --git a/ext/zlib/tests/gzdeflate_variation1.phpt b/ext/zlib/tests/gzdeflate_variation1.phpt index 75eb16e03d..c751a1b92f 100644 --- a/ext/zlib/tests/gzdeflate_variation1.phpt +++ b/ext/zlib/tests/gzdeflate_variation1.phpt @@ -1,17 +1,17 @@ --TEST-- Test gzdeflate() function : variation --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php /* Prototype : string gzdeflate(string data [, int level]) * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c - * Alias to functions: + * Alias to functions: */ include(dirname(__FILE__) . '/data.inc'); diff --git a/ext/zlib/tests/gzencode_basic1.phpt b/ext/zlib/tests/gzencode_basic1.phpt index 3c0ec559e9..e53dfde2ab 100644 --- a/ext/zlib/tests/gzencode_basic1.phpt +++ b/ext/zlib/tests/gzencode_basic1.phpt @@ -1,17 +1,17 @@ --TEST-- Test gzencode() function : basic functionality --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php /* Prototype : string gzencode ( string $data [, int $level [, int $encoding_mode ]] ) * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c - * Alias to functions: + * Alias to functions: */ /* @@ -33,10 +33,10 @@ $smallstring = "A small string to compress\n"; for($i = -1; $i < 10; $i++) { echo "-- Compression level $i --\n"; $output = gzencode($data, $i); - + // Clear OS byte before encode $output[9] = "\x00"; - + var_dump(md5($output)); } @@ -44,10 +44,10 @@ for($i = -1; $i < 10; $i++) { for($i = -1; $i < 10; $i++) { echo "-- Compression level $i --\n"; $output = gzencode($smallstring, $i); - + // Clear OS byte before encode $output[9] = "\x00"; - + var_dump(md5($output)); } diff --git a/ext/zlib/tests/gzencode_error1.phpt b/ext/zlib/tests/gzencode_error1.phpt index 967f4c4e05..2cd6a9ede9 100644 --- a/ext/zlib/tests/gzencode_error1.phpt +++ b/ext/zlib/tests/gzencode_error1.phpt @@ -1,17 +1,17 @@ --TEST-- Test gzencode() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} -?> + print "skip - ZLIB extension not loaded"; +} +?> --FILE-- <?php /* Prototype : string gzencode ( string $data [, int $level [, int $encoding_mode ]] ) * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c - * Alias to functions: + * Alias to functions: */ /* @@ -37,12 +37,12 @@ $bad_level = 99; var_dump(gzencode($data, $bad_level)); echo "\n-- Testing with incorrect encoding_mode --\n"; -$bad_mode = 99; +$bad_mode = 99; var_dump(gzencode($data, $level, $bad_mode)); class Tester { function Hello() { - echo "Hello\n"; + echo "Hello\n"; } } diff --git a/ext/zlib/tests/gzencode_variation1-win32.phpt b/ext/zlib/tests/gzencode_variation1-win32.phpt index 5ff577838b..c2276b2b0a 100644 --- a/ext/zlib/tests/gzencode_variation1-win32.phpt +++ b/ext/zlib/tests/gzencode_variation1-win32.phpt @@ -1,28 +1,28 @@ --TEST-- Test gzencode() function : variation --SKIPIF-- -<?php +<?php if( substr(PHP_OS, 0, 3) != "WIN" ) { die("skip only for Windows"); } if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} -?> + print "skip - ZLIB extension not loaded"; +} +?> --FILE-- <?php /* Prototype : string gzencode ( string $data [, int $level [, int $encoding_mode ]] ) * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c - * Alias to functions: + * Alias to functions: */ if(!function_exists("gzdecode")) { - function gzdecode($data) - { - return gzinflate(substr($data,10,-8)); + function gzdecode($data) + { + return gzinflate(substr($data,10,-8)); } } diff --git a/ext/zlib/tests/gzencode_variation1.phpt b/ext/zlib/tests/gzencode_variation1.phpt index ef1d3a77f7..c2a995a46b 100644 --- a/ext/zlib/tests/gzencode_variation1.phpt +++ b/ext/zlib/tests/gzencode_variation1.phpt @@ -1,22 +1,22 @@ --TEST-- Test gzencode() function : variation --SKIPIF-- -<?php +<?php if( substr(PHP_OS, 0, 3) == "WIN" ) { die("skip.. Do not run on Windows"); } if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} -?> + print "skip - ZLIB extension not loaded"; +} +?> --FILE-- <?php /* Prototype : string gzencode ( string $data [, int $level [, int $encoding_mode ]] ) * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c - * Alias to functions: + * Alias to functions: */ include(dirname(__FILE__) . '/data.inc'); diff --git a/ext/zlib/tests/gzencode_variation2-win32.phpt b/ext/zlib/tests/gzencode_variation2-win32.phpt index 8d5d583caa..9ca4d10c4c 100644 --- a/ext/zlib/tests/gzencode_variation2-win32.phpt +++ b/ext/zlib/tests/gzencode_variation2-win32.phpt @@ -1,27 +1,27 @@ --TEST-- Test gzencode() function : variation - verify header contents with all encoding modes --SKIPIF-- -<?php +<?php if( substr(PHP_OS, 0, 3) != "WIN" ) { die("skip.. only for Windows"); } 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()); } -?> +?> --FILE-- <?php /* Prototype : string gzencode ( string $data [, int $level [, int $encoding_mode ]] ) * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gzencode() : variation ***\n"; @@ -30,7 +30,7 @@ $data = "A small string to encode\n"; echo "\n-- Testing with each encoding_mode --\n"; var_dump(bin2hex(gzencode($data, -1))); -var_dump(bin2hex(gzencode($data, -1, FORCE_GZIP))); +var_dump(bin2hex(gzencode($data, -1, FORCE_GZIP))); var_dump(bin2hex(gzencode($data, -1, FORCE_DEFLATE))); ?> diff --git a/ext/zlib/tests/gzencode_variation2.phpt b/ext/zlib/tests/gzencode_variation2.phpt index 765ce00ea4..128fe472e9 100644 --- a/ext/zlib/tests/gzencode_variation2.phpt +++ b/ext/zlib/tests/gzencode_variation2.phpt @@ -1,22 +1,22 @@ --TEST-- Test gzencode() function : variation - verify header contents with all encoding modes --SKIPIF-- -<?php +<?php if( substr(PHP_OS, 0, 3) == "WIN" ) { die("skip.. Do not run on Windows"); } if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} -?> + print "skip - ZLIB extension not loaded"; +} +?> --FILE-- <?php /* Prototype : string gzencode ( string $data [, int $level [, int $encoding_mode ]] ) * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gzencode() : variation ***\n"; @@ -25,7 +25,7 @@ $data = "A small string to encode\n"; echo "\n-- Testing with each encoding_mode --\n"; var_dump(bin2hex(gzencode($data, -1))); -var_dump(bin2hex(gzencode($data, -1, FORCE_GZIP))); +var_dump(bin2hex(gzencode($data, -1, FORCE_GZIP))); var_dump(bin2hex(gzencode($data, -1, FORCE_DEFLATE))); ?> diff --git a/ext/zlib/tests/gzeof_basic.phpt b/ext/zlib/tests/gzeof_basic.phpt index f5d2617a9f..4b2bb1aec9 100644 --- a/ext/zlib/tests/gzeof_basic.phpt +++ b/ext/zlib/tests/gzeof_basic.phpt @@ -1,9 +1,9 @@ --TEST-- Test function feof() by calling it with its expected arguments --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- @@ -18,7 +18,7 @@ $h = gzopen($f, 'r'); var_dump(gzeof($h)); gzpassthru($h); var_dump(gzeof($h)); -gzclose($h); +gzclose($h); echo "\n-- test 2 --\n"; $h = gzopen($f, 'r'); @@ -31,7 +31,7 @@ var_dump(gzeof($h)); echo "reading 20 characters. eof should be true still\n"; gzread($h, 20)."\n"; var_dump(gzeof($h)); -gzclose($h); +gzclose($h); diff --git a/ext/zlib/tests/gzeof_error.phpt b/ext/zlib/tests/gzeof_error.phpt index af0f7c17fa..a495b9b646 100644 --- a/ext/zlib/tests/gzeof_error.phpt +++ b/ext/zlib/tests/gzeof_error.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gzeof() by calling it more than or less than its expected arguments --SKIPIF-- -<?php +<?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 ba0d8e5932..9e30775928 100644 --- a/ext/zlib/tests/gzeof_variation1.phpt +++ b/ext/zlib/tests/gzeof_variation1.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gzeof while writing. --SKIPIF-- -<?php +<?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_error.phpt b/ext/zlib/tests/gzfile_error.phpt index 6089f3ebfa..cea150a86d 100644 --- a/ext/zlib/tests/gzfile_error.phpt +++ b/ext/zlib/tests/gzfile_error.phpt @@ -10,7 +10,7 @@ if (!extension_loaded('zlib')) die ('skip zlib extension not available in this b $filename = dirname(__FILE__)."/004.txt.gz"; $use_include_path = false; -$extra_arg = 'nothing'; +$extra_arg = 'nothing'; var_dump(gzfile( $filename, $use_include_path, $extra_arg ) ); diff --git a/ext/zlib/tests/gzfile_variation15.phpt b/ext/zlib/tests/gzfile_variation15.phpt index feee0a8d6c..bcc29ec102 100644 --- a/ext/zlib/tests/gzfile_variation15.phpt +++ b/ext/zlib/tests/gzfile_variation15.phpt @@ -1,17 +1,17 @@ --TEST-- Test gzfile() function : variation: use include path (relative directories in path) --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php require_once('reading_include_path.inc'); //define the files to go into these directories, create one in dir2 -set_include_path($newIncludePath); +set_include_path($newIncludePath); test_gzfile(); restore_include_path(); @@ -27,7 +27,7 @@ rmdir($thisTestDir); function test_gzfile() { global $scriptFile, $secondFile, $firstFile, $filename; - + // create a file in the middle directory $h = gzopen($secondFile, "w"); gzwrite($h, "This is a file in dir2"); @@ -41,36 +41,36 @@ function test_gzfile() { $h = gzopen($firstFile, "w"); gzwrite($h, "This is a file in dir1"); gzclose($h); - + //should now read dir1 file var_dump(gzfile($filename, true)); echo "\n"; - + // create a file in working directory $h = gzopen($filename, "w"); gzwrite($h, "This is a file in working dir"); gzclose($h); - + //should still read dir1 file var_dump(gzfile($filename, true)); echo "\n"; - + unlink($firstFile); unlink($secondFile); - + //should read the file in working directory var_dump(gzfile($filename, true)); echo "\n"; - + // create a file in the script directory $h = gzopen($scriptFile, "w"); gzwrite($h, "This is a file in script dir"); gzclose($h); - + //should read the file in script dir var_dump(gzfile($filename, true)); echo "\n"; - + //cleanup unlink($filename); unlink($scriptFile); diff --git a/ext/zlib/tests/gzgetc_basic.phpt b/ext/zlib/tests/gzgetc_basic.phpt index 5c814e0d1a..ad8684381b 100644 --- a/ext/zlib/tests/gzgetc_basic.phpt +++ b/ext/zlib/tests/gzgetc_basic.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gzgetc() by calling it with its expected arguments zlib 1.2.5 --SKIPIF-- -<?php +<?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) { diff --git a/ext/zlib/tests/gzgetc_basic_1.phpt b/ext/zlib/tests/gzgetc_basic_1.phpt index 59e3eb6233..24d847eb64 100644 --- a/ext/zlib/tests/gzgetc_basic_1.phpt +++ b/ext/zlib/tests/gzgetc_basic_1.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gzgetc() by calling it with its expected arguments zlib 1.2.7 --SKIPIF-- -<?php +<?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) { diff --git a/ext/zlib/tests/gzgetc_error.phpt b/ext/zlib/tests/gzgetc_error.phpt index cbeabe3a31..2298fa358a 100644 --- a/ext/zlib/tests/gzgetc_error.phpt +++ b/ext/zlib/tests/gzgetc_error.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gzgetc() by calling it more than or less than its expected arguments --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- diff --git a/ext/zlib/tests/gzgets_basic.phpt b/ext/zlib/tests/gzgets_basic.phpt index 3ebc759007..0e683d1b32 100644 --- a/ext/zlib/tests/gzgets_basic.phpt +++ b/ext/zlib/tests/gzgets_basic.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gzgets() by calling it with its expected arguments --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- diff --git a/ext/zlib/tests/gzgets_error.phpt b/ext/zlib/tests/gzgets_error.phpt index fe224f1ef4..10b5f0db29 100644 --- a/ext/zlib/tests/gzgets_error.phpt +++ b/ext/zlib/tests/gzgets_error.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gzgets() by calling it more than or less than its expected arguments --SKIPIF-- -<?php +<?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 1921afc859..24b929ff9d 100644 --- a/ext/zlib/tests/gzinflate_error1.phpt +++ b/ext/zlib/tests/gzinflate_error1.phpt @@ -1,17 +1,17 @@ --TEST-- Test gzinflate() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php /* Prototype : string gzinflate(string data [, int length]) * Description: Unzip a gzip-compressed string * Source code: ext/zlib/zlib.c - * Alias to functions: + * Alias to functions: */ include(dirname(__FILE__) . '/data.inc'); @@ -37,7 +37,7 @@ echo "\n-- Testing with incorrect parameters --\n"; class Tester { function Hello() { - echo "Hello\n"; + echo "Hello\n"; } } diff --git a/ext/zlib/tests/gzopen_basic.phpt b/ext/zlib/tests/gzopen_basic.phpt index 8743c61aeb..dece6f5ea5 100644 --- a/ext/zlib/tests/gzopen_basic.phpt +++ b/ext/zlib/tests/gzopen_basic.phpt @@ -1,17 +1,17 @@ --TEST-- Test gzopen() function : basic functionality --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php /* Prototype : resource gzopen(string filename, string mode [, int use_include_path]) * Description: Open a .gz-file and return a .gz-file pointer * Source code: ext/zlib/zlib.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gzopen() : basic functionality ***\n"; diff --git a/ext/zlib/tests/gzopen_basic2.phpt b/ext/zlib/tests/gzopen_basic2.phpt index 90766b1817..f9b4cd2a58 100644 --- a/ext/zlib/tests/gzopen_basic2.phpt +++ b/ext/zlib/tests/gzopen_basic2.phpt @@ -1,17 +1,17 @@ --TEST-- Test gzopen() function : basic functionality for writing --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php /* Prototype : resource gzopen(string filename, string mode [, int use_include_path]) * Description: Open a .gz-file and return a .gz-file pointer * Source code: ext/zlib/zlib.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gzopen() : basic functionality ***\n"; @@ -37,8 +37,8 @@ foreach($modes as $mode) { else { var_dump($h); } -} - +} + ?> ===DONE=== --EXPECTF-- diff --git a/ext/zlib/tests/gzopen_error.phpt b/ext/zlib/tests/gzopen_error.phpt index a71791fb24..cda7c36e4e 100644 --- a/ext/zlib/tests/gzopen_error.phpt +++ b/ext/zlib/tests/gzopen_error.phpt @@ -1,17 +1,17 @@ --TEST-- Test gzopen() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php /* Prototype : resource gzopen(string filename, string mode [, int use_include_path]) * Description: Open a .gz-file and return a .gz-file pointer * Source code: ext/zlib/zlib.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gzopen() : error conditions ***\n"; diff --git a/ext/zlib/tests/gzopen_variation2.phpt b/ext/zlib/tests/gzopen_variation2.phpt index 458293514c..fc350049e7 100644 --- a/ext/zlib/tests/gzopen_variation2.phpt +++ b/ext/zlib/tests/gzopen_variation2.phpt @@ -1,17 +1,17 @@ --TEST-- Test gzopen() function : usage variation --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - zlib extension not loaded"; -} + print "skip - zlib extension not loaded"; +} ?> --FILE-- <?php /* Prototype : resource gzopen(string filename, string mode [, int use_include_path]) * Description: Open a .gz-file and return a .gz-file pointer * Source code: ext/zlib/zlib.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gzopen() : usage variation ***\n"; @@ -102,7 +102,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable 'resource' => $fp ); diff --git a/ext/zlib/tests/gzopen_variation3.phpt b/ext/zlib/tests/gzopen_variation3.phpt index e0e60f8c7a..5201c58c81 100644 --- a/ext/zlib/tests/gzopen_variation3.phpt +++ b/ext/zlib/tests/gzopen_variation3.phpt @@ -1,9 +1,9 @@ --TEST-- Test gzopen() function : usage variation --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - zlib extension not loaded"; + print "skip - zlib extension not loaded"; } if (PHP_INT_SIZE != 8) die('skip 64-bit only'); ?> @@ -12,7 +12,7 @@ if (PHP_INT_SIZE != 8) die('skip 64-bit only'); /* Prototype : resource gzopen(string filename, string mode [, int use_include_path]) * Description: Open a .gz-file and return a .gz-file pointer * Source code: ext/zlib/zlib.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gzopen() : usage variation ***\n"; @@ -103,7 +103,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource variable 'resource' => $fp ); diff --git a/ext/zlib/tests/gzopen_variation4.phpt b/ext/zlib/tests/gzopen_variation4.phpt index e4cdce4731..2ccd0f311a 100644 --- a/ext/zlib/tests/gzopen_variation4.phpt +++ b/ext/zlib/tests/gzopen_variation4.phpt @@ -1,17 +1,17 @@ --TEST-- Test gzopen() function : variation: use include path (relative directories in path) --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php /* Prototype : resource gzopen(string filename, string mode [, int use_include_path]) * Description: Open a .gz-file and return a .gz-file pointer * Source code: ext/zlib/zlib.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gzopen() : usage variation ***\n"; @@ -20,7 +20,7 @@ require_once('reading_include_path.inc'); //define the files to go into these directories, create one in dir2 echo "\n--- testing include path ---\n"; -set_include_path($newIncludePath); +set_include_path($newIncludePath); $modes = array("r", "r+", "rt"); foreach($modes as $mode) { test_gzopen($mode); @@ -39,7 +39,7 @@ rmdir($thisTestDir); function test_gzopen($mode) { global $scriptFile, $secondFile, $firstFile, $filename; - + // create a file in the middle directory $h = gzopen($secondFile, "w"); gzwrite($h, "This is a file in dir2"); @@ -56,44 +56,44 @@ function test_gzopen($mode) { $h = gzopen($firstFile, "w"); gzwrite($h, "This is a file in dir1"); gzclose($h); - + //should now read dir1 file $h = gzopen($filename, $mode, true); gzpassthru($h); gzclose($h); echo "\n"; - + // create a file in working directory $h = gzopen($filename, "w"); gzwrite($h, "This is a file in working dir"); gzclose($h); - + //should still read dir1 file $h = gzopen($filename, $mode, true); gzpassthru($h); gzclose($h); echo "\n"; - + unlink($firstFile); unlink($secondFile); - + //should read the file in working dir $h = gzopen($filename, $mode, true); gzpassthru($h); gzclose($h); echo "\n"; - + // create a file in the script directory $h = gzopen($scriptFile, "w"); gzwrite($h, "This is a file in script dir"); gzclose($h); - + //should read the file in script dir $h = gzopen($filename, $mode, true); gzpassthru($h); gzclose($h); echo "\n"; - + //cleanup unlink($filename); unlink($scriptFile); diff --git a/ext/zlib/tests/gzopen_variation5.phpt b/ext/zlib/tests/gzopen_variation5.phpt index de505f7216..2e764bb0a4 100644 --- a/ext/zlib/tests/gzopen_variation5.phpt +++ b/ext/zlib/tests/gzopen_variation5.phpt @@ -1,17 +1,17 @@ --TEST-- Test gzopen() function : variation: use include path and stream context create a file, relative path --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php /* Prototype : resource gzopen(string filename, string mode [, int use_include_path]) * Description: Open a .gz-file and return a .gz-file pointer * Source code: ext/zlib/zlib.c - * Alias to functions: + * Alias to functions: */ require_once('gzopen_include_path.inc'); @@ -38,8 +38,8 @@ function runtest() { $h = gzopen($tmpfile, "w", true); fwrite($h, "This is the test file"); fclose($h); - - + + $h = @gzopen($tmpfile, "r"); if ($h === false) { echo "Not created in working dir\n"; @@ -49,7 +49,7 @@ function runtest() { gzclose($h); unlink($tmpfile); } - + $h = @gzopen('dir1/'.$tmpfile, "r"); if ($h === false) { echo "Not created in dir1\n"; @@ -57,7 +57,7 @@ function runtest() { else { echo "created in dir1\n"; gzclose($h); - unlink('dir1/'.$tmpfile); + unlink('dir1/'.$tmpfile); } } ?> diff --git a/ext/zlib/tests/gzopen_variation6.phpt b/ext/zlib/tests/gzopen_variation6.phpt index f26d5a20e2..2ff7e62cf2 100644 --- a/ext/zlib/tests/gzopen_variation6.phpt +++ b/ext/zlib/tests/gzopen_variation6.phpt @@ -1,17 +1,17 @@ --TEST-- Test gzopen() function : variation: relative/absolute file --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php /* Prototype : resource gzopen(string filename, string mode [, int use_include_path]) * Description: Open a .gz-file and return a .gz-file pointer * Source code: ext/zlib/zlib.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gzopen() : variation ***\n"; diff --git a/ext/zlib/tests/gzopen_variation7.phpt b/ext/zlib/tests/gzopen_variation7.phpt index 92642b0993..911c7fd73c 100644 --- a/ext/zlib/tests/gzopen_variation7.phpt +++ b/ext/zlib/tests/gzopen_variation7.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gzopen() by calling it twice on the same file and not closing one of them at the end of the script --SKIPIF-- -<?php +<?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 bb0126227f..02be5db197 100644 --- a/ext/zlib/tests/gzopen_variation8.phpt +++ b/ext/zlib/tests/gzopen_variation8.phpt @@ -1,17 +1,17 @@ --TEST-- Test gzopen() function : variation: opening a plain file --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php /* Prototype : resource gzopen(string filename, string mode [, int use_include_path]) * Description: Open a .gz-file and return a .gz-file pointer * Source code: ext/zlib/zlib.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gzopen() : variation ***\n"; diff --git a/ext/zlib/tests/gzopen_variation9.phpt b/ext/zlib/tests/gzopen_variation9.phpt index 7a44b6eb09..638c4848a5 100644 --- a/ext/zlib/tests/gzopen_variation9.phpt +++ b/ext/zlib/tests/gzopen_variation9.phpt @@ -1,17 +1,17 @@ --TEST-- Test gzopen() function : variation: try opening with possibly invalid modes --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php /* Prototype : resource gzopen(string filename, string mode [, int use_include_path]) * Description: Open a .gz-file and return a .gz-file pointer * Source code: ext/zlib/zlib.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gzopen() : variation ***\n"; diff --git a/ext/zlib/tests/gzpassthru_basic.phpt b/ext/zlib/tests/gzpassthru_basic.phpt index 59094efbe8..8b3e9c1123 100644 --- a/ext/zlib/tests/gzpassthru_basic.phpt +++ b/ext/zlib/tests/gzpassthru_basic.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gzpassthru() by calling it with its expected arguments --SKIPIF-- -<?php +<?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_error.phpt b/ext/zlib/tests/gzpassthru_error.phpt index 18d72efafa..39d5fef908 100644 --- a/ext/zlib/tests/gzpassthru_error.phpt +++ b/ext/zlib/tests/gzpassthru_error.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gzpassthru() by calling it more than or less than its expected arguments --SKIPIF-- -<?php +<?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 6456e4b55f..5f00a18626 100644 --- a/ext/zlib/tests/gzputs_basic.phpt +++ b/ext/zlib/tests/gzputs_basic.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gzputs() by calling it with its expected arguments --SKIPIF-- -<?php +<?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 ecb62a8259..825902e7c0 100644 --- a/ext/zlib/tests/gzread_basic.phpt +++ b/ext/zlib/tests/gzread_basic.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gzread() by calling it with its expected arguments --SKIPIF-- -<?php +<?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_error.phpt b/ext/zlib/tests/gzread_error.phpt index 989e832757..3baf5247b9 100644 --- a/ext/zlib/tests/gzread_error.phpt +++ b/ext/zlib/tests/gzread_error.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gzread() by calling it more than or less than its expected arguments --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- @@ -11,8 +11,8 @@ if (!extension_loaded("zlib")) { $f = dirname(__FILE__)."/004.txt.gz"; $h = gzopen($f, 'r'); -$length = 10; -$extra_arg = 'nothing'; +$length = 10; +$extra_arg = 'nothing'; var_dump(gzread( $h, $length, $extra_arg ) ); diff --git a/ext/zlib/tests/gzread_error2.phpt b/ext/zlib/tests/gzread_error2.phpt index fae6356419..07367fdf3e 100644 --- a/ext/zlib/tests/gzread_error2.phpt +++ b/ext/zlib/tests/gzread_error2.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gzread() by calling it invalid lengths --SKIPIF-- -<?php +<?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 966351e736..4aefe3f910 100644 --- a/ext/zlib/tests/gzread_variation1.phpt +++ b/ext/zlib/tests/gzread_variation1.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gzread() by calling it while file open for writing --SKIPIF-- -<?php +<?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 959f0fcdec..ba2ecae5b7 100644 --- a/ext/zlib/tests/gzrewind_basic.phpt +++ b/ext/zlib/tests/gzrewind_basic.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gzrewind() by calling it with its expected arguments when reading --SKIPIF-- -<?php +<?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 f51751c614..00c99801cc 100644 --- a/ext/zlib/tests/gzrewind_basic2.phpt +++ b/ext/zlib/tests/gzrewind_basic2.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gzrewind() by calling it with its expected arguments when reading --SKIPIF-- -<?php +<?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_error.phpt b/ext/zlib/tests/gzrewind_error.phpt index 3a1e4c9b73..d99e2d0a45 100644 --- a/ext/zlib/tests/gzrewind_error.phpt +++ b/ext/zlib/tests/gzrewind_error.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gzrewind() by calling it more than or less than its expected arguments --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- @@ -11,7 +11,7 @@ if (!extension_loaded("zlib")) { $f = dirname(__FILE__)."/004.txt.gz"; $h = gzopen($f, 'r'); -$extra_arg = 'nothing'; +$extra_arg = 'nothing'; var_dump(gzrewind( $h, $extra_arg ) ); var_dump(gzrewind()); gzclose($h); diff --git a/ext/zlib/tests/gzrewind_variation1.phpt b/ext/zlib/tests/gzrewind_variation1.phpt index 3eef10e93f..b42a44ad0d 100644 --- a/ext/zlib/tests/gzrewind_variation1.phpt +++ b/ext/zlib/tests/gzrewind_variation1.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gzrewind() by calling it with its expected arguments when writing --SKIPIF-- -<?php +<?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 d641bad429..2f0b5ae451 100644 --- a/ext/zlib/tests/gzseek_basic.phpt +++ b/ext/zlib/tests/gzseek_basic.phpt @@ -1,15 +1,15 @@ --TEST-- Test function gzseek() by calling it with its expected arguments when reading --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- <?php $f = dirname(__FILE__)."/004.txt.gz"; -$h = gzopen($f, 'r'); +$h = gzopen($f, 'r'); echo "move to the 50th byte\n"; var_dump(gzseek( $h, 50 ) ); diff --git a/ext/zlib/tests/gzseek_basic2.phpt b/ext/zlib/tests/gzseek_basic2.phpt index 8e037af139..70b0d1f046 100644 --- a/ext/zlib/tests/gzseek_basic2.phpt +++ b/ext/zlib/tests/gzseek_basic2.phpt @@ -1,15 +1,15 @@ --TEST-- Test function gzseek() by calling it with its expected arguments when writing --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- <?php $f = "gzseek_basic2.gz"; -$h = gzopen($f, 'w'); +$h = gzopen($f, 'w'); $str1 = "This is the first line."; $str2 = "This is the second line."; gzwrite($h, $str1); diff --git a/ext/zlib/tests/gzseek_error.phpt b/ext/zlib/tests/gzseek_error.phpt index ab6c96552e..e6c43e7b3a 100644 --- a/ext/zlib/tests/gzseek_error.phpt +++ b/ext/zlib/tests/gzseek_error.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gzseek() by calling it more than or less than its expected arguments --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- @@ -12,7 +12,7 @@ $f = dirname(__FILE__)."/004.txt.gz"; $h = gzopen($f, 'r'); $offset = 1; $whence = SEEK_SET; -$extra_arg = 'nothing'; +$extra_arg = 'nothing'; var_dump(gzseek( $h, $offset, $whence, $extra_arg ) ); var_dump(gzseek($h)); diff --git a/ext/zlib/tests/gzseek_variation1.phpt b/ext/zlib/tests/gzseek_variation1.phpt index 8512b743bd..28eff866f9 100644 --- a/ext/zlib/tests/gzseek_variation1.phpt +++ b/ext/zlib/tests/gzseek_variation1.phpt @@ -1,15 +1,15 @@ --TEST-- Test function gzseek() by seeking forward in write mode --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- <?php $f = "gzseek_variation1.gz"; -$h = gzopen($f, 'w'); +$h = gzopen($f, 'w'); $str1 = "This is the first line."; $str2 = "This is the second line."; gzwrite($h, $str1); diff --git a/ext/zlib/tests/gzseek_variation2.phpt b/ext/zlib/tests/gzseek_variation2.phpt index e70d6dd845..615dfe96a3 100644 --- a/ext/zlib/tests/gzseek_variation2.phpt +++ b/ext/zlib/tests/gzseek_variation2.phpt @@ -1,15 +1,15 @@ --TEST-- Test function gzseek() by calling it with SEEK_SET when reading --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- <?php $f = dirname(__FILE__)."/004.txt.gz"; -$h = gzopen($f, 'r'); +$h = gzopen($f, 'r'); echo "move to the 50th byte\n"; var_dump(gzseek( $h, 50, SEEK_SET ) ); diff --git a/ext/zlib/tests/gzseek_variation3.phpt b/ext/zlib/tests/gzseek_variation3.phpt index dee7c1302a..02dc7ac825 100644 --- a/ext/zlib/tests/gzseek_variation3.phpt +++ b/ext/zlib/tests/gzseek_variation3.phpt @@ -1,15 +1,15 @@ --TEST-- Test function gzseek() by calling it with SEEK_CUR when reading --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- <?php $f = dirname(__FILE__)."/004.txt.gz"; -$h = gzopen($f, 'r'); +$h = gzopen($f, 'r'); echo "move to the 50th byte\n"; var_dump(gzseek( $h, 50, SEEK_CUR ) ); diff --git a/ext/zlib/tests/gzseek_variation4.phpt b/ext/zlib/tests/gzseek_variation4.phpt index 529a012141..2270ccc5f9 100644 --- a/ext/zlib/tests/gzseek_variation4.phpt +++ b/ext/zlib/tests/gzseek_variation4.phpt @@ -1,15 +1,15 @@ --TEST-- Test function gzseek() by calling it with SEEK_SET when writing --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- <?php $f = "gzseek_variation5.gz"; -$h = gzopen($f, 'w'); +$h = gzopen($f, 'w'); $str1 = "This is the first line."; $str2 = "This is the second line."; gzwrite($h, $str1); diff --git a/ext/zlib/tests/gzseek_variation5.phpt b/ext/zlib/tests/gzseek_variation5.phpt index 11e4912787..b38b46558e 100644 --- a/ext/zlib/tests/gzseek_variation5.phpt +++ b/ext/zlib/tests/gzseek_variation5.phpt @@ -1,15 +1,15 @@ --TEST-- Test function gzseek() by calling it with SEEK_CUR when writing --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- <?php $f = "gzseek_variation5.gz"; -$h = gzopen($f, 'w'); +$h = gzopen($f, 'w'); $str1 = "This is the first line."; $str2 = "This is the second line."; gzwrite($h, $str1); diff --git a/ext/zlib/tests/gzseek_variation6.phpt b/ext/zlib/tests/gzseek_variation6.phpt index 0c4630953c..c0b983e4e9 100644 --- a/ext/zlib/tests/gzseek_variation6.phpt +++ b/ext/zlib/tests/gzseek_variation6.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gzseek() by calling it with SEEK_END when reading --SKIPIF-- -<?php +<?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 a365272ba2..a1976b2b16 100644 --- a/ext/zlib/tests/gzseek_variation7.phpt +++ b/ext/zlib/tests/gzseek_variation7.phpt @@ -1,15 +1,15 @@ --TEST-- Test function gzseek() by calling it with SEEK_END when writing --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- <?php $f = "gzseek_variation7.gz"; -$h = gzopen($f, 'w'); +$h = gzopen($f, 'w'); $str1 = "This is the first line."; $str2 = "This is the second line."; gzwrite($h, $str1); diff --git a/ext/zlib/tests/gztell_basic.phpt b/ext/zlib/tests/gztell_basic.phpt index b6baf427db..7d7e96d341 100644 --- a/ext/zlib/tests/gztell_basic.phpt +++ b/ext/zlib/tests/gztell_basic.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gztell() by calling it with its expected arguments when reading --SKIPIF-- -<?php +<?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 ded3fbee7c..05a3f3dced 100644 --- a/ext/zlib/tests/gztell_basic2.phpt +++ b/ext/zlib/tests/gztell_basic2.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gztell() by calling it with its expected arguments when writing --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- @@ -14,7 +14,7 @@ $sizes = array(7, 22, 54, 17, 27, 15, 1000); // tell should be 7, 29, 83, 100, 127, 142, 1142 var_dump(gztell($h)); -foreach ($sizes as $size) { +foreach ($sizes as $size) { echo "bytes written=".gzwrite($h, str_repeat('1', $size))."\n"; echo "tell=".gztell($h)."\n"; } diff --git a/ext/zlib/tests/gztell_error.phpt b/ext/zlib/tests/gztell_error.phpt index e207c59bde..b563a33484 100644 --- a/ext/zlib/tests/gztell_error.phpt +++ b/ext/zlib/tests/gztell_error.phpt @@ -1,16 +1,16 @@ --TEST-- Test function gztell() by calling it more than or less than its expected arguments --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- <?php $f = dirname(__FILE__)."/004.txt.gz"; $h = gzopen($f, 'r'); -$extra_arg = 'nothing'; +$extra_arg = 'nothing'; var_dump(gztell( $h, $extra_arg ) ); var_dump(gztell()); gzclose($h); diff --git a/ext/zlib/tests/gzuncompress_basic1.phpt b/ext/zlib/tests/gzuncompress_basic1.phpt index fa7f1759e6..222f55dd84 100644 --- a/ext/zlib/tests/gzuncompress_basic1.phpt +++ b/ext/zlib/tests/gzuncompress_basic1.phpt @@ -1,17 +1,17 @@ --TEST-- Test gzuncompress() function : basic functionality --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php /* Prototype : string gzuncompress(string data [, int length]) * Description: Unzip a gzip-compressed string * Source code: ext/zlib/zlib.c - * Alias to functions: + * Alias to functions: */ include(dirname(__FILE__) . '/data.inc'); diff --git a/ext/zlib/tests/gzuncompress_error1.phpt b/ext/zlib/tests/gzuncompress_error1.phpt index 71c60552ec..5961673abb 100644 --- a/ext/zlib/tests/gzuncompress_error1.phpt +++ b/ext/zlib/tests/gzuncompress_error1.phpt @@ -1,17 +1,17 @@ --TEST-- Test gzuncompress() function : error conditions --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php /* Prototype : string gzuncompress(string data [, int length]) * Description: Unzip a gzip-compressed string * Source code: ext/zlib/zlib.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gzuncompress() : error conditions ***\n"; @@ -38,7 +38,7 @@ var_dump(gzuncompress(123)); class Tester { function Hello() { - echo "Hello\n"; + echo "Hello\n"; } } diff --git a/ext/zlib/tests/gzwrite_basic.phpt b/ext/zlib/tests/gzwrite_basic.phpt index 46553eedf1..05d877158b 100644 --- a/ext/zlib/tests/gzwrite_basic.phpt +++ b/ext/zlib/tests/gzwrite_basic.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gzwrite() by calling it with its expected arguments --SKIPIF-- -<?php +<?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_error.phpt b/ext/zlib/tests/gzwrite_error.phpt index b4ddbb2ec7..fca081171c 100644 --- a/ext/zlib/tests/gzwrite_error.phpt +++ b/ext/zlib/tests/gzwrite_error.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gzwrite() by calling it more than or less than its expected arguments --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- @@ -12,7 +12,7 @@ $filename = "gzwrite_error.txt.gz"; $h = gzopen($filename, 'w'); $str = "Here is the string to be written. "; $length = 10; -$extra_arg = 'nothing'; +$extra_arg = 'nothing'; var_dump(gzwrite($h, $str, $length, $extra_arg)); var_dump(gzwrite($h)); var_dump(gzwrite()); diff --git a/ext/zlib/tests/gzwrite_error2.phpt b/ext/zlib/tests/gzwrite_error2.phpt index 5f2a4197b5..803e34a5cc 100644 --- a/ext/zlib/tests/gzwrite_error2.phpt +++ b/ext/zlib/tests/gzwrite_error2.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gzwrite() by calling it invalid lengths --SKIPIF-- -<?php +<?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 bd3778e366..29a67861fd 100644 --- a/ext/zlib/tests/gzwrite_variation1.phpt +++ b/ext/zlib/tests/gzwrite_variation1.phpt @@ -1,9 +1,9 @@ --TEST-- Test function gzwrite() by calling it when file is opened for reading --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- diff --git a/ext/zlib/tests/inflate_add_error.phpt b/ext/zlib/tests/inflate_add_error.phpt index 0e1711e0f8..63c827e4e1 100644 --- a/ext/zlib/tests/inflate_add_error.phpt +++ b/ext/zlib/tests/inflate_add_error.phpt @@ -1,9 +1,9 @@ --TEST-- Test incremental inflate_add() error functionality --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- diff --git a/ext/zlib/tests/inflate_init_error.phpt b/ext/zlib/tests/inflate_init_error.phpt index 58c07a426c..fb80573c1c 100644 --- a/ext/zlib/tests/inflate_init_error.phpt +++ b/ext/zlib/tests/inflate_init_error.phpt @@ -1,9 +1,9 @@ --TEST-- Test inflate_init() error --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- diff --git a/ext/zlib/tests/inflate_init_reuse.phpt b/ext/zlib/tests/inflate_init_reuse.phpt index e1b8294cbc..a82ddc3a28 100644 --- a/ext/zlib/tests/inflate_init_reuse.phpt +++ b/ext/zlib/tests/inflate_init_reuse.phpt @@ -1,9 +1,9 @@ --TEST-- Test incremental inflate_init() context reuse --SKIPIF-- -<?php +<?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_error.phpt b/ext/zlib/tests/readgzfile_error.phpt index 4ec76d0172..6d393423f7 100644 --- a/ext/zlib/tests/readgzfile_error.phpt +++ b/ext/zlib/tests/readgzfile_error.phpt @@ -10,7 +10,7 @@ if (!extension_loaded('zlib')) die ('skip zlib extension not available in this b $filename = dirname(__FILE__)."/004.txt.gz"; $use_include_path = false; -$extra_arg = 'nothing'; +$extra_arg = 'nothing'; var_dump(readgzfile( $filename, $use_include_path, $extra_arg ) ); diff --git a/ext/zlib/tests/readgzfile_variation15.phpt b/ext/zlib/tests/readgzfile_variation15.phpt index 36ff6ff254..dbed5238af 100644 --- a/ext/zlib/tests/readgzfile_variation15.phpt +++ b/ext/zlib/tests/readgzfile_variation15.phpt @@ -1,17 +1,17 @@ --TEST-- Test readgzfile() function : variation: use include path (relative directories in path) --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php require_once('reading_include_path.inc'); //define the files to go into these directories, create one in dir2 -set_include_path($newIncludePath); +set_include_path($newIncludePath); test_readgzfile(); restore_include_path(); @@ -27,7 +27,7 @@ rmdir($thisTestDir); function test_readgzfile() { global $scriptFile, $secondFile, $firstFile, $filename; - + // create a file in the middle directory $h = gzopen($secondFile, "w"); gzwrite($h, "This is a file in dir2"); @@ -42,40 +42,40 @@ function test_readgzfile() { $h = gzopen($firstFile, "w"); gzwrite($h, "This is a file in dir1"); gzclose($h); - + //should now read dir1 file - echo "file content:"; + echo "file content:"; readgzfile($filename, true); echo "\n"; - + // create a file in working directory $h = gzopen($filename, "w"); gzwrite($h, "This is a file in working dir"); gzclose($h); - + //should still read dir1 file - echo "file content:"; + echo "file content:"; readgzfile($filename, true); echo "\n"; - + unlink($firstFile); unlink($secondFile); - + //should read the file in working dir - echo "file content:"; + echo "file content:"; readgzfile($filename, true); echo "\n"; - + // create a file in the script directory $h = gzopen($scriptFile, "w"); gzwrite($h, "This is a file in script dir"); gzclose($h); - + //should read the file in script dir - echo "file content:"; + echo "file content:"; readgzfile($filename, true); echo "\n"; - + //cleanup unlink($filename); unlink($scriptFile); diff --git a/ext/zlib/tests/zlib_filter_deflate.phpt b/ext/zlib/tests/zlib_filter_deflate.phpt index 1098d60240..c8e54cb551 100644 --- a/ext/zlib/tests/zlib_filter_deflate.phpt +++ b/ext/zlib/tests/zlib_filter_deflate.phpt @@ -12,6 +12,6 @@ stream_filter_append($fp, 'convert.base64-encode', STREAM_FILTER_WRITE); fwrite($fp, $text); fclose($fp); -?> ---EXPECT-- +?> +--EXPECT-- HctBDoAgDETRq8zOjfEeHKOGATG0TRpC4u1Vdn/xX4IoxkVMxgP1zA4vkJVhULk9UGkM6TvSNolmxUNlNLePVQ45O3eINf0fsQxtCxwv diff --git a/ext/zlib/tests/zlib_filter_inflate.phpt b/ext/zlib/tests/zlib_filter_inflate.phpt index 4b63d10750..1e6e3067fc 100644 --- a/ext/zlib/tests/zlib_filter_inflate.phpt +++ b/ext/zlib/tests/zlib_filter_inflate.phpt @@ -12,6 +12,6 @@ stream_filter_append($fp, 'zlib.inflate', STREAM_FILTER_WRITE); fwrite($fp, $text); fclose($fp); -?> ---EXPECT-- +?> +--EXPECT-- I am the very model of a modern major general, I've information vegetable, animal, and mineral. diff --git a/ext/zlib/tests/zlib_scheme_copy_basic.phpt b/ext/zlib/tests/zlib_scheme_copy_basic.phpt index 028c029e62..ca1a42a85c 100644 --- a/ext/zlib/tests/zlib_scheme_copy_basic.phpt +++ b/ext/zlib/tests/zlib_scheme_copy_basic.phpt @@ -1,10 +1,10 @@ --TEST-- Test compress.zlib:// scheme with the copy function: compressed to compressed --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php diff --git a/ext/zlib/tests/zlib_scheme_copy_variation1.phpt b/ext/zlib/tests/zlib_scheme_copy_variation1.phpt index 3c997ef7e9..f410b6e4f1 100644 --- a/ext/zlib/tests/zlib_scheme_copy_variation1.phpt +++ b/ext/zlib/tests/zlib_scheme_copy_variation1.phpt @@ -1,10 +1,10 @@ --TEST-- Test compress.zlib:// scheme with the copy function: compressed to uncompressed --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php diff --git a/ext/zlib/tests/zlib_scheme_copy_variation2.phpt b/ext/zlib/tests/zlib_scheme_copy_variation2.phpt index 0b56ec430a..43e5d9b2fc 100644 --- a/ext/zlib/tests/zlib_scheme_copy_variation2.phpt +++ b/ext/zlib/tests/zlib_scheme_copy_variation2.phpt @@ -1,10 +1,10 @@ --TEST-- Test compress.zlib:// scheme with the copy function: uncompressed to compressed --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php diff --git a/ext/zlib/tests/zlib_scheme_dir_basic.phpt b/ext/zlib/tests/zlib_scheme_dir_basic.phpt index 02fe4fd354..80189f2de9 100644 --- a/ext/zlib/tests/zlib_scheme_dir_basic.phpt +++ b/ext/zlib/tests/zlib_scheme_dir_basic.phpt @@ -1,10 +1,10 @@ --TEST-- Test compress.zlib:// scheme with the directory functions --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php diff --git a/ext/zlib/tests/zlib_scheme_file_basic.phpt b/ext/zlib/tests/zlib_scheme_file_basic.phpt index b8b60e40e7..f08183fd25 100644 --- a/ext/zlib/tests/zlib_scheme_file_basic.phpt +++ b/ext/zlib/tests/zlib_scheme_file_basic.phpt @@ -1,10 +1,10 @@ --TEST-- Test compress.zlib:// scheme with the file --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php 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 c679c46be9..071fcd716e 100644 --- a/ext/zlib/tests/zlib_scheme_file_get_contents_basic.phpt +++ b/ext/zlib/tests/zlib_scheme_file_get_contents_basic.phpt @@ -1,10 +1,10 @@ --TEST-- Test compress.zlib:// scheme with the file_get_contents --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php 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 8ea41df5a8..2f36d1f619 100644 --- a/ext/zlib/tests/zlib_scheme_file_put_contents_basic.phpt +++ b/ext/zlib/tests/zlib_scheme_file_put_contents_basic.phpt @@ -1,10 +1,10 @@ --TEST-- Test compress.zlib:// scheme with the file_get_contents --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php 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 ef44292c3f..eb7fde37b4 100644 --- a/ext/zlib/tests/zlib_scheme_file_read_file_basic.phpt +++ b/ext/zlib/tests/zlib_scheme_file_read_file_basic.phpt @@ -1,10 +1,10 @@ --TEST-- Test compress.zlib:// scheme with the file_get_contents --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php diff --git a/ext/zlib/tests/zlib_scheme_fopen_basic.phpt b/ext/zlib/tests/zlib_scheme_fopen_basic.phpt index d6d4514f7a..8ec10ac463 100644 --- a/ext/zlib/tests/zlib_scheme_fopen_basic.phpt +++ b/ext/zlib/tests/zlib_scheme_fopen_basic.phpt @@ -1,10 +1,10 @@ --TEST-- Test compress.zlib:// scheme with the fopen --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php diff --git a/ext/zlib/tests/zlib_scheme_fopen_variation1.phpt b/ext/zlib/tests/zlib_scheme_fopen_variation1.phpt index 8c26492efd..88057eb3e3 100644 --- a/ext/zlib/tests/zlib_scheme_fopen_variation1.phpt +++ b/ext/zlib/tests/zlib_scheme_fopen_variation1.phpt @@ -1,10 +1,10 @@ --TEST-- Test compress.zlib:// scheme with the fopen on a file scheme --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php diff --git a/ext/zlib/tests/zlib_scheme_rename_basic.phpt b/ext/zlib/tests/zlib_scheme_rename_basic.phpt index 9de55aa3e2..ee693de97a 100644 --- a/ext/zlib/tests/zlib_scheme_rename_basic.phpt +++ b/ext/zlib/tests/zlib_scheme_rename_basic.phpt @@ -1,10 +1,10 @@ --TEST-- Test compress.zlib:// scheme with the unlink function --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php diff --git a/ext/zlib/tests/zlib_scheme_stat_basic.phpt b/ext/zlib/tests/zlib_scheme_stat_basic.phpt index 10cd9a4b03..ab673700dc 100644 --- a/ext/zlib/tests/zlib_scheme_stat_basic.phpt +++ b/ext/zlib/tests/zlib_scheme_stat_basic.phpt @@ -1,10 +1,10 @@ --TEST-- Test compress.zlib:// scheme with the unlink function --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php diff --git a/ext/zlib/tests/zlib_scheme_stat_basic2.phpt b/ext/zlib/tests/zlib_scheme_stat_basic2.phpt index e78bcd76c1..d16e2a8ade 100644 --- a/ext/zlib/tests/zlib_scheme_stat_basic2.phpt +++ b/ext/zlib/tests/zlib_scheme_stat_basic2.phpt @@ -1,10 +1,10 @@ --TEST-- Test compress.zlib:// scheme with the unlink function --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php diff --git a/ext/zlib/tests/zlib_scheme_unlink_basic.phpt b/ext/zlib/tests/zlib_scheme_unlink_basic.phpt index b05e45bc6a..3aa25f9dda 100644 --- a/ext/zlib/tests/zlib_scheme_unlink_basic.phpt +++ b/ext/zlib/tests/zlib_scheme_unlink_basic.phpt @@ -1,10 +1,10 @@ --TEST-- Test compress.zlib:// scheme with the unlink function --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; -} + print "skip - ZLIB extension not loaded"; +} ?> --FILE-- <?php diff --git a/ext/zlib/tests/zlib_wrapper_fflush_basic.phpt b/ext/zlib/tests/zlib_wrapper_fflush_basic.phpt index de1318cfed..c706b2a7b7 100644 --- a/ext/zlib/tests/zlib_wrapper_fflush_basic.phpt +++ b/ext/zlib/tests/zlib_wrapper_fflush_basic.phpt @@ -1,9 +1,9 @@ --TEST-- Test function fflush() on a zlib stream wrapper --SKIPIF-- -<?php +<?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 9cefce4cbe..ec1b67a64b 100644 --- a/ext/zlib/tests/zlib_wrapper_flock_basic.phpt +++ b/ext/zlib/tests/zlib_wrapper_flock_basic.phpt @@ -1,15 +1,15 @@ --TEST-- Test function stream_get_meta_data on a zlib stream --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- <?php $f = dirname(__FILE__)."/004.txt.gz"; -$h = gzopen($f,'r'); +$h = gzopen($f,'r'); var_dump(flock($h, LOCK_SH)); gzclose($h); ?> diff --git a/ext/zlib/tests/zlib_wrapper_fstat_basic.phpt b/ext/zlib/tests/zlib_wrapper_fstat_basic.phpt index 41f957e80b..6e665cee71 100644 --- a/ext/zlib/tests/zlib_wrapper_fstat_basic.phpt +++ b/ext/zlib/tests/zlib_wrapper_fstat_basic.phpt @@ -1,9 +1,9 @@ --TEST-- Test function fstat() on zlib wrapper --SKIPIF-- -<?php +<?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 348e24505c..399d32c5f3 100644 --- a/ext/zlib/tests/zlib_wrapper_ftruncate_basic.phpt +++ b/ext/zlib/tests/zlib_wrapper_ftruncate_basic.phpt @@ -1,9 +1,9 @@ --TEST-- Test function ftruncate() on zlib wrapper by calling it with its expected arguments --SKIPIF-- -<?php +<?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 a9d208eeaa..87fa6227ab 100644 --- a/ext/zlib/tests/zlib_wrapper_meta_data_basic.phpt +++ b/ext/zlib/tests/zlib_wrapper_meta_data_basic.phpt @@ -1,21 +1,21 @@ --TEST-- Test function stream_get_meta_data on a zlib stream --SKIPIF-- -<?php +<?php if (!extension_loaded("zlib")) { - print "skip - ZLIB extension not loaded"; + print "skip - ZLIB extension not loaded"; } ?> --FILE-- <?php echo "no wrapper\n"; $f = dirname(__FILE__)."/004.txt.gz"; -$h = gzopen($f,'r'); +$h = gzopen($f,'r'); var_dump(stream_get_meta_data($h)); gzclose($h); echo "\nwith wrapper\n"; $f = "compress.zlib://".dirname(__FILE__)."/004.txt.gz"; -$h = fopen($f,'r'); +$h = fopen($f,'r'); var_dump(stream_get_meta_data($h)); gzclose($h); diff --git a/sapi/cgi/tests/002.phpt b/sapi/cgi/tests/002.phpt index fda8fcbe04..91db184fcb 100644 --- a/sapi/cgi/tests/002.phpt +++ b/sapi/cgi/tests/002.phpt @@ -1,8 +1,8 @@ --TEST-- defining INI options with -d --SKIPIF-- -<?php -include "skipif.inc"; +<?php +include "skipif.inc"; ?> --FILE-- <?php @@ -27,7 +27,7 @@ unlink($file); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(%d) "X-Powered-By: PHP/%s Content-type: text/html%r; charset=.*|%r diff --git a/sapi/cgi/tests/003.phpt b/sapi/cgi/tests/003.phpt index 1ba94f27ef..a4d3058624 100644 --- a/sapi/cgi/tests/003.phpt +++ b/sapi/cgi/tests/003.phpt @@ -1,13 +1,13 @@ --TEST-- strip comments and whitespace with -w --SKIPIF-- -<?php +<?php if (substr(PHP_OS, 0, 3) == 'WIN') { die ("skip not for Windows"); } -include "skipif.inc"; +include "skipif.inc"; ?> --FILE-- <?php @@ -45,7 +45,7 @@ var_dump(`echo "<?php /* comment */ class test {\n // comment \n function foo() echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(%d) "X-Powered-By: PHP/%s Content-type: text/html%r; charset=.*|%r diff --git a/sapi/cgi/tests/004.phpt b/sapi/cgi/tests/004.phpt index 0e7117080d..c41df11acc 100644 --- a/sapi/cgi/tests/004.phpt +++ b/sapi/cgi/tests/004.phpt @@ -1,8 +1,8 @@ --TEST-- execute a file with -f --SKIPIF-- -<?php -include "skipif.inc"; +<?php +include "skipif.inc"; ?> --FILE-- <?php @@ -16,8 +16,8 @@ $filename = dirname(__FILE__).'/004.test.php'; $code =' <?php -class test { - private $pri; +class test { + private $pri; } var_dump(test::$pri); @@ -37,7 +37,7 @@ var_dump(`$php -n -f "wrong"`); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(%d) " <br /> <b>Fatal error</b>: Uncaught Error: Cannot access private property test::$pri in %s004.test.php:8 diff --git a/sapi/cgi/tests/005-win32.phpt b/sapi/cgi/tests/005-win32.phpt index 855dc57de3..1674f16fb9 100644 --- a/sapi/cgi/tests/005-win32.phpt +++ b/sapi/cgi/tests/005-win32.phpt @@ -22,7 +22,7 @@ var_dump(`$php -n -f "wrong" -a`); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(51) "Interactive mode enabled No input file specified. diff --git a/sapi/cgi/tests/005.phpt b/sapi/cgi/tests/005.phpt index c36d5939c7..6b41f7a99f 100644 --- a/sapi/cgi/tests/005.phpt +++ b/sapi/cgi/tests/005.phpt @@ -22,7 +22,7 @@ var_dump(`$php -n -f 'wrong' -a`); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(51) "No input file specified. Interactive mode enabled diff --git a/sapi/cgi/tests/006.phpt b/sapi/cgi/tests/006.phpt index 08bfbf5d6c..bc98656b49 100644 --- a/sapi/cgi/tests/006.phpt +++ b/sapi/cgi/tests/006.phpt @@ -54,7 +54,7 @@ if (defined("PHP_WINDOWS_VERSION_MAJOR")) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(%d) "No syntax errors detected in %s006.test.php " string(%d) "No input file specified. diff --git a/sapi/cgi/tests/007.phpt b/sapi/cgi/tests/007.phpt index 1c8b0eb1c5..950f451083 100644 --- a/sapi/cgi/tests/007.phpt +++ b/sapi/cgi/tests/007.phpt @@ -14,7 +14,7 @@ var_dump(`"$php" -n -s -w -l`); ?> ===DONE=== ---EXPECT-- +--EXPECT-- string(25) "No input file specified. " string(49) "No syntax errors detected in Standard input code diff --git a/sapi/cgi/tests/008.phpt b/sapi/cgi/tests/008.phpt index 7537664cc8..f0df0bae42 100644 --- a/sapi/cgi/tests/008.phpt +++ b/sapi/cgi/tests/008.phpt @@ -37,7 +37,7 @@ var_dump(`"$php" -n -s "unknown"`); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(%d) "X-Powered-By: PHP/%s Content-type: text/html%r; charset=.*|%r diff --git a/sapi/cgi/tests/apache_request_headers.phpt b/sapi/cgi/tests/apache_request_headers.phpt index fd36e3024f..3750600671 100644 --- a/sapi/cgi/tests/apache_request_headers.phpt +++ b/sapi/cgi/tests/apache_request_headers.phpt @@ -3,8 +3,8 @@ apache_request_headers() stack overflow. --INI-- default_charset="UTF-8" --SKIPIF-- -<?php -include "skipif.inc"; +<?php +include "skipif.inc"; ?> --FILE-- <?php @@ -29,7 +29,7 @@ unlink($file); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- X-Powered-By: PHP/%s Content-type: text/%s diff --git a/sapi/cli/tests/001.phpt b/sapi/cli/tests/001.phpt index 6fbd608a6f..744918a373 100644 --- a/sapi/cli/tests/001.phpt +++ b/sapi/cli/tests/001.phpt @@ -11,7 +11,7 @@ var_dump(`$php -n -v`); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(%d) "PHP %s (cli) (built: %s)%s Copyright (c) 1997-20%d The PHP Group Zend Engine v%s, Copyright (c) 1998-20%d Zend Technologies diff --git a/sapi/cli/tests/002-unix.phpt b/sapi/cli/tests/002-unix.phpt index c67b93eba2..2be668f188 100644 --- a/sapi/cli/tests/002-unix.phpt +++ b/sapi/cli/tests/002-unix.phpt @@ -1,8 +1,8 @@ --TEST-- running code with -r --SKIPIF-- -<?php -include "skipif.inc"; +<?php +include "skipif.inc"; if (substr(PHP_OS, 0, 3) == 'WIN') { die ("skip not for Windows"); } @@ -16,7 +16,7 @@ var_dump(`$php -n -r 'var_dump("hello");'`); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(18) "string(5) "hello" " Done diff --git a/sapi/cli/tests/002.phpt b/sapi/cli/tests/002.phpt index 496715376e..9fb2465ee4 100644 --- a/sapi/cli/tests/002.phpt +++ b/sapi/cli/tests/002.phpt @@ -13,7 +13,7 @@ var_dump(`$php -n -r "var_dump('hello');"`); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(18) "string(5) "hello" " Done diff --git a/sapi/cli/tests/003-2.phpt b/sapi/cli/tests/003-2.phpt index 24c3b591cc..6b8957e644 100644 --- a/sapi/cli/tests/003-2.phpt +++ b/sapi/cli/tests/003-2.phpt @@ -1,8 +1,8 @@ --TEST-- defining INI options with -d (as 2nd arg) --SKIPIF-- -<?php -include "skipif.inc"; +<?php +include "skipif.inc"; if (substr(PHP_OS, 0, 3) == 'WIN') { die ("skip not for Windows"); } @@ -17,7 +17,7 @@ var_dump(`"$php" -nd max_execution_time=500 -r 'var_dump(ini_get("max_execution_ ?> ===DONE=== ---EXPECT-- +--EXPECT-- string(16) "string(3) "111" " string(16) "string(3) "500" diff --git a/sapi/cli/tests/003.phpt b/sapi/cli/tests/003.phpt index aff5a845b8..6584e2c7be 100644 --- a/sapi/cli/tests/003.phpt +++ b/sapi/cli/tests/003.phpt @@ -1,8 +1,8 @@ --TEST-- defining INI options with -d --SKIPIF-- -<?php -include "skipif.inc"; +<?php +include "skipif.inc"; if (substr(PHP_OS, 0, 3) == 'WIN') { die ("skip not for Windows"); } @@ -19,7 +19,7 @@ var_dump(`$php -n -d upload_tmp_dir=/test/path -d max_execution_time=555 -r 'var echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(16) "string(3) "111" " string(16) "string(3) "500" diff --git a/sapi/cli/tests/004.phpt b/sapi/cli/tests/004.phpt index 1a5473987f..78158ba70a 100644 --- a/sapi/cli/tests/004.phpt +++ b/sapi/cli/tests/004.phpt @@ -2,7 +2,7 @@ show information about function --SKIPIF-- <?php -include "skipif.inc"; +include "skipif.inc"; ?> --FILE-- <?php diff --git a/sapi/cli/tests/005.phpt b/sapi/cli/tests/005.phpt index 2a4b8d955d..0a366b6975 100644 --- a/sapi/cli/tests/005.phpt +++ b/sapi/cli/tests/005.phpt @@ -2,7 +2,7 @@ show information about class --SKIPIF-- <?php -include "skipif.inc"; +include "skipif.inc"; ?> --FILE-- <?php diff --git a/sapi/cli/tests/007.phpt b/sapi/cli/tests/007.phpt index d50c38149a..dd8e17163c 100644 --- a/sapi/cli/tests/007.phpt +++ b/sapi/cli/tests/007.phpt @@ -1,8 +1,8 @@ --TEST-- strip comments and whitespace with -w --SKIPIF-- -<?php -include "skipif.inc"; +<?php +include "skipif.inc"; if (substr(PHP_OS, 0, 3) == 'WIN') { die ("skip not for Windows"); } @@ -40,7 +40,7 @@ var_dump(`echo "<?php /* comment */ class test {\n // comment \n function foo() echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(81) " <?php class test { public $var = "test"; private $pri; function foo() { } } ?> diff --git a/sapi/cli/tests/008.phpt b/sapi/cli/tests/008.phpt index 0121d94a27..d795c98879 100644 --- a/sapi/cli/tests/008.phpt +++ b/sapi/cli/tests/008.phpt @@ -1,8 +1,8 @@ --TEST-- execute a file with -f --SKIPIF-- -<?php -include "skipif.inc"; +<?php +include "skipif.inc"; if (substr(PHP_OS, 0, 3) == 'WIN') { die ("skip not for Windows"); } @@ -16,8 +16,8 @@ $filename = dirname(__FILE__).'/008.test.php'; $code =' <?php -class test { - private $pri; +class test { + private $pri; } var_dump(test::$pri); @@ -33,7 +33,7 @@ var_dump(`$php -n -f "wrong"`); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(%d) " Fatal error: Uncaught Error: Cannot access private property test::$pri in %s:%d diff --git a/sapi/cli/tests/009.phpt b/sapi/cli/tests/009.phpt index 5e72e39f03..c110966458 100644 --- a/sapi/cli/tests/009.phpt +++ b/sapi/cli/tests/009.phpt @@ -12,7 +12,7 @@ var_dump(`$php -n -r "echo hello;" -a`); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(57) "Either execute direct code, process stdin or use a file. " string(57) "Either execute direct code, process stdin or use a file. diff --git a/sapi/cli/tests/010-2.phpt b/sapi/cli/tests/010-2.phpt index cec29c6b4a..73198ad28b 100644 --- a/sapi/cli/tests/010-2.phpt +++ b/sapi/cli/tests/010-2.phpt @@ -1,8 +1,8 @@ --TEST-- executing a code with -R --SKIPIF-- -<?php -include "skipif.inc"; +<?php +include "skipif.inc"; if (substr(PHP_OS, 0, 3) == 'WIN') { die ("skip not for Windows"); } @@ -27,7 +27,7 @@ var_dump(`cat "$filename_txt" | "$php" -n -R "var_dump(1);"`); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(21) "int(1) int(1) int(1) diff --git a/sapi/cli/tests/010.phpt b/sapi/cli/tests/010.phpt index 198eef4bed..ddcae81ed8 100644 --- a/sapi/cli/tests/010.phpt +++ b/sapi/cli/tests/010.phpt @@ -1,8 +1,8 @@ --TEST-- executing a file with -F --SKIPIF-- -<?php -include "skipif.inc"; +<?php +include "skipif.inc"; if (substr(PHP_OS, 0, 3) == 'WIN') { die ("skip not for Windows"); } @@ -38,7 +38,7 @@ var_dump(`cat "$filename_txt" | "$php" -n -F "$filename"`); @unlink(__DIR__."/010.test.php"); @unlink(__DIR__."/010.test.txt"); ?> ---EXPECT-- +--EXPECT-- string(25) " string(10) "test hello" diff --git a/sapi/cli/tests/011.phpt b/sapi/cli/tests/011.phpt index 6154693517..1fbe93d703 100644 --- a/sapi/cli/tests/011.phpt +++ b/sapi/cli/tests/011.phpt @@ -46,7 +46,7 @@ var_dump(`"$php" -n -l $filename`); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(%d) "No syntax errors detected in %s011.test.php " string(40) "Could not open input file: some.unknown diff --git a/sapi/cli/tests/012.phpt b/sapi/cli/tests/012.phpt index 90527143e5..08ec4ecb1c 100644 --- a/sapi/cli/tests/012.phpt +++ b/sapi/cli/tests/012.phpt @@ -18,7 +18,7 @@ var_dump(`"$php" -n -r '' -r ''`); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(32) "You can use -R or -F only once. " string(32) "You can use -R or -F only once. diff --git a/sapi/cli/tests/013.phpt b/sapi/cli/tests/013.phpt index af5a82ecd7..9e17c009c2 100644 --- a/sapi/cli/tests/013.phpt +++ b/sapi/cli/tests/013.phpt @@ -1,8 +1,8 @@ --TEST-- running PHP code before and after processing input lines with -B and -E --SKIPIF-- -<?php -include "skipif.inc"; +<?php +include "skipif.inc"; if (substr(PHP_OS, 0, 3) == 'WIN') { die ("skip not for Windows"); } @@ -23,7 +23,7 @@ var_dump(`cat "$filename_txt" | "$php" -n -B 'var_dump("start");' -E 'var_dump(" echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(18) "string(5) "start" " string(16) "string(3) "end" diff --git a/sapi/cli/tests/014.phpt b/sapi/cli/tests/014.phpt index 84c6d16204..1794d78b54 100644 --- a/sapi/cli/tests/014.phpt +++ b/sapi/cli/tests/014.phpt @@ -34,7 +34,7 @@ var_dump(`"$php" -n -s unknown`); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(1478) "<code><span style="color: #000000"> <br /><span style="color: #0000BB"><?php<br />$test </span><span style="color: #007700">= </span><span style="color: #DD0000">"var"</span><span style="color: #007700">; </span><span style="color: #FF8000">//var<br />/* test class */<br /></span><span style="color: #007700">class </span><span style="color: #0000BB">test </span><span style="color: #007700">{<br /> private </span><span style="color: #0000BB">$var </span><span style="color: #007700">= array();<br /><br /> public static function </span><span style="color: #0000BB">foo</span><span style="color: #007700">(</span><span style="color: #0000BB">Test $arg</span><span style="color: #007700">) {<br /> echo </span><span style="color: #DD0000">"hello"</span><span style="color: #007700">;<br /> </span><span style="color: #0000BB">var_dump</span><span style="color: #007700">(</span><span style="color: #0000BB">$this</span><span style="color: #007700">);<br /> }<br />}<br /><br /></span><span style="color: #0000BB">$o </span><span style="color: #007700">= new </span><span style="color: #0000BB">test</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">?><br /></span> </span> diff --git a/sapi/cli/tests/015.phpt b/sapi/cli/tests/015.phpt index 62a007b6e4..01f5328e99 100644 --- a/sapi/cli/tests/015.phpt +++ b/sapi/cli/tests/015.phpt @@ -1,8 +1,8 @@ --TEST-- CLI long options --SKIPIF-- -<?php -include "skipif.inc"; +<?php +include "skipif.inc"; if (substr(PHP_OS, 0, 3) == 'WIN') { die ("skip not for Windows"); } @@ -20,7 +20,7 @@ echo `"$php" -n --notexisting foo bar baz | grep Usage:`; echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- PHP %d.%d.%d%s(cli) (built: %s)%s Array ( diff --git a/sapi/cli/tests/016.phpt b/sapi/cli/tests/016.phpt index cbedb1e7ac..40f079e28d 100644 --- a/sapi/cli/tests/016.phpt +++ b/sapi/cli/tests/016.phpt @@ -1,8 +1,8 @@ --TEST-- CLI -a and readline --SKIPIF-- -<?php -include "skipif.inc"; +<?php +include "skipif.inc"; if (!extension_loaded('readline') || readline_info('done') === NULL) { die ("skip need readline support"); } diff --git a/sapi/cli/tests/017.phpt b/sapi/cli/tests/017.phpt index a19d0a6bd3..f3c3b60e8b 100644 --- a/sapi/cli/tests/017.phpt +++ b/sapi/cli/tests/017.phpt @@ -1,8 +1,8 @@ --TEST-- CLI -a and libedit --SKIPIF-- -<?php -include "skipif.inc"; +<?php +include "skipif.inc"; if (!extension_loaded('readline') || readline_info('done') !== NULL) { die ("skip need readline support using libedit"); } diff --git a/sapi/cli/tests/018.phpt b/sapi/cli/tests/018.phpt index 56921bd669..8d0e10bc0a 100644 --- a/sapi/cli/tests/018.phpt +++ b/sapi/cli/tests/018.phpt @@ -1,8 +1,8 @@ --TEST-- CLI php -m --SKIPIF-- -<?php -include "skipif.inc"; +<?php +include "skipif.inc"; if (substr(PHP_OS, 0, 3) == 'WIN') { die ("skip not for Windows"); } @@ -17,7 +17,7 @@ echo `"$php" -n -m`; echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- [PHP Modules] %a pcre diff --git a/sapi/cli/tests/019.phpt b/sapi/cli/tests/019.phpt index c98155d8d5..34a4714dd3 100644 --- a/sapi/cli/tests/019.phpt +++ b/sapi/cli/tests/019.phpt @@ -1,8 +1,8 @@ --TEST-- CLI php -i --SKIPIF-- -<?php -include "skipif.inc"; +<?php +include "skipif.inc"; if (substr(PHP_OS, 0, 3) == 'WIN') { die ("skip not for Windows"); } @@ -17,7 +17,7 @@ echo `"$php" -n -i`; echo "\nDone\n"; ?> ---EXPECTF-- +--EXPECTF-- phpinfo() PHP Version => %s %a diff --git a/sapi/cli/tests/020.phpt b/sapi/cli/tests/020.phpt index 62be4ba31a..c8ceb43d04 100644 --- a/sapi/cli/tests/020.phpt +++ b/sapi/cli/tests/020.phpt @@ -1,8 +1,8 @@ --TEST-- CLI php --ri --SKIPIF-- -<?php -include "skipif.inc"; +<?php +include "skipif.inc"; if (substr(PHP_OS, 0, 3) == 'WIN') { die ("skip not for Windows"); } diff --git a/sapi/cli/tests/021.phpt b/sapi/cli/tests/021.phpt index cd27715334..a5d97c326d 100644 --- a/sapi/cli/tests/021.phpt +++ b/sapi/cli/tests/021.phpt @@ -1,7 +1,7 @@ --TEST-- CLI shell shebang --SKIPIF-- -<?php +<?php include 'skipif.inc'; if (substr(PHP_OS, 0, 3) == 'WIN') { die ("skip not for Windows"); diff --git a/sapi/cli/tests/argv_mb.phpt b/sapi/cli/tests/argv_mb.phpt index 2a9d7a132a..3b7c6eac19 100644 --- a/sapi/cli/tests/argv_mb.phpt +++ b/sapi/cli/tests/argv_mb.phpt @@ -18,7 +18,7 @@ var_dump(`$php -n $argv_fl 多字节字符串 マルチバイト文字列 мно ?> ==DONE== ---EXPECTF-- +--EXPECTF-- string(%d) "array(%d) { [0]=> string(%d) "%sargv_test.php" diff --git a/sapi/cli/tests/bug43177.phpt b/sapi/cli/tests/bug43177.phpt index e475fb09b4..87dc8927ff 100644 --- a/sapi/cli/tests/bug43177.phpt +++ b/sapi/cli/tests/bug43177.phpt @@ -2,7 +2,7 @@ Bug #61977 Test exit code for various errors --SKIPIF-- <?php -include "skipif.inc"; +include "skipif.inc"; ?> --FILE-- <?php diff --git a/sapi/cli/tests/bug61977.phpt b/sapi/cli/tests/bug61977.phpt index b23f0e28f6..1b29dea31b 100644 --- a/sapi/cli/tests/bug61977.phpt +++ b/sapi/cli/tests/bug61977.phpt @@ -2,7 +2,7 @@ Bug #61977 test CLI web-server support for Mime Type File extensions mapping --SKIPIF-- <?php -include "skipif.inc"; +include "skipif.inc"; ?> --FILE-- <?php diff --git a/sapi/cli/tests/bug65066_100.phpt b/sapi/cli/tests/bug65066_100.phpt index 34381d8e96..4203b7444c 100644 --- a/sapi/cli/tests/bug65066_100.phpt +++ b/sapi/cli/tests/bug65066_100.phpt @@ -4,7 +4,7 @@ Bug #65066 (Cli server not responsive when responding with 422 http status code) allow_url_fopen=1 --SKIPIF-- <?php -include "skipif.inc"; +include "skipif.inc"; ?> --FILE-- <?php diff --git a/sapi/cli/tests/bug65066_422.phpt b/sapi/cli/tests/bug65066_422.phpt index f25ddfbca6..e8b497e923 100644 --- a/sapi/cli/tests/bug65066_422.phpt +++ b/sapi/cli/tests/bug65066_422.phpt @@ -4,7 +4,7 @@ Bug #65066 (Cli server not responsive when responding with 422 http status code) allow_url_fopen=1 --SKIPIF-- <?php -include "skipif.inc"; +include "skipif.inc"; ?> --FILE-- <?php diff --git a/sapi/cli/tests/bug65066_511.phpt b/sapi/cli/tests/bug65066_511.phpt index 27c9f9755a..7e5548aadc 100644 --- a/sapi/cli/tests/bug65066_511.phpt +++ b/sapi/cli/tests/bug65066_511.phpt @@ -4,7 +4,7 @@ Bug #65066 (Cli server not responsive when responding with 422 http status code) allow_url_fopen=1 --SKIPIF-- <?php -include "skipif.inc"; +include "skipif.inc"; ?> --FILE-- <?php diff --git a/sapi/cli/tests/bug66606_1.phpt b/sapi/cli/tests/bug66606_1.phpt index 3cda764e61..b58db6cfdd 100644 --- a/sapi/cli/tests/bug66606_1.phpt +++ b/sapi/cli/tests/bug66606_1.phpt @@ -4,7 +4,7 @@ Bug #66606 (Sets HTTP_CONTENT_TYPE but not CONTENT_TYPE) - GET request allow_url_fopen=1 --SKIPIF-- <?php -include "skipif.inc"; +include "skipif.inc"; ?> --FILE-- <?php @@ -12,6 +12,6 @@ include "php_cli_server.inc"; php_cli_server_start('var_dump($_SERVER["CONTENT_TYPE"], $_SERVER["CONTENT_LENGTH"])'); echo file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS); ?> ---EXPECT-- +--EXPECT-- NULL NULL diff --git a/sapi/cli/tests/bug66606_2.phpt b/sapi/cli/tests/bug66606_2.phpt index c47b7736c0..d8bd6162a4 100644 --- a/sapi/cli/tests/bug66606_2.phpt +++ b/sapi/cli/tests/bug66606_2.phpt @@ -4,7 +4,7 @@ Bug #66606 (Sets HTTP_CONTENT_TYPE but not CONTENT_TYPE) - POST request allow_url_fopen=1 --SKIPIF-- <?php -include "skipif.inc"; +include "skipif.inc"; ?> --FILE-- <?php @@ -35,7 +35,7 @@ HEADER fclose($fp); ?> ---EXPECTF-- +--EXPECTF-- HTTP/1.1 200 OK Host: %s Date: %s diff --git a/sapi/cli/tests/bug71005.phpt b/sapi/cli/tests/bug71005.phpt index f02f261fbf..6a163d4639 100644 --- a/sapi/cli/tests/bug71005.phpt +++ b/sapi/cli/tests/bug71005.phpt @@ -2,7 +2,7 @@ Bug #71005 (Segfault in php_cli_server_dispatch_router()) --SKIPIF-- <?php -include "skipif.inc"; +include "skipif.inc"; ?> --FILE-- <?php @@ -36,7 +36,7 @@ HEADER } ?> ---EXPECTF-- +--EXPECTF-- HTTP/1.1 200 OK Host: %s Date: %s diff --git a/sapi/cli/tests/php_cli_server_001.phpt b/sapi/cli/tests/php_cli_server_001.phpt index 3f1083e7ac..c2ed8ddff1 100644 --- a/sapi/cli/tests/php_cli_server_001.phpt +++ b/sapi/cli/tests/php_cli_server_001.phpt @@ -4,7 +4,7 @@ basic function allow_url_fopen=1 --SKIPIF-- <?php -include "skipif.inc"; +include "skipif.inc"; ?> --FILE-- <?php diff --git a/sapi/cli/tests/php_cli_server_002.phpt b/sapi/cli/tests/php_cli_server_002.phpt index 93151c15d4..e1fbd90398 100644 --- a/sapi/cli/tests/php_cli_server_002.phpt +++ b/sapi/cli/tests/php_cli_server_002.phpt @@ -4,7 +4,7 @@ $_SERVER variable allow_url_fopen=1 --SKIPIF-- <?php -include "skipif.inc"; +include "skipif.inc"; ?> --FILE-- <?php @@ -12,7 +12,7 @@ include "php_cli_server.inc"; php_cli_server_start('var_dump($_SERVER["DOCUMENT_ROOT"], $_SERVER["SERVER_SOFTWARE"], $_SERVER["SERVER_NAME"], $_SERVER["SERVER_PORT"]);'); var_dump(file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS)); ?> ---EXPECTF-- +--EXPECTF-- string(%d) "string(%d) "%stests" string(%d) "PHP %s Development Server" string(%d) "localhost" diff --git a/sapi/cli/tests/php_cli_server_003.phpt b/sapi/cli/tests/php_cli_server_003.phpt index d8fb8461be..f8aa94edf6 100644 --- a/sapi/cli/tests/php_cli_server_003.phpt +++ b/sapi/cli/tests/php_cli_server_003.phpt @@ -4,7 +4,7 @@ Bug #55726 (Changing the working directory makes router script inaccessible) allow_url_fopen=1 --SKIPIF-- <?php -include "skipif.inc"; +include "skipif.inc"; ?> --FILE-- <?php @@ -13,6 +13,6 @@ php_cli_server_start('chdir(__DIR__); echo "okey";'); var_dump(file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS)); var_dump(file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS)); ?> ---EXPECT-- +--EXPECT-- string(4) "okey" string(4) "okey" diff --git a/sapi/cli/tests/php_cli_server_004.phpt b/sapi/cli/tests/php_cli_server_004.phpt index 5e3bbec18f..9c93de3f92 100644 --- a/sapi/cli/tests/php_cli_server_004.phpt +++ b/sapi/cli/tests/php_cli_server_004.phpt @@ -4,7 +4,7 @@ Bug #55747 (request headers missed in $_SERVER) allow_url_fopen=1 --SKIPIF-- <?php -include "skipif.inc"; +include "skipif.inc"; ?> --FILE-- <?php @@ -35,7 +35,7 @@ HEADER } ?> ---EXPECTF-- +--EXPECTF-- HTTP/1.1 200 OK Host: %s Date: %s diff --git a/sapi/cli/tests/php_cli_server_005.phpt b/sapi/cli/tests/php_cli_server_005.phpt index 3f9078c8ae..f89245df11 100644 --- a/sapi/cli/tests/php_cli_server_005.phpt +++ b/sapi/cli/tests/php_cli_server_005.phpt @@ -2,7 +2,7 @@ Post a file --SKIPIF-- <?php -include "skipif.inc"; +include "skipif.inc"; ?> --FILE-- <?php @@ -47,7 +47,7 @@ HEADER } ?> ---EXPECTF-- +--EXPECTF-- HTTP/1.1 200 OK Host: %s Date: %s diff --git a/sapi/cli/tests/php_cli_server_006.phpt b/sapi/cli/tests/php_cli_server_006.phpt index c68f1e51b0..ee851b0edd 100644 --- a/sapi/cli/tests/php_cli_server_006.phpt +++ b/sapi/cli/tests/php_cli_server_006.phpt @@ -2,7 +2,7 @@ Bug #55755 (SegFault when outputting header WWW-Authenticate) --SKIPIF-- <?php -include "skipif.inc"; +include "skipif.inc"; ?> --FILE-- <?php @@ -31,7 +31,7 @@ HEADER } ?> ---EXPECTF-- +--EXPECTF-- HTTP/1.1 200 OK Host: %s Date: %s diff --git a/sapi/cli/tests/php_cli_server_007.phpt b/sapi/cli/tests/php_cli_server_007.phpt index b588b9ee2e..3e8fc5f48d 100644 --- a/sapi/cli/tests/php_cli_server_007.phpt +++ b/sapi/cli/tests/php_cli_server_007.phpt @@ -2,7 +2,7 @@ Bug #55758 (Digest Authenticate missed in 5.4) --SKIPIF-- <?php -include "skipif.inc"; +include "skipif.inc"; ?> --FILE-- <?php @@ -31,7 +31,7 @@ HEADER } ?> ---EXPECTF-- +--EXPECTF-- HTTP/1.1 401 Unauthorized Host: %s Date: %s diff --git a/sapi/cli/tests/php_cli_server_008.phpt b/sapi/cli/tests/php_cli_server_008.phpt index 58b2485db5..2d9955c031 100644 --- a/sapi/cli/tests/php_cli_server_008.phpt +++ b/sapi/cli/tests/php_cli_server_008.phpt @@ -2,7 +2,7 @@ SERVER_PROTOCOL header availability --SKIPIF-- <?php -include "skipif.inc"; +include "skipif.inc"; ?> --FILE-- <?php diff --git a/sapi/cli/tests/php_cli_server_009.phpt b/sapi/cli/tests/php_cli_server_009.phpt index d63c6abf28..cb4a14cb08 100644 --- a/sapi/cli/tests/php_cli_server_009.phpt +++ b/sapi/cli/tests/php_cli_server_009.phpt @@ -5,7 +5,7 @@ After this fix(#60112), previously 404 request like "localhost/foo/bar" now could serve correctly with request_uri "index.php" and PATH_INFO "/foo/bar/" --SKIPIF-- <?php -include "skipif.inc"; +include "skipif.inc"; ?> --FILE-- <?php diff --git a/sapi/cli/tests/php_cli_server_010.phpt b/sapi/cli/tests/php_cli_server_010.phpt index fe8f1a98ca..22cf3de344 100644 --- a/sapi/cli/tests/php_cli_server_010.phpt +++ b/sapi/cli/tests/php_cli_server_010.phpt @@ -2,7 +2,7 @@ Bug #60180 ($_SERVER["PHP_SELF"] incorrect) --SKIPIF-- <?php -include "skipif.inc"; +include "skipif.inc"; ?> --FILE-- <?php diff --git a/sapi/cli/tests/php_cli_server_012.phpt b/sapi/cli/tests/php_cli_server_012.phpt index 10b9cdbfe9..d60d71b02a 100644 --- a/sapi/cli/tests/php_cli_server_012.phpt +++ b/sapi/cli/tests/php_cli_server_012.phpt @@ -2,7 +2,7 @@ Bug #60159 (Router returns false, but POST is not passed to requested resource) --SKIPIF-- <?php -include "skipif.inc"; +include "skipif.inc"; ?> --FILE-- <?php diff --git a/sapi/cli/tests/php_cli_server_013.phpt b/sapi/cli/tests/php_cli_server_013.phpt index 23269580fb..cfed0c5531 100644 --- a/sapi/cli/tests/php_cli_server_013.phpt +++ b/sapi/cli/tests/php_cli_server_013.phpt @@ -2,7 +2,7 @@ No router, no script --SKIPIF-- <?php -include "skipif.inc"; +include "skipif.inc"; ?> --FILE-- <?php diff --git a/sapi/cli/tests/php_cli_server_014.phpt b/sapi/cli/tests/php_cli_server_014.phpt index f308ffb226..7210321925 100644 --- a/sapi/cli/tests/php_cli_server_014.phpt +++ b/sapi/cli/tests/php_cli_server_014.phpt @@ -2,7 +2,7 @@ Bug #60477: Segfault after two multipart/form-data POST requestes --SKIPIF-- <?php -include "skipif.inc"; +include "skipif.inc"; ?> --FILE-- <?php diff --git a/sapi/cli/tests/php_cli_server_015.phpt b/sapi/cli/tests/php_cli_server_015.phpt index 663268aea6..42000adbb9 100644 --- a/sapi/cli/tests/php_cli_server_015.phpt +++ b/sapi/cli/tests/php_cli_server_015.phpt @@ -2,7 +2,7 @@ Bug #60523 (PHP Errors are not reported in browsers using built-in SAPI) --SKIPIF-- <?php -include "skipif.inc"; +include "skipif.inc"; ?> --INI-- display_errors=1 diff --git a/sapi/cli/tests/php_cli_server_016.phpt b/sapi/cli/tests/php_cli_server_016.phpt index 513d7ec027..ae1d3f272a 100644 --- a/sapi/cli/tests/php_cli_server_016.phpt +++ b/sapi/cli/tests/php_cli_server_016.phpt @@ -5,7 +5,7 @@ this is an indirect test for bug 60591, since mem leak is reproted in the server and require php compiled with --enable-debug --SKIPIF-- <?php -include "skipif.inc"; +include "skipif.inc"; ?> --FILE-- <?php diff --git a/sapi/cli/tests/php_cli_server_017.phpt b/sapi/cli/tests/php_cli_server_017.phpt index 28876dc52b..067d504800 100644 --- a/sapi/cli/tests/php_cli_server_017.phpt +++ b/sapi/cli/tests/php_cli_server_017.phpt @@ -2,7 +2,7 @@ Implement Req #60850 (Built in web server does not set $_SERVER['SCRIPT_FILENAME'] when using router) --SKIPIF-- <?php -include "skipif.inc"; +include "skipif.inc"; ?> --FILE-- <?php diff --git a/sapi/cli/tests/php_cli_server_020.phpt b/sapi/cli/tests/php_cli_server_020.phpt index 766c666911..23a8bc40e1 100644 --- a/sapi/cli/tests/php_cli_server_020.phpt +++ b/sapi/cli/tests/php_cli_server_020.phpt @@ -2,7 +2,7 @@ Use SEARCH as a HTTP verb --SKIPIF-- <?php -include "skipif.inc"; +include "skipif.inc"; ?> --FILE-- <?php @@ -30,7 +30,7 @@ HEADER } ?> ---EXPECTF-- +--EXPECTF-- HTTP/1.1 200 OK Host: %s Date: %s diff --git a/sapi/fpm/tests/getallheaders.phpt b/sapi/fpm/tests/getallheaders.phpt index b41f1c6687..b1f9683788 100644 --- a/sapi/fpm/tests/getallheaders.phpt +++ b/sapi/fpm/tests/getallheaders.phpt @@ -31,7 +31,7 @@ $tester = new FPM\Tester($cfg, $code); $tester->start(); $tester->expectLogStartNotices(); $tester->request( - '', + '', [ 'HTTP_X_FOO' => 'BAR', 'HTTP_FOO' => 'foo' diff --git a/sapi/phpdbg/tests/finish_leave_001.phpt b/sapi/phpdbg/tests/finish_leave_001.phpt index e345752b00..cac771fd2f 100644 --- a/sapi/phpdbg/tests/finish_leave_001.phpt +++ b/sapi/phpdbg/tests/finish_leave_001.phpt @@ -32,7 +32,7 @@ prompt> <?php function foo() { $other = bar(); - + return ["hello", $other]; } diff --git a/sapi/tests/test006.phpt b/sapi/tests/test006.phpt index 16d1b2b840..d3cd74e7da 100644 --- a/sapi/tests/test006.phpt +++ b/sapi/tests/test006.phpt @@ -45,7 +45,7 @@ phpinfo(); -----------------------------240723202011929-- --FILE-- -<?php +<?php error_reporting(0); print_r($_POST); print_r($_FILES); diff --git a/sapi/tests/test007.phpt b/sapi/tests/test007.phpt index 8c50e4b80f..84d9bdb89a 100644 --- a/sapi/tests/test007.phpt +++ b/sapi/tests/test007.phpt @@ -40,7 +40,7 @@ phpinfo(); -----------------------------240723202011929-- --FILE-- -<?php +<?php print @$_POST['choices']; ?> --EXPECT-- diff --git a/tests/basic/003.phpt b/tests/basic/003.phpt index 43d3be1d9e..fb906e051d 100644 --- a/tests/basic/003.phpt +++ b/tests/basic/003.phpt @@ -5,7 +5,7 @@ a=Hello+World --GET-- b=Hello+Again+World&c=Hi+Mom --FILE-- -<?php +<?php error_reporting(0); echo "post-a=({$_POST['a']}) get-b=({$_GET['b']}) get-c=({$_GET['c']})"?> --EXPECT-- diff --git a/tests/basic/004.phpt b/tests/basic/004.phpt index c381e5009f..4225c105b5 100644 --- a/tests/basic/004.phpt +++ b/tests/basic/004.phpt @@ -3,7 +3,7 @@ Two variables in POST data --POST-- a=Hello+World&b=Hello+Again+World --FILE-- -<?php +<?php error_reporting(0); echo "{$_POST['a']} {$_POST['b']}" ?> --EXPECT-- diff --git a/tests/basic/005.phpt b/tests/basic/005.phpt index 742e0ca4b1..230ba42bb1 100644 --- a/tests/basic/005.phpt +++ b/tests/basic/005.phpt @@ -3,7 +3,7 @@ Three variables in POST data --POST-- a=Hello+World&b=Hello+Again+World&c=1 --FILE-- -<?php +<?php error_reporting(0); echo "{$_POST['a']} {$_POST['b']} {$_POST['c']}"?> --EXPECT-- diff --git a/tests/basic/011.phpt b/tests/basic/011.phpt index 79256746fe..b5c769d9bd 100644 --- a/tests/basic/011.phpt +++ b/tests/basic/011.phpt @@ -5,7 +5,7 @@ register_argc_argv=1 --GET-- ab+cd+ef+123+test --FILE-- -<?php +<?php $argc = $_SERVER['argc']; $argv = $_SERVER['argv']; diff --git a/tests/basic/012.phpt b/tests/basic/012.phpt index 5c10c7c222..038d4beff9 100644 --- a/tests/basic/012.phpt +++ b/tests/basic/012.phpt @@ -8,7 +8,7 @@ variables_order=GPS --ARGS-- ab cd ef 123 test --FILE-- -<?php +<?php $argc = $_SERVER['argc']; $argv = $_SERVER['argv']; diff --git a/tests/basic/013.phpt b/tests/basic/013.phpt index 376cc06dd4..0cd81a7185 100644 --- a/tests/basic/013.phpt +++ b/tests/basic/013.phpt @@ -4,7 +4,7 @@ POST Method test and arrays a[]=1 --FILE-- <?php -var_dump($_POST['a']); +var_dump($_POST['a']); ?> --EXPECT-- array(1) { diff --git a/tests/basic/014.phpt b/tests/basic/014.phpt index 7288c44a92..1282aad3e4 100644 --- a/tests/basic/014.phpt +++ b/tests/basic/014.phpt @@ -4,7 +4,7 @@ POST Method test and arrays - 2 a[]=1&a[]=1 --FILE-- <?php -var_dump($_POST['a']); +var_dump($_POST['a']); ?> --EXPECT-- array(2) { diff --git a/tests/basic/015.phpt b/tests/basic/015.phpt index eecbaf1302..41a6713ae5 100644 --- a/tests/basic/015.phpt +++ b/tests/basic/015.phpt @@ -4,7 +4,7 @@ POST Method test and arrays - 3 a[]=1&a[0]=5 --FILE-- <?php -var_dump($_POST['a']); +var_dump($_POST['a']); ?> --EXPECT-- array(1) { diff --git a/tests/basic/016.phpt b/tests/basic/016.phpt index b34fd1b1dc..f7b301d84e 100644 --- a/tests/basic/016.phpt +++ b/tests/basic/016.phpt @@ -4,7 +4,7 @@ POST Method test and arrays - 4 a[a]=1&a[b]=3 --FILE-- <?php -var_dump($_POST['a']); +var_dump($_POST['a']); ?> --EXPECT-- array(2) { diff --git a/tests/basic/017.phpt b/tests/basic/017.phpt index d514726d18..b7595ff2e1 100644 --- a/tests/basic/017.phpt +++ b/tests/basic/017.phpt @@ -4,7 +4,7 @@ POST Method test and arrays - 5 a[]=1&a[a]=1&a[b]=3 --FILE-- <?php -var_dump($_POST['a']); +var_dump($_POST['a']); ?> --EXPECT-- array(3) { diff --git a/tests/basic/018.phpt b/tests/basic/018.phpt index 45996b2fe3..5617adeec8 100644 --- a/tests/basic/018.phpt +++ b/tests/basic/018.phpt @@ -4,8 +4,8 @@ POST Method test and arrays - 6 a[][]=1&a[][]=3&b[a][b][c]=1&b[a][b][d]=1 --FILE-- <?php -var_dump($_POST['a']); -var_dump($_POST['b']); +var_dump($_POST['a']); +var_dump($_POST['b']); ?> --EXPECT-- array(2) { diff --git a/tests/basic/019.phpt b/tests/basic/019.phpt index 3bece247a0..3c13b79801 100644 --- a/tests/basic/019.phpt +++ b/tests/basic/019.phpt @@ -4,7 +4,7 @@ POST Method test and arrays - 7 a[]=1&a[]]=3&a[[]=4 --FILE-- <?php -var_dump($_POST['a']); +var_dump($_POST['a']); ?> --EXPECT-- array(3) { diff --git a/tests/basic/020.phpt b/tests/basic/020.phpt index c94a60407b..26430ef672 100644 --- a/tests/basic/020.phpt +++ b/tests/basic/020.phpt @@ -4,7 +4,7 @@ POST Method test and arrays - 8 a[a[]]=1&a[b[]]=3 --FILE-- <?php -var_dump($_POST['a']); +var_dump($_POST['a']); ?> --EXPECT-- array(2) { diff --git a/tests/basic/bug67198.phpt b/tests/basic/bug67198.phpt index 9e2e224509..4c2322b6de 100644 --- a/tests/basic/bug67198.phpt +++ b/tests/basic/bug67198.phpt @@ -4,7 +4,7 @@ php://input is empty when enable_post_data_reading=Off allow_url_fopen=1 --SKIPIF-- <?php -include __DIR__."/../../sapi/cli/tests/skipif.inc"; +include __DIR__."/../../sapi/cli/tests/skipif.inc"; ?> --FILE-- <?php diff --git a/tests/basic/timeout_variation_0.phpt b/tests/basic/timeout_variation_0.phpt index 4b39ae31dd..adc8e6b7cf 100644 --- a/tests/basic/timeout_variation_0.phpt +++ b/tests/basic/timeout_variation_0.phpt @@ -1,7 +1,7 @@ --TEST-- Timeout within while loop --SKIPIF-- -<?php +<?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); ?> --FILE-- @@ -11,7 +11,7 @@ include dirname(__FILE__) . DIRECTORY_SEPARATOR . "timeout_config.inc"; set_time_limit($t); -while (1) { +while (1) { busy_wait(1); } diff --git a/tests/basic/timeout_variation_1.phpt b/tests/basic/timeout_variation_1.phpt index 28699dcbc4..51568a7492 100644 --- a/tests/basic/timeout_variation_1.phpt +++ b/tests/basic/timeout_variation_1.phpt @@ -1,7 +1,7 @@ --TEST-- Timeout within function --SKIPIF-- -<?php +<?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); ?> --FILE-- @@ -11,8 +11,8 @@ include dirname(__FILE__) . DIRECTORY_SEPARATOR . "timeout_config.inc"; set_time_limit($t); -function hello ($t) { - echo "call"; +function hello ($t) { + echo "call"; busy_wait($t*2); } diff --git a/tests/basic/timeout_variation_10.phpt b/tests/basic/timeout_variation_10.phpt index 373be27b3d..030deaf389 100644 --- a/tests/basic/timeout_variation_10.phpt +++ b/tests/basic/timeout_variation_10.phpt @@ -1,7 +1,7 @@ --TEST-- Timeout within shutdown function, variation --SKIPIF-- -<?php +<?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); ?> --FILE-- diff --git a/tests/basic/timeout_variation_2.phpt b/tests/basic/timeout_variation_2.phpt index 5a549500cf..24574e9c5f 100644 --- a/tests/basic/timeout_variation_2.phpt +++ b/tests/basic/timeout_variation_2.phpt @@ -1,7 +1,7 @@ --TEST-- Timeout within array_walk --SKIPIF-- -<?php +<?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); ?> --FILE-- @@ -12,7 +12,7 @@ include dirname(__FILE__) . DIRECTORY_SEPARATOR . "timeout_config.inc"; set_time_limit($t); function cb(&$i, $k, $p) -{ +{ busy_wait(1); } diff --git a/tests/basic/timeout_variation_3.phpt b/tests/basic/timeout_variation_3.phpt index 1dc169c67b..795ad6505d 100644 --- a/tests/basic/timeout_variation_3.phpt +++ b/tests/basic/timeout_variation_3.phpt @@ -1,7 +1,7 @@ --TEST-- Timeout within eval --SKIPIF-- -<?php +<?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); ?> --FILE-- @@ -11,8 +11,8 @@ include dirname(__FILE__) . DIRECTORY_SEPARATOR . "timeout_config.inc"; set_time_limit($t); -function hello ($t) { - echo "call", PHP_EOL; +function hello ($t) { + echo "call", PHP_EOL; busy_wait($t*2); } diff --git a/tests/basic/timeout_variation_4.phpt b/tests/basic/timeout_variation_4.phpt index 19ebf585a9..7a334fd544 100644 --- a/tests/basic/timeout_variation_4.phpt +++ b/tests/basic/timeout_variation_4.phpt @@ -1,7 +1,7 @@ --TEST-- Timeout within call_user_func --SKIPIF-- -<?php +<?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); ?> --FILE-- @@ -11,8 +11,8 @@ include dirname(__FILE__) . DIRECTORY_SEPARATOR . "timeout_config.inc"; set_time_limit($t); -function hello ($t) { - echo "call", PHP_EOL; +function hello ($t) { + echo "call", PHP_EOL; busy_wait($t*2); } diff --git a/tests/basic/timeout_variation_5.phpt b/tests/basic/timeout_variation_5.phpt index 1c28c00ac9..c3b71e89ab 100644 --- a/tests/basic/timeout_variation_5.phpt +++ b/tests/basic/timeout_variation_5.phpt @@ -1,7 +1,7 @@ --TEST-- Timeout within function containing exception --SKIPIF-- -<?php +<?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); ?> --FILE-- @@ -11,7 +11,7 @@ include dirname(__FILE__) . DIRECTORY_SEPARATOR . "timeout_config.inc"; set_time_limit($t); -function f($t) { +function f($t) { echo "call"; busy_wait($t*2); throw new Exception("never reached here"); diff --git a/tests/basic/timeout_variation_6.phpt b/tests/basic/timeout_variation_6.phpt index fb3c3a7aca..c172625f5d 100644 --- a/tests/basic/timeout_variation_6.phpt +++ b/tests/basic/timeout_variation_6.phpt @@ -1,7 +1,7 @@ --TEST-- Timeout within function trowing exception before timeout reached --SKIPIF-- -<?php +<?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); ?> --FILE-- @@ -11,7 +11,7 @@ include dirname(__FILE__) . DIRECTORY_SEPARATOR . "timeout_config.inc"; set_time_limit($t); -function f($t) { +function f($t) { echo "call"; busy_wait($t-1); throw new Exception("exception before timeout"); diff --git a/tests/basic/timeout_variation_7.phpt b/tests/basic/timeout_variation_7.phpt index e642a33a4e..df8f897550 100644 --- a/tests/basic/timeout_variation_7.phpt +++ b/tests/basic/timeout_variation_7.phpt @@ -1,7 +1,7 @@ --TEST-- Timeout within for loop --SKIPIF-- -<?php +<?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); ?> --FILE-- @@ -11,7 +11,7 @@ include dirname(__FILE__) . DIRECTORY_SEPARATOR . "timeout_config.inc"; set_time_limit($t); -for ($i = 0; $i < 42; $i++) { +for ($i = 0; $i < 42; $i++) { busy_wait(1); } diff --git a/tests/basic/timeout_variation_8.phpt b/tests/basic/timeout_variation_8.phpt index 15c9777f2c..d0a8861700 100644 --- a/tests/basic/timeout_variation_8.phpt +++ b/tests/basic/timeout_variation_8.phpt @@ -1,7 +1,7 @@ --TEST-- Timeout within foreach loop --SKIPIF-- -<?php +<?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); ?> --FILE-- @@ -11,7 +11,7 @@ include dirname(__FILE__) . DIRECTORY_SEPARATOR . "timeout_config.inc"; set_time_limit($t); -foreach (range(0, 42) as $i) { +foreach (range(0, 42) as $i) { busy_wait(1); } diff --git a/tests/basic/timeout_variation_9.phpt b/tests/basic/timeout_variation_9.phpt index 133fdf6daa..390d29b0c0 100644 --- a/tests/basic/timeout_variation_9.phpt +++ b/tests/basic/timeout_variation_9.phpt @@ -1,7 +1,7 @@ --TEST-- Timeout within shutdown function --SKIPIF-- -<?php +<?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); ?> --FILE-- diff --git a/tests/classes/__call_001.phpt b/tests/classes/__call_001.phpt index be2d0248cc..a70041ae16 100644 --- a/tests/classes/__call_001.phpt +++ b/tests/classes/__call_001.phpt @@ -5,7 +5,7 @@ ZE2 __call() class Caller { public $x = array(1, 2, 3); - + function __call($m, $a) { echo "Method $m called:\n"; var_dump($a); diff --git a/tests/classes/__call_003.phpt b/tests/classes/__call_003.phpt index 9ecc0701f0..c80801f7cf 100644 --- a/tests/classes/__call_003.phpt +++ b/tests/classes/__call_003.phpt @@ -9,16 +9,16 @@ Force pass-by-reference to __call $values[0][0] = 'changed'; } } - + $a = array('original'); - + $b = array('original'); $hack =& $b[0]; - + $c = new C; $c->f($a); $c->f($b); - + var_dump($a, $b); ?> --EXPECT-- diff --git a/tests/classes/__call_004.phpt b/tests/classes/__call_004.phpt index a9997bf132..ca980c65f0 100644 --- a/tests/classes/__call_004.phpt +++ b/tests/classes/__call_004.phpt @@ -14,7 +14,7 @@ class B extends A { echo "In " . __METHOD__ . "($strMethod, array(" . implode(',',$arrArgs) . "))\n"; var_dump($this); } - + function test() { A::test1(1,'a'); B::test2(1,'a'); diff --git a/tests/classes/__set__get_001.phpt b/tests/classes/__set__get_001.phpt index 3c9cb09b4a..244119a2d0 100644 --- a/tests/classes/__set__get_001.phpt +++ b/tests/classes/__set__get_001.phpt @@ -13,7 +13,7 @@ class setter { $r = $this->x[$nm]; echo "Returning: $r\n"; return $r; - } + } else { echo "Nothing!\n"; } @@ -21,11 +21,11 @@ class setter { function __set($nm, $val) { echo "Setting [$nm] to $val\n"; - + if (isset($this->x[$nm])) { $this->x[$nm] = $val; echo "OK!\n"; - } + } else { echo "Not OK!\n"; } @@ -42,7 +42,7 @@ $foo->a = 100; $foo->a++; $foo->z++; var_dump($foo); - + ?> --EXPECTF-- Setting [a] to 100 diff --git a/tests/classes/__set__get_004.phpt b/tests/classes/__set__get_004.phpt index 86fc094f87..004edc973a 100644 --- a/tests/classes/__set__get_004.phpt +++ b/tests/classes/__set__get_004.phpt @@ -8,7 +8,7 @@ class Test { function __get($name) { if (isset($this->x[$name])) { return $this->x[$name]; - } + } else { return NULL; diff --git a/tests/classes/__set__get_005.phpt b/tests/classes/__set__get_005.phpt index fd23cf6276..68cfb39df3 100644 --- a/tests/classes/__set__get_005.phpt +++ b/tests/classes/__set__get_005.phpt @@ -10,7 +10,7 @@ class Test echo __METHOD__ . "\n"; if (isset($this->x[$name])) { return $this->x[$name]; - } + } else { return NULL; diff --git a/tests/classes/__set_data_corrupt.phpt b/tests/classes/__set_data_corrupt.phpt index 8b51302ab3..4adf569978 100644 --- a/tests/classes/__set_data_corrupt.phpt +++ b/tests/classes/__set_data_corrupt.phpt @@ -6,7 +6,7 @@ $f = 'c="foo"'; class foo { const foobar=1; public $pp = array('t'=>null); - + function bar() { echo $this->t ='f'; } diff --git a/tests/classes/abstract_by_interface_001.phpt b/tests/classes/abstract_by_interface_001.phpt index 7565fdf45f..4a746d0d22 100644 --- a/tests/classes/abstract_by_interface_001.phpt +++ b/tests/classes/abstract_by_interface_001.phpt @@ -16,7 +16,7 @@ abstract class Derived extends Root implements MyInterface { class Leaf extends Derived { - function MyInterfaceFunc() {} + function MyInterfaceFunc() {} } var_dump(new Leaf); diff --git a/tests/classes/abstract_by_interface_002.phpt b/tests/classes/abstract_by_interface_002.phpt index 77c5619dfe..a05660b5b9 100644 --- a/tests/classes/abstract_by_interface_002.phpt +++ b/tests/classes/abstract_by_interface_002.phpt @@ -16,7 +16,7 @@ abstract class Derived extends Root implements MyInterface { class Leaf extends Derived { - static function MyInterfaceFunc() {} + static function MyInterfaceFunc() {} } var_dump(new Leaf); diff --git a/tests/classes/array_access_005.phpt b/tests/classes/array_access_005.phpt index dcb873ff56..92ddeccaf2 100644 --- a/tests/classes/array_access_005.phpt +++ b/tests/classes/array_access_005.phpt @@ -1,11 +1,11 @@ --TEST-- ZE2 ArrayAccess and sub Arrays --FILE-- -<?php +<?php class Peoples implements ArrayAccess { public $person; - + function __construct() { $this->person = array(array('name'=>'Joe')); } diff --git a/tests/classes/array_access_006.phpt b/tests/classes/array_access_006.phpt index 342a7e5107..babc808cb4 100644 --- a/tests/classes/array_access_006.phpt +++ b/tests/classes/array_access_006.phpt @@ -1,11 +1,11 @@ --TEST-- ZE2 ArrayAccess and ASSIGN_OP operators (+=) --FILE-- -<?php +<?php class OverloadedArray implements ArrayAccess { public $realArray; - + function __construct() { $this->realArray = array(1,2,3); } diff --git a/tests/classes/array_access_007.phpt b/tests/classes/array_access_007.phpt index 42187fe5d5..801c8e846c 100644 --- a/tests/classes/array_access_007.phpt +++ b/tests/classes/array_access_007.phpt @@ -1,11 +1,11 @@ --TEST-- ZE2 ArrayAccess and [] assignment --FILE-- -<?php +<?php class OverloadedArray implements ArrayAccess { public $realArray; - + function __construct() { $this->realArray = array(); } diff --git a/tests/classes/array_access_008.phpt b/tests/classes/array_access_008.phpt index 9979889174..0bb793b2b3 100644 --- a/tests/classes/array_access_008.phpt +++ b/tests/classes/array_access_008.phpt @@ -1,11 +1,11 @@ --TEST-- -ZE2 ArrayAccess and ASSIGN_OP operators (.=) +ZE2 ArrayAccess and ASSIGN_OP operators (.=) --FILE-- -<?php +<?php class Peoples implements ArrayAccess { public $person; - + function __construct() { $this->person = array(array('name'=>'Foo')); } diff --git a/tests/classes/array_access_009.phpt b/tests/classes/array_access_009.phpt index 3862240261..7da9084d24 100644 --- a/tests/classes/array_access_009.phpt +++ b/tests/classes/array_access_009.phpt @@ -1,7 +1,7 @@ --TEST-- ZE2 ArrayAccess and ArrayProxyAccess, ArrayProxy --FILE-- -<?php +<?php // NOTE: This will become part of SPL @@ -16,7 +16,7 @@ class ArrayProxy implements ArrayAccess { private $object; private $element; - + function __construct(ArrayProxyAccess $object, $element) { echo __METHOD__ . "($element)\n"; @@ -53,7 +53,7 @@ class ArrayProxy implements ArrayAccess class Peoples implements ArrayProxyAccess { public $person; - + function __construct() { $this->person = array(array('name'=>'Foo')); @@ -88,7 +88,7 @@ class Peoples implements ArrayProxyAccess { $this->person[$element][$index] = $value; } - + function proxyUnset($element, $index) { unset($this->person[$element][$index]); diff --git a/tests/classes/array_access_010.phpt b/tests/classes/array_access_010.phpt index ad374d278c..3df64fcc7e 100644 --- a/tests/classes/array_access_010.phpt +++ b/tests/classes/array_access_010.phpt @@ -1,7 +1,7 @@ --TEST-- ZE2 ArrayAccess and ArrayReferenceProxy with references --FILE-- -<?php +<?php // NOTE: This will become part of SPL @@ -9,7 +9,7 @@ class ArrayReferenceProxy implements ArrayAccess { private $object; private $element; - + function __construct(ArrayAccess $object, array &$element) { echo __METHOD__ . "(Array)\n"; @@ -41,7 +41,7 @@ class ArrayReferenceProxy implements ArrayAccess class Peoples implements ArrayAccess { public $person; - + function __construct() { $this->person = array(array('name'=>'Foo')); diff --git a/tests/classes/array_access_011.phpt b/tests/classes/array_access_011.phpt index aa20a56d39..36269c0b41 100644 --- a/tests/classes/array_access_011.phpt +++ b/tests/classes/array_access_011.phpt @@ -1,7 +1,7 @@ --TEST-- ZE2 ArrayAccess and ArrayAccessReferenceProxy with references to main array --FILE-- -<?php +<?php // NOTE: This will become part of SPL @@ -10,7 +10,7 @@ class ArrayAccessReferenceProxy implements ArrayAccess private $object; private $oarray; private $element; - + function __construct(ArrayAccess $object, array &$array, $element) { echo __METHOD__ . "($element)\n"; @@ -43,7 +43,7 @@ class ArrayAccessReferenceProxy implements ArrayAccess class Peoples implements ArrayAccess { public $person; - + function __construct() { $this->person = array(array('name'=>'Foo')); diff --git a/tests/classes/assign_op_property_001.phpt b/tests/classes/assign_op_property_001.phpt index 21e131cfa4..cd5fcff469 100644 --- a/tests/classes/assign_op_property_001.phpt +++ b/tests/classes/assign_op_property_001.phpt @@ -1,11 +1,11 @@ --TEST-- ZE2 assign_op property of overloaded object --FILE-- -<?php +<?php class Test { private $real_a = 2; - + function __set($property, $value) { if ($property == "a") { $this->real_a = $value; diff --git a/tests/classes/autoload_001.phpt b/tests/classes/autoload_001.phpt index 01115f4888..56e22f5e4a 100644 --- a/tests/classes/autoload_001.phpt +++ b/tests/classes/autoload_001.phpt @@ -1,7 +1,7 @@ --TEST-- ZE2 Autoload and class_exists --SKIPIF-- -<?php +<?php if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); ?> --FILE-- diff --git a/tests/classes/autoload_002.phpt b/tests/classes/autoload_002.phpt index 7f5aa6c9cc..0df897495f 100644 --- a/tests/classes/autoload_002.phpt +++ b/tests/classes/autoload_002.phpt @@ -1,7 +1,7 @@ --TEST-- ZE2 Autoload and get_class_methods --SKIPIF-- -<?php +<?php if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); ?> --FILE-- diff --git a/tests/classes/autoload_003.phpt b/tests/classes/autoload_003.phpt index 783dd504e2..2f173d80ab 100644 --- a/tests/classes/autoload_003.phpt +++ b/tests/classes/autoload_003.phpt @@ -1,7 +1,7 @@ --TEST-- ZE2 Autoload and derived classes --SKIPIF-- -<?php +<?php if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); ?> --FILE-- diff --git a/tests/classes/autoload_004.phpt b/tests/classes/autoload_004.phpt index c6ce400c36..2a71a893d9 100644 --- a/tests/classes/autoload_004.phpt +++ b/tests/classes/autoload_004.phpt @@ -1,7 +1,7 @@ --TEST-- ZE2 Autoload and recursion --SKIPIF-- -<?php +<?php if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); ?> --FILE-- diff --git a/tests/classes/autoload_005.phpt b/tests/classes/autoload_005.phpt index a04ea0eccf..622e1fdee4 100644 --- a/tests/classes/autoload_005.phpt +++ b/tests/classes/autoload_005.phpt @@ -1,7 +1,7 @@ --TEST-- ZE2 Autoload from destructor --SKIPIF-- -<?php +<?php if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); ?> --FILE-- diff --git a/tests/classes/autoload_006.phpt b/tests/classes/autoload_006.phpt index 127de880ab..a7afb3b904 100644 --- a/tests/classes/autoload_006.phpt +++ b/tests/classes/autoload_006.phpt @@ -1,7 +1,7 @@ --TEST-- ZE2 Autoload from destructor --SKIPIF-- -<?php +<?php if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); ?> --FILE-- diff --git a/tests/classes/autoload_018.phpt b/tests/classes/autoload_018.phpt index 53792d6f6b..4a21fad338 100644 --- a/tests/classes/autoload_018.phpt +++ b/tests/classes/autoload_018.phpt @@ -4,15 +4,15 @@ Ensure __autoload() allows for recursive calls if the class name differs. <?php spl_autoload_register(function ($name) { echo "IN: autoload($name)\n"; - + static $i = 0; if ($i++ > 10) { echo "-> Recursion detected - as expected.\n"; return; } - + class_exists('UndefinedClass' . $i); - + echo "OUT: autoload($name)\n"; }); diff --git a/tests/classes/bug23951.phpt b/tests/classes/bug23951.phpt index 2e272b87fe..74b9332d69 100644 --- a/tests/classes/bug23951.phpt +++ b/tests/classes/bug23951.phpt @@ -7,15 +7,15 @@ define('FOO1', 1); define('FOO2', 2); class A { - + public $a_var = array(FOO1=>'foo1_value', FOO2=>'foo2_value'); - + } class B extends A { - - public $b_var = 'foo'; - + + public $b_var = 'foo'; + } $a = new A; diff --git a/tests/classes/bug29446.phpt b/tests/classes/bug29446.phpt index 573f136ce0..9ce2309cba 100644 --- a/tests/classes/bug29446.phpt +++ b/tests/classes/bug29446.phpt @@ -6,7 +6,7 @@ Bug #29446 (ZE allows multiple declarations of the same class constant) class testClass { const TEST_CONST = 'test'; const TEST_CONST = 'test1'; - + function testClass() { echo self::TEST_CONST; } diff --git a/tests/classes/class_example.phpt b/tests/classes/class_example.phpt index 621958b1bd..b0e9cf8f6e 100644 --- a/tests/classes/class_example.phpt +++ b/tests/classes/class_example.phpt @@ -2,7 +2,7 @@ Classes general test --FILE-- -<?php +<?php /* pretty nifty object oriented code! */ diff --git a/tests/classes/constants_basic_001.phpt b/tests/classes/constants_basic_001.phpt index 37120579f6..03af299ba8 100644 --- a/tests/classes/constants_basic_001.phpt +++ b/tests/classes/constants_basic_001.phpt @@ -6,31 +6,31 @@ Class constant declarations $def = 456; define('DEFINED_TO_VAR', $def); define('DEFINED_TO_UNDEF_VAR', $undef); - + class C { const c0 = UNDEFINED; - + const c1 = 1, c2 = 1.5; const c3 = + 1, c4 = + 1.5; const c5 = -1, c6 = -1.5; - + const c7 = __LINE__; const c8 = __FILE__; const c9 = __CLASS__; const c10 = __METHOD__; const c11 = __FUNCTION__; - + const c12 = DEFINED; const c13 = DEFINED_TO_VAR; const c14 = DEFINED_TO_UNDEF_VAR; - + const c15 = "hello1"; const c16 = 'hello2'; const c17 = C::c16; const c18 = self::c17; } - + echo "\nAttempt to access various kinds of class constants:\n"; var_dump(C::c0); var_dump(C::c1); @@ -51,10 +51,10 @@ Class constant declarations var_dump(C::c16); var_dump(C::c17); var_dump(C::c18); - + echo "\nExpecting fatal error:\n"; var_dump(C::c19); - + echo "\nYou should not see this."; ?> --EXPECTF-- diff --git a/tests/classes/constants_basic_002.phpt b/tests/classes/constants_basic_002.phpt index 0e53ca97c8..006e5fbab9 100644 --- a/tests/classes/constants_basic_002.phpt +++ b/tests/classes/constants_basic_002.phpt @@ -6,14 +6,14 @@ Basic class support - defining and reading a class constant. { const myConst = "hello"; } - + echo "\nRead class constant.\n"; var_dump(aclass::myConst); - + echo "\nFail to read class constant from instance.\n"; $myInstance = new aclass(); var_dump($myInstance->myConst); - + echo "\nClass constant not visible in object var_dump.\n"; var_dump($myInstance) ?> diff --git a/tests/classes/constants_basic_003.phpt b/tests/classes/constants_basic_003.phpt index cceabd8d7d..abf48e3c82 100644 --- a/tests/classes/constants_basic_003.phpt +++ b/tests/classes/constants_basic_003.phpt @@ -10,12 +10,12 @@ Ensure class properties and constants can be defined in terms of constants that const ca = A::MY_CONST; const cc = C::MY_CONST; } - + class C { const MY_CONST = "hello from C"; } - + var_dump(B::$a); var_dump(B::$c); var_dump(B::ca); diff --git a/tests/classes/constants_basic_004.phpt b/tests/classes/constants_basic_004.phpt index cade66844b..3542866cc0 100644 --- a/tests/classes/constants_basic_004.phpt +++ b/tests/classes/constants_basic_004.phpt @@ -8,33 +8,33 @@ Test properties with array default values using class constants as keys and valu public static $sa_x = array(B::KEY => B::VALUE); public $a_x = array(B::KEY => B::VALUE); } - + class B { const KEY = "key"; const VALUE = "value"; - + // Static and instance array using class constants with self public static $sa_b = array(self::KEY => self::VALUE); public $a_b = array(self::KEY => self::VALUE); } - + class C extends B { // Static and instance array using class constants with parent public static $sa_c_parent = array(parent::KEY => parent::VALUE); public $a_c_parent = array(parent::KEY => parent::VALUE); - + // Static and instance array using class constants with self (constants should be inherited) public static $sa_c_self = array(self::KEY => self::VALUE); public $a_c_self = array(self::KEY => self::VALUE); - + // Should also include inherited properties from B. } - + echo "\nStatic properties:\n"; var_dump(X::$sa_x, B::$sa_b, C::$sa_b, C::$sa_c_parent, C::$sa_c_self); - + echo "\nInstance properties:\n"; $x = new x; $b = new B; diff --git a/tests/classes/constants_basic_006.phpt b/tests/classes/constants_basic_006.phpt index 904593ea9b..a293c0bede 100644 --- a/tests/classes/constants_basic_006.phpt +++ b/tests/classes/constants_basic_006.phpt @@ -7,16 +7,16 @@ Ensure class constants are not evaluated when a class is looked up to resolve in const X = E::A; public static $a = array(K => D::V, E::A => K); } - + eval('class D extends C { const V = \'test\'; }'); - + class E extends D { const A = "hello"; } - + define('K', "nasty"); - + var_dump(C::X, C::$a, D::X, D::$a, E::X, E::$a); ?> --EXPECT-- diff --git a/tests/classes/constants_comments_001.phpt b/tests/classes/constants_comments_001.phpt index dbdd67c332..297ad9f956 100644 --- a/tests/classes/constants_comments_001.phpt +++ b/tests/classes/constants_comments_001.phpt @@ -5,17 +5,17 @@ opcache.save_comments=1 --FILE-- <?php class X { - /** comment X1 */ + /** comment X1 */ const X1 = 1; const X2 = 2; - /** comment X3 */ + /** comment X3 */ const X3 = 3; } class Y extends X { - /** comment Y1 */ + /** comment Y1 */ const Y1 = 1; const Y2 = 2; - /** comment Y3 */ + /** comment Y3 */ const Y3 = 3; } $r = new ReflectionClass('Y'); diff --git a/tests/classes/constants_error_003.phpt b/tests/classes/constants_error_003.phpt index c67768c809..b56679b388 100644 --- a/tests/classes/constants_error_003.phpt +++ b/tests/classes/constants_error_003.phpt @@ -6,12 +6,12 @@ Basic class support - attempting to pass a class constant by reference. { const myConst = "hello"; } - + function f(&$a) { $a = "changed"; } - + f(aclass::myConst); var_dump(aclass::myConst); ?> diff --git a/tests/classes/constants_error_004.phpt b/tests/classes/constants_error_004.phpt index 27777f8772..b7f668909b 100644 --- a/tests/classes/constants_error_004.phpt +++ b/tests/classes/constants_error_004.phpt @@ -6,7 +6,7 @@ Class constant whose initial value references a non-existent class { const c1 = D::hello; } - + $a = new C(); ?> --EXPECTF-- diff --git a/tests/classes/constants_error_006.phpt b/tests/classes/constants_error_006.phpt index f3f14b867b..01839ba7ef 100644 --- a/tests/classes/constants_error_006.phpt +++ b/tests/classes/constants_error_006.phpt @@ -6,7 +6,7 @@ Basic class support - attempting to modify a class constant by assignment { const myConst = "hello"; } - + echo "\nTrying to modify a class constant directly - should be parse error.\n"; aclass::myConst = "no!!"; var_dump(aclass::myConst); diff --git a/tests/classes/constants_error_007.phpt b/tests/classes/constants_error_007.phpt index 4be8d885f5..54b32e4ab2 100644 --- a/tests/classes/constants_error_007.phpt +++ b/tests/classes/constants_error_007.phpt @@ -6,7 +6,7 @@ Basic class support - attempting to create a reference to a class constant { const myConst = "hello"; } - + echo "\nAttempting to create a reference to a class constant - should be parse error.\n"; $a = &aclass::myConst; ?> diff --git a/tests/classes/ctor_dtor_inheritance.phpt b/tests/classes/ctor_dtor_inheritance.phpt index 638772dd7c..1f3d3483d0 100644 --- a/tests/classes/ctor_dtor_inheritance.phpt +++ b/tests/classes/ctor_dtor_inheritance.phpt @@ -16,7 +16,7 @@ class base { $this->name = 'base'; print_r($this); } - + function __destruct() { echo __CLASS__ . "::" . __FUNCTION__ . "\n"; print_r($this); diff --git a/tests/classes/ctor_failure.phpt b/tests/classes/ctor_failure.phpt index b7d3b64dda..f86b0cc5f8 100644 --- a/tests/classes/ctor_failure.phpt +++ b/tests/classes/ctor_failure.phpt @@ -9,7 +9,7 @@ class Test echo __METHOD__ . "($msg)\n"; throw new Exception($msg); } - + function __destruct() { echo __METHOD__ . "\n"; } diff --git a/tests/classes/ctor_visibility.phpt b/tests/classes/ctor_visibility.phpt index e7288bb968..685c7dbe41 100644 --- a/tests/classes/ctor_visibility.phpt +++ b/tests/classes/ctor_visibility.phpt @@ -18,7 +18,7 @@ class Derived extends Test echo __METHOD__ . "()\n"; parent::__construct(); } - + static function f() { new Derived; @@ -49,7 +49,7 @@ class DerivedPriv extends TestPriv echo __METHOD__ . "()\n"; parent::__construct(); } - + static function f() { new DerivedPriv; diff --git a/tests/classes/destructor_and_echo.phpt b/tests/classes/destructor_and_echo.phpt index 0a253593a5..7d5b57c8ac 100644 --- a/tests/classes/destructor_and_echo.phpt +++ b/tests/classes/destructor_and_echo.phpt @@ -8,7 +8,7 @@ class Test function __construct() { echo __METHOD__ . "\n"; } - + function __destruct() { echo __METHOD__ . "\n"; } diff --git a/tests/classes/destructor_and_globals.phpt b/tests/classes/destructor_and_globals.phpt index 9caf0f1026..1276d28348 100644 --- a/tests/classes/destructor_and_globals.phpt +++ b/tests/classes/destructor_and_globals.phpt @@ -28,7 +28,7 @@ class counter { global $test_cnt; $test_cnt--; } - + static public function destroy(&$obj) { $obj = NULL; } diff --git a/tests/classes/destructor_inheritance.phpt b/tests/classes/destructor_inheritance.phpt index f267a740ae..c527c04b4f 100644 --- a/tests/classes/destructor_inheritance.phpt +++ b/tests/classes/destructor_inheritance.phpt @@ -6,7 +6,7 @@ class base { function __construct() { echo __METHOD__ . "\n"; } - + function __destruct() { echo __METHOD__ . "\n"; } diff --git a/tests/classes/factory_and_singleton_001.phpt b/tests/classes/factory_and_singleton_001.phpt index 970c017f4b..dbbf07cfad 100644 --- a/tests/classes/factory_and_singleton_001.phpt +++ b/tests/classes/factory_and_singleton_001.phpt @@ -41,7 +41,7 @@ class test { return NULL; } } - + static public function count() { return test::$cnt; } diff --git a/tests/classes/factory_and_singleton_002.phpt b/tests/classes/factory_and_singleton_002.phpt index 4812571497..6748321242 100644 --- a/tests/classes/factory_and_singleton_002.phpt +++ b/tests/classes/factory_and_singleton_002.phpt @@ -41,7 +41,7 @@ class test { return NULL; } } - + static public function count() { return test::$cnt; } diff --git a/tests/classes/incdec_property_001.phpt b/tests/classes/incdec_property_001.phpt index 97a24d30b6..8517a9fc4d 100644 --- a/tests/classes/incdec_property_001.phpt +++ b/tests/classes/incdec_property_001.phpt @@ -1,11 +1,11 @@ --TEST-- ZE2 post increment/decrement property of overloaded object --FILE-- -<?php +<?php class Test { private $real_a = 2; - + function __set($property, $value) { if ($property == "a") { $this->real_a = $value; diff --git a/tests/classes/incdec_property_002.phpt b/tests/classes/incdec_property_002.phpt index c1d7dded3b..930a58dc07 100644 --- a/tests/classes/incdec_property_002.phpt +++ b/tests/classes/incdec_property_002.phpt @@ -1,11 +1,11 @@ --TEST-- ZE2 post increment/decrement property of overloaded object with assignment --FILE-- -<?php +<?php class Test { private $real_a = 2; - + function __set($property, $value) { if ($property == "a") { $this->real_a = $value; diff --git a/tests/classes/incdec_property_003.phpt b/tests/classes/incdec_property_003.phpt index 1a923849f4..edf3c00963 100644 --- a/tests/classes/incdec_property_003.phpt +++ b/tests/classes/incdec_property_003.phpt @@ -1,11 +1,11 @@ --TEST-- ZE2 pre increment/decrement property of overloaded object --FILE-- -<?php +<?php class Test { private $real_a = 2; - + function __set($property, $value) { if ($property == "a") { $this->real_a = $value; diff --git a/tests/classes/incdec_property_004.phpt b/tests/classes/incdec_property_004.phpt index 05e3b445ac..2267d568af 100644 --- a/tests/classes/incdec_property_004.phpt +++ b/tests/classes/incdec_property_004.phpt @@ -1,11 +1,11 @@ --TEST-- ZE2 pre increment/decrement property of overloaded object with assignment --FILE-- -<?php +<?php class Test { private $real_a = 2; - + function __set($property, $value) { if ($property == "a") { $this->real_a = $value; diff --git a/tests/classes/inheritance.phpt b/tests/classes/inheritance.phpt index 070ad9147d..3f7e38b9ef 100644 --- a/tests/classes/inheritance.phpt +++ b/tests/classes/inheritance.phpt @@ -1,7 +1,7 @@ --TEST-- Classes inheritance test --FILE-- -<?php +<?php /* Inheritance test. Pretty nifty if I do say so myself! */ diff --git a/tests/classes/inheritance_005.phpt b/tests/classes/inheritance_005.phpt index 7399bf1168..8c5167f4bf 100644 --- a/tests/classes/inheritance_005.phpt +++ b/tests/classes/inheritance_005.phpt @@ -9,25 +9,25 @@ Check for inherited old-style constructor. echo "In " . __METHOD__ . "\n"; } } - + class B extends A { } - + class C extends B { } - - + + echo "About to construct new B: \n"; $b = new B; - + echo "Is B::B() callable?\n"; var_dump(is_callable(array($b, "B"))); - + echo "Is B::A() callable?\n"; var_dump(is_callable(array($b, "A"))); - + echo "About to construct new C: \n"; $c = new C; diff --git a/tests/classes/interface_class.phpt b/tests/classes/interface_class.phpt index 46deb490ed..8975994024 100644 --- a/tests/classes/interface_class.phpt +++ b/tests/classes/interface_class.phpt @@ -4,7 +4,7 @@ ZE2 A class can only implement interfaces <?php class base { } - + class derived implements base { } ?> diff --git a/tests/classes/interface_doubled.phpt b/tests/classes/interface_doubled.phpt index e36a3c4553..8fbfcba7ff 100644 --- a/tests/classes/interface_doubled.phpt +++ b/tests/classes/interface_doubled.phpt @@ -6,7 +6,7 @@ ZE2 An interface extends base interfaces interface if_a { function f_a(); } - + interface if_b { function f_b(); } diff --git a/tests/classes/interface_implemented.phpt b/tests/classes/interface_implemented.phpt index fd303e0913..e224c5bd23 100644 --- a/tests/classes/interface_implemented.phpt +++ b/tests/classes/interface_implemented.phpt @@ -6,7 +6,7 @@ ZE2 An interface is inherited interface if_a { function f_a(); } - + interface if_b extends if_a { function f_b(); } diff --git a/tests/classes/interface_instantiate.phpt b/tests/classes/interface_instantiate.phpt index dffd6b10e2..04b0e29701 100644 --- a/tests/classes/interface_instantiate.phpt +++ b/tests/classes/interface_instantiate.phpt @@ -6,7 +6,7 @@ ZE2 An interface cannot be instantiated interface if_a { function f_a(); } - + $t = new if_a(); ?> diff --git a/tests/classes/interface_must_be_implemented.phpt b/tests/classes/interface_must_be_implemented.phpt index cd7c815f50..7dc39436e9 100644 --- a/tests/classes/interface_must_be_implemented.phpt +++ b/tests/classes/interface_must_be_implemented.phpt @@ -6,7 +6,7 @@ ZE2 An interface must be implemented interface if_a { function f_a(); } - + class derived_a implements if_a { } diff --git a/tests/classes/interface_optional_arg_003.phpt b/tests/classes/interface_optional_arg_003.phpt index 8685e3d0f1..cf583fe204 100644 --- a/tests/classes/interface_optional_arg_003.phpt +++ b/tests/classes/interface_optional_arg_003.phpt @@ -1,7 +1,7 @@ --TEST-- default argument value in and in implementing class with interface in included file --FILE-- -<?php +<?php include 'interface_optional_arg_003.inc'; class C implements I { diff --git a/tests/classes/iterators_001.phpt b/tests/classes/iterators_001.phpt index 548bed53ce..e4060e375f 100644 --- a/tests/classes/iterators_001.phpt +++ b/tests/classes/iterators_001.phpt @@ -37,7 +37,7 @@ class c_iter implements Iterator { } } } - + class c implements IteratorAggregate { public $max = 3; diff --git a/tests/classes/iterators_002.phpt b/tests/classes/iterators_002.phpt index 6f93d1e1f9..5e1ceb6208 100644 --- a/tests/classes/iterators_002.phpt +++ b/tests/classes/iterators_002.phpt @@ -41,7 +41,7 @@ class c_iter implements Iterator { echo __METHOD__ . "\n"; } } - + class c implements IteratorAggregate { public $max = 3; diff --git a/tests/classes/iterators_003.phpt b/tests/classes/iterators_003.phpt index 71009e0269..f417478d49 100644 --- a/tests/classes/iterators_003.phpt +++ b/tests/classes/iterators_003.phpt @@ -31,7 +31,7 @@ class c_iter implements Iterator { return $this->num; } } - + class c implements IteratorAggregate { public $max = 4; diff --git a/tests/classes/iterators_006.phpt b/tests/classes/iterators_006.phpt index 564f15de54..7baa077f2b 100644 --- a/tests/classes/iterators_006.phpt +++ b/tests/classes/iterators_006.phpt @@ -45,7 +45,7 @@ class a implements IteratorAggregate { $array = new a(); foreach ($array as $property => $value) { - print "$property: $value\n"; + print "$property: $value\n"; } #$array = $array->getIterator(); @@ -58,13 +58,13 @@ echo "===2nd===\n"; $array = new ai(); foreach ($array as $property => $value) { - print "$property: $value\n"; + print "$property: $value\n"; } echo "===3rd===\n"; foreach ($array as $property => $value) { - print "$property: $value\n"; + print "$property: $value\n"; } ?> diff --git a/tests/classes/iterators_007.phpt b/tests/classes/iterators_007.phpt index f2638b31dc..87b7e5318b 100644 --- a/tests/classes/iterators_007.phpt +++ b/tests/classes/iterators_007.phpt @@ -6,7 +6,7 @@ class Test implements Iterator { public $arr = array(1, 2, 3); public $x = 0; - + public function rewind() { if ($this->x == 0) throw new Exception(__METHOD__); reset($this->arr); } public function current() { if ($this->x == 1) throw new Exception(__METHOD__); return current($this->arr); } public function key() { if ($this->x == 2) throw new Exception(__METHOD__); return key($this->arr); } diff --git a/tests/classes/iterators_008.phpt b/tests/classes/iterators_008.phpt index 13a8b165cd..26c8e01704 100644 --- a/tests/classes/iterators_008.phpt +++ b/tests/classes/iterators_008.phpt @@ -5,31 +5,31 @@ Ensure plain userspace superclass does not override special iterator behaviour o Class C {} class D extends C implements Iterator { - + private $counter = 2; - + public function valid() { echo __METHOD__ . "($this->counter)\n"; - return $this->counter; + return $this->counter; } - + public function next() { - $this->counter--; + $this->counter--; echo __METHOD__ . "($this->counter)\n"; } - + public function rewind() { echo __METHOD__ . "($this->counter)\n"; } - + public function current() { echo __METHOD__ . "($this->counter)\n"; } - + public function key() { echo __METHOD__ . "($this->counter)\n"; } - + } foreach (new D as $x) {} diff --git a/tests/classes/method_call_variation_001.phpt b/tests/classes/method_call_variation_001.phpt index e4e269f070..5b6b725bc2 100644 --- a/tests/classes/method_call_variation_001.phpt +++ b/tests/classes/method_call_variation_001.phpt @@ -13,10 +13,10 @@ In $a->$b[Y]() and $a->X[Y]() both $a->$b[Y] and $a->X[Y] represent a global fun $c = new C; $c->functions[0] = 'foo'; $c->functions[1][2][3][4] = 'foo'; - + $c->$name[0](1, 2); $c->$name[1][2][3][4](3, 4); - + $c->functions[0](5, 6); $c->functions[1][2][3][4](7, 8); ?> diff --git a/tests/classes/object_reference_001.phpt b/tests/classes/object_reference_001.phpt index ca5bbc5abe..9842ac00f5 100644 --- a/tests/classes/object_reference_001.phpt +++ b/tests/classes/object_reference_001.phpt @@ -5,7 +5,7 @@ ZE2 object references class Foo { public $name; - + function __construct() { $this->name = "I'm Foo!\n"; } diff --git a/tests/classes/private_006.phpt b/tests/classes/private_006.phpt index 9b90c9c1a7..895affac75 100644 --- a/tests/classes/private_006.phpt +++ b/tests/classes/private_006.phpt @@ -14,7 +14,7 @@ class first { first::do_show(); -class second extends first { +class second extends first { } second::do_show(); diff --git a/tests/classes/private_006b.phpt b/tests/classes/private_006b.phpt index 272a334bfa..1c678601b6 100644 --- a/tests/classes/private_006b.phpt +++ b/tests/classes/private_006b.phpt @@ -16,7 +16,7 @@ class first { $t1 = new first(); $t1->do_show(); -class second extends first { +class second extends first { } //$t2 = new second(); diff --git a/tests/classes/private_007.phpt b/tests/classes/private_007.phpt index 53bc7be059..abc2258bc2 100644 --- a/tests/classes/private_007.phpt +++ b/tests/classes/private_007.phpt @@ -12,7 +12,7 @@ class Bar { } } class Foo extends Bar { - public static function priv() { + public static function priv() { echo "Foo::priv()\n"; } } diff --git a/tests/classes/private_007b.phpt b/tests/classes/private_007b.phpt index 62a65f4cee..3272d0c8a0 100644 --- a/tests/classes/private_007b.phpt +++ b/tests/classes/private_007b.phpt @@ -12,7 +12,7 @@ class Bar { } } class Foo extends Bar { - public function priv() { + public function priv() { echo "Foo::priv()\n"; } } diff --git a/tests/classes/property_override_privateStatic_private.phpt b/tests/classes/property_override_privateStatic_private.phpt index b2985add7d..5be1eaf509 100644 --- a/tests/classes/property_override_privateStatic_private.phpt +++ b/tests/classes/property_override_privateStatic_private.phpt @@ -10,7 +10,7 @@ Redeclare inherited private static property as private. echo self::$p . "\n"; } } - + class B extends A { private $p = "B::p"; @@ -19,10 +19,10 @@ Redeclare inherited private static property as private. echo $this->p . "\n"; } } - - + + A::showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_privateStatic_privateStatic.phpt b/tests/classes/property_override_privateStatic_privateStatic.phpt index f435516a3f..2a1488a319 100644 --- a/tests/classes/property_override_privateStatic_privateStatic.phpt +++ b/tests/classes/property_override_privateStatic_privateStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited private static property as private static. echo self::$p . "\n"; } } - + class B extends A { private static $p = "B::p (static)"; @@ -19,10 +19,10 @@ Redeclare inherited private static property as private static. echo self::$p . "\n"; } } - - + + A::showA(); - + B::showA(); B::showB(); ?> diff --git a/tests/classes/property_override_privateStatic_protected.phpt b/tests/classes/property_override_privateStatic_protected.phpt index fac66c32bb..8e570ddbad 100644 --- a/tests/classes/property_override_privateStatic_protected.phpt +++ b/tests/classes/property_override_privateStatic_protected.phpt @@ -10,7 +10,7 @@ Redeclare inherited private static property as protected. echo self::$p . "\n"; } } - + class B extends A { protected $p = "B::p"; @@ -19,10 +19,10 @@ Redeclare inherited private static property as protected. echo $this->p . "\n"; } } - - + + A::showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_privateStatic_protectedStatic.phpt b/tests/classes/property_override_privateStatic_protectedStatic.phpt index 08c0b22704..03e1abddf2 100644 --- a/tests/classes/property_override_privateStatic_protectedStatic.phpt +++ b/tests/classes/property_override_privateStatic_protectedStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited private static property as protected static. echo self::$p . "\n"; } } - + class B extends A { protected static $p = "B::p (static)"; @@ -19,10 +19,10 @@ Redeclare inherited private static property as protected static. echo self::$p . "\n"; } } - - + + A::showA(); - + B::showA(); B::showB(); ?> diff --git a/tests/classes/property_override_privateStatic_public.phpt b/tests/classes/property_override_privateStatic_public.phpt index 7242371003..1db49f9845 100644 --- a/tests/classes/property_override_privateStatic_public.phpt +++ b/tests/classes/property_override_privateStatic_public.phpt @@ -10,7 +10,7 @@ Redeclare inherited private static property as public. echo self::$p . "\n"; } } - + class B extends A { public $p = "B::p"; @@ -19,10 +19,10 @@ Redeclare inherited private static property as public. echo $this->p . "\n"; } } - - + + A::showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_privateStatic_publicStatic.phpt b/tests/classes/property_override_privateStatic_publicStatic.phpt index 1fe43fb619..2a18747a30 100644 --- a/tests/classes/property_override_privateStatic_publicStatic.phpt +++ b/tests/classes/property_override_privateStatic_publicStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited private static property as public static. echo self::$p . "\n"; } } - + class B extends A { public static $p = "B::p (static)"; @@ -19,10 +19,10 @@ Redeclare inherited private static property as public static. echo self::$p . "\n"; } } - - + + A::showA(); - + B::showA(); B::showB(); ?> diff --git a/tests/classes/property_override_private_private.phpt b/tests/classes/property_override_private_private.phpt index 2d45f33430..74184d111a 100644 --- a/tests/classes/property_override_private_private.phpt +++ b/tests/classes/property_override_private_private.phpt @@ -10,7 +10,7 @@ Redeclare inherited private property as private. echo $this->p . "\n"; } } - + class B extends A { private $p = "B::p"; @@ -19,11 +19,11 @@ Redeclare inherited private property as private. echo $this->p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_private_privateStatic.phpt b/tests/classes/property_override_private_privateStatic.phpt index 1bc3c9fe52..3aead95c0c 100644 --- a/tests/classes/property_override_private_privateStatic.phpt +++ b/tests/classes/property_override_private_privateStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited private property as private static. echo $this->p . "\n"; } } - + class B extends A { private static $p = "B::p (static)"; @@ -19,11 +19,11 @@ Redeclare inherited private property as private static. echo self::$p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); B::showB(); diff --git a/tests/classes/property_override_private_protected.phpt b/tests/classes/property_override_private_protected.phpt index d284272d02..25f6e5218f 100644 --- a/tests/classes/property_override_private_protected.phpt +++ b/tests/classes/property_override_private_protected.phpt @@ -10,7 +10,7 @@ Redeclare inherited private property as protected. echo $this->p . "\n"; } } - + class B extends A { protected $p = "B::p"; @@ -19,11 +19,11 @@ Redeclare inherited private property as protected. echo $this->p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_private_protectedStatic.phpt b/tests/classes/property_override_private_protectedStatic.phpt index c7c54eab95..6ccc953503 100644 --- a/tests/classes/property_override_private_protectedStatic.phpt +++ b/tests/classes/property_override_private_protectedStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited private property as protected static. echo $this->p . "\n"; } } - + class B extends A { protected static $p = "B::p (static)"; @@ -19,11 +19,11 @@ Redeclare inherited private property as protected static. echo self::$p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); B::showB(); diff --git a/tests/classes/property_override_private_public.phpt b/tests/classes/property_override_private_public.phpt index 6468432d18..e54d1370de 100644 --- a/tests/classes/property_override_private_public.phpt +++ b/tests/classes/property_override_private_public.phpt @@ -10,7 +10,7 @@ Redeclare inherited private property as public. echo $this->p . "\n"; } } - + class B extends A { public $p = "B::p"; @@ -19,11 +19,11 @@ Redeclare inherited private property as public. echo $this->p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_private_publicStatic.phpt b/tests/classes/property_override_private_publicStatic.phpt index 4057f83390..67c44a3f30 100644 --- a/tests/classes/property_override_private_publicStatic.phpt +++ b/tests/classes/property_override_private_publicStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited private property as public static. echo $this->p . "\n"; } } - + class B extends A { public static $p = "B::p (static)"; @@ -19,11 +19,11 @@ Redeclare inherited private property as public static. echo self::$p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); B::showB(); diff --git a/tests/classes/property_override_protectedStatic_private.phpt b/tests/classes/property_override_protectedStatic_private.phpt index 18e9c78a13..712f51cd3c 100644 --- a/tests/classes/property_override_protectedStatic_private.phpt +++ b/tests/classes/property_override_protectedStatic_private.phpt @@ -10,7 +10,7 @@ Redeclare inherited protected static property as private. echo self::$p . "\n"; } } - + class B extends A { private $p = "B::p"; @@ -19,10 +19,10 @@ Redeclare inherited protected static property as private. echo $this->p . "\n"; } } - - + + A::showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_protectedStatic_privateStatic.phpt b/tests/classes/property_override_protectedStatic_privateStatic.phpt index 688621077d..72e6e8a0a2 100644 --- a/tests/classes/property_override_protectedStatic_privateStatic.phpt +++ b/tests/classes/property_override_protectedStatic_privateStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited protected static property as private static. echo self::$p . "\n"; } } - + class B extends A { private static $p = "B::p (static)"; @@ -19,10 +19,10 @@ Redeclare inherited protected static property as private static. echo self::$p . "\n"; } } - - + + A::showA(); - + B::showA(); B::showB(); ?> diff --git a/tests/classes/property_override_protectedStatic_protected.phpt b/tests/classes/property_override_protectedStatic_protected.phpt index 0e5fdd301c..b6780586c4 100644 --- a/tests/classes/property_override_protectedStatic_protected.phpt +++ b/tests/classes/property_override_protectedStatic_protected.phpt @@ -10,7 +10,7 @@ Redeclare inherited protected static property as protected. echo self::$p . "\n"; } } - + class B extends A { protected $p = "B::p"; @@ -19,10 +19,10 @@ Redeclare inherited protected static property as protected. echo $this->p . "\n"; } } - - + + A::showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_protectedStatic_protectedStatic.phpt b/tests/classes/property_override_protectedStatic_protectedStatic.phpt index d2d1c0c379..c81a60423e 100644 --- a/tests/classes/property_override_protectedStatic_protectedStatic.phpt +++ b/tests/classes/property_override_protectedStatic_protectedStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited protected static property as protected static. echo self::$p . "\n"; } } - + class B extends A { protected static $p = "B::p (static)"; @@ -19,10 +19,10 @@ Redeclare inherited protected static property as protected static. echo self::$p . "\n"; } } - - + + A::showA(); - + B::showA(); B::showB(); ?> diff --git a/tests/classes/property_override_protectedStatic_public.phpt b/tests/classes/property_override_protectedStatic_public.phpt index 6303325590..14daa455a6 100644 --- a/tests/classes/property_override_protectedStatic_public.phpt +++ b/tests/classes/property_override_protectedStatic_public.phpt @@ -10,7 +10,7 @@ Redeclare inherited protected static property as public. echo self::$p . "\n"; } } - + class B extends A { public $p = "B::p"; @@ -19,10 +19,10 @@ Redeclare inherited protected static property as public. echo $this->p . "\n"; } } - - + + A::showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_protectedStatic_publicStatic.phpt b/tests/classes/property_override_protectedStatic_publicStatic.phpt index 29b67655ff..a214af9994 100644 --- a/tests/classes/property_override_protectedStatic_publicStatic.phpt +++ b/tests/classes/property_override_protectedStatic_publicStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited protected static property as public static. echo self::$p . "\n"; } } - + class B extends A { public static $p = "B::p (static)"; @@ -19,10 +19,10 @@ Redeclare inherited protected static property as public static. echo self::$p . "\n"; } } - - + + A::showA(); - + B::showA(); B::showB(); ?> diff --git a/tests/classes/property_override_protected_private.phpt b/tests/classes/property_override_protected_private.phpt index 22cceda175..9875dd59b8 100644 --- a/tests/classes/property_override_protected_private.phpt +++ b/tests/classes/property_override_protected_private.phpt @@ -10,7 +10,7 @@ Redeclare inherited protected property as private (duplicates Zend/tests/errmsg_ echo $this->p . "\n"; } } - + class B extends A { private $p = "B::p"; @@ -19,11 +19,11 @@ Redeclare inherited protected property as private (duplicates Zend/tests/errmsg_ echo $this->p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_protected_privateStatic.phpt b/tests/classes/property_override_protected_privateStatic.phpt index fb7102cb3e..7193178d48 100644 --- a/tests/classes/property_override_protected_privateStatic.phpt +++ b/tests/classes/property_override_protected_privateStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited protected property as private static. echo $this->p . "\n"; } } - + class B extends A { private static $p = "B::p (static)"; @@ -19,11 +19,11 @@ Redeclare inherited protected property as private static. echo self::$p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); B::showB(); diff --git a/tests/classes/property_override_protected_protected.phpt b/tests/classes/property_override_protected_protected.phpt index 096f53d515..c302639fbb 100644 --- a/tests/classes/property_override_protected_protected.phpt +++ b/tests/classes/property_override_protected_protected.phpt @@ -10,7 +10,7 @@ Redeclare inherited protected property as protected. echo $this->p . "\n"; } } - + class B extends A { protected $p = "B::p"; @@ -19,11 +19,11 @@ Redeclare inherited protected property as protected. echo $this->p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_protected_protectedStatic.phpt b/tests/classes/property_override_protected_protectedStatic.phpt index 1ce4130265..abac19a793 100644 --- a/tests/classes/property_override_protected_protectedStatic.phpt +++ b/tests/classes/property_override_protected_protectedStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited protected property as protected static. echo $this->p . "\n"; } } - + class B extends A { protected static $p = "B::p (static)"; @@ -19,11 +19,11 @@ Redeclare inherited protected property as protected static. echo self::$p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); B::showB(); diff --git a/tests/classes/property_override_protected_public.phpt b/tests/classes/property_override_protected_public.phpt index c2db91b14c..378003ba54 100644 --- a/tests/classes/property_override_protected_public.phpt +++ b/tests/classes/property_override_protected_public.phpt @@ -10,7 +10,7 @@ Redeclare inherited protected property as public. echo $this->p . "\n"; } } - + class B extends A { public $p = "B::p"; @@ -19,11 +19,11 @@ Redeclare inherited protected property as public. echo $this->p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_protected_publicStatic.phpt b/tests/classes/property_override_protected_publicStatic.phpt index 8efdf5f6fd..37865cc7d4 100644 --- a/tests/classes/property_override_protected_publicStatic.phpt +++ b/tests/classes/property_override_protected_publicStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited protected property as public static. echo $this->p . "\n"; } } - + class B extends A { public static $p = "B::p (static)"; @@ -19,11 +19,11 @@ Redeclare inherited protected property as public static. echo self::$p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); B::showB(); diff --git a/tests/classes/property_override_publicStatic_private.phpt b/tests/classes/property_override_publicStatic_private.phpt index 7abe92c9ff..6fd2774c54 100644 --- a/tests/classes/property_override_publicStatic_private.phpt +++ b/tests/classes/property_override_publicStatic_private.phpt @@ -10,7 +10,7 @@ Redeclare inherited public static property as private. echo self::$p . "\n"; } } - + class B extends A { private $p = "B::p"; @@ -19,10 +19,10 @@ Redeclare inherited public static property as private. echo $this->p . "\n"; } } - - + + A::showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_publicStatic_privateStatic.phpt b/tests/classes/property_override_publicStatic_privateStatic.phpt index d41db6da38..3635b918db 100644 --- a/tests/classes/property_override_publicStatic_privateStatic.phpt +++ b/tests/classes/property_override_publicStatic_privateStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited public static property as private static. echo self::$p . "\n"; } } - + class B extends A { private static $p = "B::p (static)"; @@ -19,10 +19,10 @@ Redeclare inherited public static property as private static. echo self::$p . "\n"; } } - - + + A::showA(); - + B::showA(); B::showB(); ?> diff --git a/tests/classes/property_override_publicStatic_protected.phpt b/tests/classes/property_override_publicStatic_protected.phpt index 884159f977..a5eaaea714 100644 --- a/tests/classes/property_override_publicStatic_protected.phpt +++ b/tests/classes/property_override_publicStatic_protected.phpt @@ -10,7 +10,7 @@ Redeclare inherited public static property as protected. echo self::$p . "\n"; } } - + class B extends A { protected $p = "B::p"; @@ -19,10 +19,10 @@ Redeclare inherited public static property as protected. echo $this->p . "\n"; } } - - + + A::showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_publicStatic_protectedStatic.phpt b/tests/classes/property_override_publicStatic_protectedStatic.phpt index b022ef8049..00eb647d5d 100644 --- a/tests/classes/property_override_publicStatic_protectedStatic.phpt +++ b/tests/classes/property_override_publicStatic_protectedStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited public static property as protected static. echo self::$p . "\n"; } } - + class B extends A { protected static $p = "B::p (static)"; @@ -19,10 +19,10 @@ Redeclare inherited public static property as protected static. echo self::$p . "\n"; } } - - + + A::showA(); - + B::showA(); B::showB(); ?> diff --git a/tests/classes/property_override_publicStatic_public.phpt b/tests/classes/property_override_publicStatic_public.phpt index d099da0474..f6ea7643c1 100644 --- a/tests/classes/property_override_publicStatic_public.phpt +++ b/tests/classes/property_override_publicStatic_public.phpt @@ -10,7 +10,7 @@ Redeclare inherited public static property as public. echo self::$p . "\n"; } } - + class B extends A { public $p = "B::p"; @@ -19,10 +19,10 @@ Redeclare inherited public static property as public. echo $this->p . "\n"; } } - - + + A::showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_publicStatic_publicStatic.phpt b/tests/classes/property_override_publicStatic_publicStatic.phpt index 8d0f9ad079..708d7fb479 100644 --- a/tests/classes/property_override_publicStatic_publicStatic.phpt +++ b/tests/classes/property_override_publicStatic_publicStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited public static property as public static. echo self::$p . "\n"; } } - + class B extends A { public static $p = "B::p (static)"; @@ -19,10 +19,10 @@ Redeclare inherited public static property as public static. echo self::$p . "\n"; } } - - + + A::showA(); - + B::showA(); B::showB(); ?> diff --git a/tests/classes/property_override_public_private.phpt b/tests/classes/property_override_public_private.phpt index c0f37ad95a..581d663b60 100644 --- a/tests/classes/property_override_public_private.phpt +++ b/tests/classes/property_override_public_private.phpt @@ -10,7 +10,7 @@ Redeclare inherited public property as private. echo $this->p . "\n"; } } - + class B extends A { private $p = "B::p"; @@ -19,11 +19,11 @@ Redeclare inherited public property as private. echo $this->p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_public_privateStatic.phpt b/tests/classes/property_override_public_privateStatic.phpt index 36223fd345..bacdc9ffe1 100644 --- a/tests/classes/property_override_public_privateStatic.phpt +++ b/tests/classes/property_override_public_privateStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited public property as private static. echo $this->p . "\n"; } } - + class B extends A { private static $p = "B::p (static)"; @@ -19,11 +19,11 @@ Redeclare inherited public property as private static. echo self::$p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); B::showB(); diff --git a/tests/classes/property_override_public_protected.phpt b/tests/classes/property_override_public_protected.phpt index 68fdf8286f..aa79a53595 100644 --- a/tests/classes/property_override_public_protected.phpt +++ b/tests/classes/property_override_public_protected.phpt @@ -10,7 +10,7 @@ Redeclare inherited public property as protected. echo $this->p . "\n"; } } - + class B extends A { protected $p = "B::p"; @@ -19,11 +19,11 @@ Redeclare inherited public property as protected. echo $this->p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_public_protectedStatic.phpt b/tests/classes/property_override_public_protectedStatic.phpt index 77e7ebf1f8..8d78713add 100644 --- a/tests/classes/property_override_public_protectedStatic.phpt +++ b/tests/classes/property_override_public_protectedStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited public property as protected static. echo $this->p . "\n"; } } - + class B extends A { protected static $p = "B::p (static)"; @@ -19,11 +19,11 @@ Redeclare inherited public property as protected static. echo self::$p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); B::showB(); diff --git a/tests/classes/property_override_public_public.phpt b/tests/classes/property_override_public_public.phpt index 3abfe24e29..83d3929702 100644 --- a/tests/classes/property_override_public_public.phpt +++ b/tests/classes/property_override_public_public.phpt @@ -10,7 +10,7 @@ Redeclare inherited public property as public. echo $this->p . "\n"; } } - + class B extends A { public $p = "B::p"; @@ -19,11 +19,11 @@ Redeclare inherited public property as public. echo $this->p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); $b->showB(); diff --git a/tests/classes/property_override_public_publicStatic.phpt b/tests/classes/property_override_public_publicStatic.phpt index 725e947a0d..94feea8a22 100644 --- a/tests/classes/property_override_public_publicStatic.phpt +++ b/tests/classes/property_override_public_publicStatic.phpt @@ -10,7 +10,7 @@ Redeclare inherited public property as public static. echo $this->p . "\n"; } } - + class B extends A { public static $p = "B::p (static)"; @@ -19,11 +19,11 @@ Redeclare inherited public property as public static. echo self::$p . "\n"; } } - - + + $a = new A; $a->showA(); - + $b = new B; $b->showA(); B::showB(); diff --git a/tests/classes/property_recreate_private.phpt b/tests/classes/property_recreate_private.phpt index b37b974845..6d25d71912 100644 --- a/tests/classes/property_recreate_private.phpt +++ b/tests/classes/property_recreate_private.phpt @@ -5,10 +5,10 @@ Unsetting and recreating private properties. class C { private $p = 'test'; function unsetPrivate() { - unset($this->p); + unset($this->p); } function setPrivate() { - $this->p = 'changed'; + $this->p = 'changed'; } } diff --git a/tests/classes/property_recreate_protected.phpt b/tests/classes/property_recreate_protected.phpt index 3319640e3a..ddbbb71fc9 100644 --- a/tests/classes/property_recreate_protected.phpt +++ b/tests/classes/property_recreate_protected.phpt @@ -5,10 +5,10 @@ Unsetting and recreating protected properties. class C { protected $p = 'test'; function unsetProtected() { - unset($this->p); + unset($this->p); } function setProtected() { - $this->p = 'changed'; + $this->p = 'changed'; } } diff --git a/tests/classes/static_mix_1.phpt b/tests/classes/static_mix_1.phpt index 71db59663f..70740d2336 100644 --- a/tests/classes/static_mix_1.phpt +++ b/tests/classes/static_mix_1.phpt @@ -19,6 +19,6 @@ pass::show(); fail::show(); echo "Done\n"; // shouldn't be displayed -?> +?> --EXPECTF-- Fatal error: Cannot make static method pass::show() non static in class fail in %s on line %d diff --git a/tests/classes/static_properties_003_error4.phpt b/tests/classes/static_properties_003_error4.phpt index b43753f1c5..d526e7247b 100644 --- a/tests/classes/static_properties_003_error4.phpt +++ b/tests/classes/static_properties_003_error4.phpt @@ -8,7 +8,7 @@ class C { $c = new C; echo "\n--> Access non-visible static prop like instance prop:\n"; -$c->y =& $ref; +$c->y =& $ref; ?> ==Done== --EXPECTF-- diff --git a/tests/classes/tostring_002.phpt b/tests/classes/tostring_002.phpt index 627cbb359c..7dda92339e 100644 --- a/tests/classes/tostring_002.phpt +++ b/tests/classes/tostring_002.phpt @@ -9,7 +9,7 @@ class Test { return "Hello\n"; } - + function __destruct() { echo $this; diff --git a/tests/classes/tostring_003.phpt b/tests/classes/tostring_003.phpt index 096a7502fe..e3bc7f8f2c 100644 --- a/tests/classes/tostring_003.phpt +++ b/tests/classes/tostring_003.phpt @@ -10,7 +10,7 @@ class Test throw new Exception("Damn!"); return "Hello\n"; } - + function __destruct() { echo $this; diff --git a/tests/classes/tostring_004.phpt b/tests/classes/tostring_004.phpt index fffc1f8635..bfaa57e36f 100644 --- a/tests/classes/tostring_004.phpt +++ b/tests/classes/tostring_004.phpt @@ -23,7 +23,7 @@ echo "\n\nObject with bad __toString():\n"; class badToString { function __toString() { return 0; - } + } } $obj = new badToString; echo "Try 1:\n"; diff --git a/tests/classes/unset_properties.phpt b/tests/classes/unset_properties.phpt index 8683155e35..e19a7d92d5 100644 --- a/tests/classes/unset_properties.phpt +++ b/tests/classes/unset_properties.phpt @@ -11,29 +11,29 @@ class Test protected $protectedProperty = 'protectedProperty set'; private $privateProperty = 'privateProperty set'; - + public function __get($name) { return '__get "' . $name . '"'; } - + public function __set($name, $value) { $this->$name = $value; echo '__set "' . $name . '" to "' . $value . '"'; } - + public function __isset($name) { echo '__isset "' . $name . '"'; return isset($this->$name); } - + public function getPublicProperty() { return $this->publicProperty; } - + public function setPublicProperty($publicProperty) { $this->publicProperty = $publicProperty; diff --git a/tests/func/002.phpt b/tests/func/002.phpt index cb35f92043..4319715e08 100644 --- a/tests/func/002.phpt +++ b/tests/func/002.phpt @@ -1,14 +1,14 @@ --TEST-- Static variables in functions --FILE-- -<?php +<?php function blah() { static $hey=0,$yo=0; echo "hey=".$hey++.", ",$yo--."\n"; } - + blah(); blah(); blah(); diff --git a/tests/func/003.phpt b/tests/func/003.phpt index d603784076..1135009e21 100644 --- a/tests/func/003.phpt +++ b/tests/func/003.phpt @@ -1,7 +1,7 @@ --TEST-- General function test --FILE-- -<?php +<?php function a() { diff --git a/tests/func/004.phpt b/tests/func/004.phpt index 1434297b0d..79c891a223 100644 --- a/tests/func/004.phpt +++ b/tests/func/004.phpt @@ -1,7 +1,7 @@ --TEST-- General function test --FILE-- -<?php +<?php echo "Before function declaration...\n"; diff --git a/tests/func/005.phpt b/tests/func/005.phpt index c4215feb49..e19eda496b 100644 --- a/tests/func/005.phpt +++ b/tests/func/005.phpt @@ -1,7 +1,7 @@ --TEST-- Testing register_shutdown_function() --FILE-- -<?php +<?php function foo() { diff --git a/tests/func/005a.phpt b/tests/func/005a.phpt index 3c2bcb1665..8cd0d211ab 100644 --- a/tests/func/005a.phpt +++ b/tests/func/005a.phpt @@ -8,7 +8,7 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); <?php ini_set('display_errors', 0); - + echo "Start\n"; function boo() @@ -19,7 +19,7 @@ function boo() register_shutdown_function("boo"); /* not necessary, just to show the error sooner */ -set_time_limit(1); +set_time_limit(1); /* infinite loop to simulate long processing */ for (;;) {} diff --git a/tests/func/007.phpt b/tests/func/007.phpt index 73aae2e649..6a18d444ee 100644 --- a/tests/func/007.phpt +++ b/tests/func/007.phpt @@ -3,11 +3,11 @@ INI functions test --FILE-- <?php -$ini1 = ini_get('include_path'); +$ini1 = ini_get('include_path'); ini_set('include_path','ini_set_works'); echo ini_get('include_path')."\n"; ini_restore('include_path'); -$ini2 = ini_get('include_path'); +$ini2 = ini_get('include_path'); if ($ini1 !== $ini2) { echo "ini_restore() does not work.\n"; diff --git a/tests/lang/002.phpt b/tests/lang/002.phpt index ec14d01c3f..251f90b0a2 100644 --- a/tests/lang/002.phpt +++ b/tests/lang/002.phpt @@ -2,7 +2,7 @@ Simple While Loop Test --FILE-- <?php -$a=1; +$a=1; while ($a<10) { echo $a; $a++; diff --git a/tests/lang/003.phpt b/tests/lang/003.phpt index 7049db9047..a580fc60cd 100644 --- a/tests/lang/003.phpt +++ b/tests/lang/003.phpt @@ -2,10 +2,10 @@ Simple Switch Test --FILE-- <?php -$a=1; +$a=1; switch($a) { case 0: - echo "bad"; + echo "bad"; break; case 1: echo "good"; diff --git a/tests/lang/004.phpt b/tests/lang/004.phpt index be8ebf4155..9ca3492cde 100644 --- a/tests/lang/004.phpt +++ b/tests/lang/004.phpt @@ -2,12 +2,12 @@ Simple If/Else Test --FILE-- <?php -$a=1; +$a=1; if($a==0) { echo "bad"; } else { echo "good"; } -?> +?> --EXPECT-- good diff --git a/tests/lang/005.phpt b/tests/lang/005.phpt index 404a7cbbf6..fe3633b58b 100644 --- a/tests/lang/005.phpt +++ b/tests/lang/005.phpt @@ -2,7 +2,7 @@ Simple If/ElseIf/Else Test --FILE-- <?php -$a=1; +$a=1; if($a==0) { echo "bad"; @@ -11,6 +11,6 @@ if($a==0) { } else { echo "good"; } -?> +?> --EXPECT-- good diff --git a/tests/lang/006.phpt b/tests/lang/006.phpt index 2a2db013ab..5056b8a4ee 100644 --- a/tests/lang/006.phpt +++ b/tests/lang/006.phpt @@ -18,6 +18,6 @@ if($a==0) { echo "bad"; } } -?> +?> --EXPECT-- good diff --git a/tests/lang/007.phpt b/tests/lang/007.phpt index 4576d4efa5..946ae9babb 100644 --- a/tests/lang/007.phpt +++ b/tests/lang/007.phpt @@ -17,9 +17,9 @@ function Test() echo "$a $c "; } -Test(); +Test(); echo "$a $b $c "; -Test(); +Test(); echo "$a $b $c "; Test(); ?> diff --git a/tests/lang/008.phpt b/tests/lang/008.phpt index d335e6f135..8633b6049a 100644 --- a/tests/lang/008.phpt +++ b/tests/lang/008.phpt @@ -6,7 +6,7 @@ Testing recursive function function Test() { static $a=1; - echo "$a "; + echo "$a "; $a++; if($a<10): Test(); endif; } diff --git a/tests/lang/009.phpt b/tests/lang/009.phpt index ea2aa9294d..8621a73e50 100644 --- a/tests/lang/009.phpt +++ b/tests/lang/009.phpt @@ -3,7 +3,7 @@ Testing function parameter passing --FILE-- <?php function test ($a,$b) { - echo $a+$b; + echo $a+$b; } test(1,2); ?> diff --git a/tests/lang/011.phpt b/tests/lang/011.phpt index 771ef7c129..b7946b7460 100644 --- a/tests/lang/011.phpt +++ b/tests/lang/011.phpt @@ -1,7 +1,7 @@ --TEST-- Testing nested functions --FILE-- -<?php +<?php function F() { $a = "Hello "; @@ -11,7 +11,7 @@ function F() function G() { static $myvar = 4; - + echo "$myvar "; echo F(); echo "$myvar"; diff --git a/tests/lang/012.phpt b/tests/lang/012.phpt index 117137a29b..203d7cebe3 100644 --- a/tests/lang/012.phpt +++ b/tests/lang/012.phpt @@ -1,8 +1,8 @@ --TEST-- Testing stack after early function return --FILE-- -<?php -function F () { +<?php +function F () { if(1) { return("Hello"); } diff --git a/tests/lang/013.phpt b/tests/lang/013.phpt index be84cdcb8f..c25cf41abe 100644 --- a/tests/lang/013.phpt +++ b/tests/lang/013.phpt @@ -1,7 +1,7 @@ --TEST-- Testing eval function --FILE-- -<?php +<?php error_reporting(0); $a="echo \"Hello\";"; eval($a); diff --git a/tests/lang/014.phpt b/tests/lang/014.phpt index f0033b2f77..fe6f86e22a 100644 --- a/tests/lang/014.phpt +++ b/tests/lang/014.phpt @@ -1,8 +1,8 @@ --TEST-- Testing eval function inside user-defined function --FILE-- -<?php -function F ($a) { +<?php +function F ($a) { eval($a); } diff --git a/tests/lang/016.phpt b/tests/lang/016.phpt index dbaa908b81..30c36b3d2a 100644 --- a/tests/lang/016.phpt +++ b/tests/lang/016.phpt @@ -1,7 +1,7 @@ --TEST-- Testing user-defined function in included file --FILE-- -<?php +<?php include "016.inc"; MyFunc("Hello"); ?> diff --git a/tests/lang/018.phpt b/tests/lang/018.phpt index 638b131c2d..7560219291 100644 --- a/tests/lang/018.phpt +++ b/tests/lang/018.phpt @@ -1,7 +1,7 @@ --TEST-- eval() test --FILE-- -<?php +<?php error_reporting(0); diff --git a/tests/lang/019.phpt b/tests/lang/019.phpt index c9b5e5f3b5..313da0cbd8 100644 --- a/tests/lang/019.phpt +++ b/tests/lang/019.phpt @@ -1,7 +1,7 @@ --TEST-- eval() test --FILE-- -<?php +<?php eval("function test() { echo \"hey, this is a function inside an eval()!\\n\"; }"); diff --git a/tests/lang/020.phpt b/tests/lang/020.phpt index 46a2a2c1c0..9428ec5e6f 100644 --- a/tests/lang/020.phpt +++ b/tests/lang/020.phpt @@ -1,7 +1,7 @@ --TEST-- Switch test 1 --FILE-- -<?php +<?php $i="abc"; diff --git a/tests/lang/021.phpt b/tests/lang/021.phpt index aff45b6be3..438f873da5 100644 --- a/tests/lang/021.phpt +++ b/tests/lang/021.phpt @@ -1,12 +1,12 @@ --TEST-- Switch test 2 --FILE-- -<?php +<?php for ($i=0; $i<=5; $i++) { echo "i=$i\n"; - + switch($i) { case 0: echo "In branch 0\n"; diff --git a/tests/lang/022.phpt b/tests/lang/022.phpt index dddc6c2955..8843e50e26 100644 --- a/tests/lang/022.phpt +++ b/tests/lang/022.phpt @@ -1,7 +1,7 @@ --TEST-- Switch test 3 --FILE-- -<?php +<?php function switchtest ($i, $j) { diff --git a/tests/lang/025.phpt b/tests/lang/025.phpt index 382960f628..13c02d31d4 100644 --- a/tests/lang/025.phpt +++ b/tests/lang/025.phpt @@ -1,7 +1,7 @@ --TEST-- Mean recursion test --FILE-- -<?php +<?php function RekTest ($nr) { echo " $nr "; $j=$nr+1; diff --git a/tests/lang/027.phpt b/tests/lang/027.phpt index d3eb74b22f..9c826cfe93 100644 --- a/tests/lang/027.phpt +++ b/tests/lang/027.phpt @@ -1,7 +1,7 @@ --TEST-- Testing do-while loop --FILE-- -<?php +<?php $i=3; do { echo $i; diff --git a/tests/lang/028.phpt b/tests/lang/028.phpt index 2c51b79cb2..0c2f2f0756 100644 --- a/tests/lang/028.phpt +++ b/tests/lang/028.phpt @@ -19,7 +19,7 @@ function still_working() function dafna() { static $foo = 0; - + print "Dafna!\n"; print call_user_func("still_working")."\n"; $foo++; diff --git a/tests/lang/034.phpt b/tests/lang/034.phpt index 5d2c610926..38ecc0b451 100644 --- a/tests/lang/034.phpt +++ b/tests/lang/034.phpt @@ -9,7 +9,7 @@ if (setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.I } ?> --FILE-- -<?php +<?php # activate the german locale setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.ISO-8859-1"); diff --git a/tests/lang/035.phpt b/tests/lang/035.phpt index 63f0385e8c..bc49af99a5 100644 --- a/tests/lang/035.phpt +++ b/tests/lang/035.phpt @@ -4,18 +4,18 @@ ZE2: set_exception_handler() <?php class MyException extends Exception { function __construct($_error) { - $this->error = $_error; + $this->error = $_error; } - + function getException() { - return $this->error; + return $this->error; } } function ThrowException() { - throw new MyException("'This is an exception!'"); + throw new MyException("'This is an exception!'"); } @@ -26,7 +26,7 @@ try { } try { - ThrowException(); + ThrowException(); } catch (MyException $exception) { print "There was an exception: " . $exception->getException(); print "\n"; diff --git a/tests/lang/bug18872.phpt b/tests/lang/bug18872.phpt index 2e3dc22c58..5e5333879d 100644 --- a/tests/lang/bug18872.phpt +++ b/tests/lang/bug18872.phpt @@ -1,18 +1,18 @@ --TEST-- Bug #18872 (class constant used as default parameter) --FILE-- -<?php -class FooBar { - const BIFF = 3; -} - -function foo($biff = FooBar::BIFF) { - echo $biff . "\n"; -} - -foo(); -foo(); -?> +<?php +class FooBar { + const BIFF = 3; +} + +function foo($biff = FooBar::BIFF) { + echo $biff . "\n"; +} + +foo(); +foo(); +?> --EXPECT-- 3 3 diff --git a/tests/lang/bug20175.phpt b/tests/lang/bug20175.phpt index a42e35c41e..cfa465deac 100644 --- a/tests/lang/bug20175.phpt +++ b/tests/lang/bug20175.phpt @@ -94,7 +94,7 @@ function wow_static() { $oop_global = 0; class oop_class { var $oop_name; - + function __construct() { global $oop_global; echo "oop_class()\n"; @@ -104,11 +104,11 @@ class oop_class { class oop_test { static $oop_value; - + function __construct() { echo "oop_test()\n"; } - + function oop_static() { echo "oop_static()\n"; if (!isset(self::$oop_value)) { diff --git a/tests/lang/bug21094.phpt b/tests/lang/bug21094.phpt index 266a1d6c8f..ac3ae2a2c7 100644 --- a/tests/lang/bug21094.phpt +++ b/tests/lang/bug21094.phpt @@ -6,7 +6,7 @@ class test { function hdlr($errno, $errstr, $errfile, $errline) { printf("[%d] errstr: %s, errfile: %s, errline: %d\n", $errno, $errstr, $errfile, $errline, $errstr); } -} +} set_error_handler(array(new test(), "hdlr")); diff --git a/tests/lang/bug21849.phpt b/tests/lang/bug21849.phpt index 2ce99769d9..def754a3a6 100644 --- a/tests/lang/bug21849.phpt +++ b/tests/lang/bug21849.phpt @@ -4,7 +4,7 @@ Bug #21849 (self::constant doesn't work as method's default parameter) <?php class foo { const bar = "fubar\n"; - + function __construct($arg = self::bar) { echo $arg; } diff --git a/tests/lang/bug22510.phpt b/tests/lang/bug22510.phpt index c625ea7ddd..7c4349b71a 100644 --- a/tests/lang/bug22510.phpt +++ b/tests/lang/bug22510.phpt @@ -66,7 +66,7 @@ function ok1(&$bar) { function ok2(&$bar) { print __FUNCTION__."\n"; - @$a = $a; + @$a = $a; $bar->run2(); } diff --git a/tests/lang/bug23384.phpt b/tests/lang/bug23384.phpt index 2c41217b90..2dc3f2308b 100644 --- a/tests/lang/bug23384.phpt +++ b/tests/lang/bug23384.phpt @@ -15,7 +15,7 @@ class Foo { } } -Foo::test(); +Foo::test(); echo Foo::HUN."\n"; ?> --EXPECTF-- diff --git a/tests/lang/bug24396.phpt b/tests/lang/bug24396.phpt index 80862191de..bb5c83860a 100644 --- a/tests/lang/bug24396.phpt +++ b/tests/lang/bug24396.phpt @@ -7,10 +7,10 @@ $arr = array('a' => 1, 'b' => 2, 'c' => 3); foreach($arr as $k=>$v) { global $$k; // comment this out and it works in PHP 7 too.. - + echo "($k => $v)\n"; - - $$k = $v; + + $$k = $v; } ?> --EXPECT-- diff --git a/tests/lang/bug24908.phpt b/tests/lang/bug24908.phpt index 30056abf3c..910b715a05 100644 --- a/tests/lang/bug24908.phpt +++ b/tests/lang/bug24908.phpt @@ -4,7 +4,7 @@ Bug #24908 (super-globals can not be used in __destruct()) variables_order=GPS --FILE-- <?php -class test { +class test { function __construct() { if (count($_SERVER)) echo "O"; } diff --git a/tests/lang/bug24926.phpt b/tests/lang/bug24926.phpt index e7fd86ce76..f73d265f38 100644 --- a/tests/lang/bug24926.phpt +++ b/tests/lang/bug24926.phpt @@ -8,15 +8,15 @@ error_reporting (E_ALL); class foo { public $functions = array(); - + function __construct() { $function = create_function('', 'return "FOO\n";'); print($function()); - + $this->functions['test'] = $function; print($this->functions['test']()); // werkt al niet meer - + } } diff --git a/tests/lang/bug24951.phpt b/tests/lang/bug24951.phpt index aa48ab2936..5538e13815 100644 --- a/tests/lang/bug24951.phpt +++ b/tests/lang/bug24951.phpt @@ -31,7 +31,7 @@ function t3() } t1(); echo "\n"; -t2(); echo "\n"; +t2(); echo "\n"; t3(); echo "\n"; ?> --EXPECT-- diff --git a/tests/lang/bug25652.phpt b/tests/lang/bug25652.phpt index 09cfc18197..b0125de085 100644 --- a/tests/lang/bug25652.phpt +++ b/tests/lang/bug25652.phpt @@ -6,17 +6,17 @@ Bug #25652 (Calling Global functions dynamically fails from Class scope) function testfunc ($var) { echo "testfunc $var\n"; } - + class foo { public $arr = array('testfunc'); function bar () { $this->arr[0]('testvalue'); } } - + $a = new foo (); $a->bar (); - + ?> --EXPECT-- testfunc testvalue diff --git a/tests/lang/bug25922.phpt b/tests/lang/bug25922.phpt index bb030c9df8..41fb135e03 100644 --- a/tests/lang/bug25922.phpt +++ b/tests/lang/bug25922.phpt @@ -9,7 +9,7 @@ function my_error_handler($error, $errmsg='', $errfile='', $errline=0, $errconte echo "$errmsg\n"; $errcontext = ''; } - + set_error_handler('my_error_handler'); function test() diff --git a/tests/lang/bug26696.phpt b/tests/lang/bug26696.phpt index dae182d307..a73694c95a 100644 --- a/tests/lang/bug26696.phpt +++ b/tests/lang/bug26696.phpt @@ -14,7 +14,7 @@ for ($i = 0; $i < $len; $i++) { } $str = '*'; -switch ($str[0]) { +switch ($str[0]) { case '*'; echo "OK\n"; break; diff --git a/tests/lang/bug27535.phpt b/tests/lang/bug27535.phpt index 29fd033469..604b2d3d04 100644 --- a/tests/lang/bug27535.phpt +++ b/tests/lang/bug27535.phpt @@ -2,7 +2,7 @@ Bug #27535 (Objects pointing to each other cause Apache to crash) --FILE-- <?php - + class Class1 { public $_Class2_obj; diff --git a/tests/lang/bug29893.phpt b/tests/lang/bug29893.phpt index d320de0ee7..25679893d2 100644 --- a/tests/lang/bug29893.phpt +++ b/tests/lang/bug29893.phpt @@ -3,7 +3,7 @@ Bug #29893 (segfault when using array as index) --FILE-- <?php $base = 50; -$base[$base] -= 0; +$base[$base] -= 0; ?> ===DONE=== --EXPECTF-- diff --git a/tests/lang/bug29944.phpt b/tests/lang/bug29944.phpt index 7882936f08..80a76f132e 100644 --- a/tests/lang/bug29944.phpt +++ b/tests/lang/bug29944.phpt @@ -11,7 +11,7 @@ switch ($a) { return false; } echo foo($b); -} +} ?> ===DONE=== diff --git a/tests/lang/bug30578.phpt b/tests/lang/bug30578.phpt index d8a8d2e54f..dc9eeeaae4 100644 --- a/tests/lang/bug30578.phpt +++ b/tests/lang/bug30578.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #30578 (Output buffers flushed before calling __desctruct functions) +Bug #30578 (Output buffers flushed before calling __desctruct functions) --FILE-- <?php diff --git a/tests/lang/bug30638.phpt b/tests/lang/bug30638.phpt index 30b70f30fb..24e6609498 100644 --- a/tests/lang/bug30638.phpt +++ b/tests/lang/bug30638.phpt @@ -9,7 +9,7 @@ if (setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.I } ?> --FILE-- -<?php +<?php # activate the german locale setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.ISO-8859-1"); diff --git a/tests/lang/bug30862.phpt b/tests/lang/bug30862.phpt index 12c95d57e8..7f2d3ed4ae 100644 --- a/tests/lang/bug30862.phpt +++ b/tests/lang/bug30862.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #30862 (Static array with boolean indexes) --FILE-- -<?php +<?php class T { static $a = array(false=>"false", true=>"true"); } diff --git a/tests/lang/bug32828.phpt b/tests/lang/bug32828.phpt index 4abf21604f..b5772afc52 100644 --- a/tests/lang/bug32828.phpt +++ b/tests/lang/bug32828.phpt @@ -12,7 +12,7 @@ ob_start('output_handler'); ob_end_clean(); ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Uncaught Exception in %s:%d Stack trace: #0 [internal function]: output_handler('', %d) diff --git a/tests/lang/bug32924.phpt b/tests/lang/bug32924.phpt index d72b0eaa2e..4c6dab0a16 100644 --- a/tests/lang/bug32924.phpt +++ b/tests/lang/bug32924.phpt @@ -4,7 +4,7 @@ Bug #32924 (prepend does not add file to included files) include_path={PWD} auto_prepend_file=inc.inc --FILE-- -<?php +<?php include_once(dirname(__FILE__).'/inc.inc'); require_once(dirname(__FILE__).'/inc.inc'); ?> diff --git a/tests/lang/bug45392.phpt b/tests/lang/bug45392.phpt index 78876c7c80..a9bdd40af2 100644 --- a/tests/lang/bug45392.phpt +++ b/tests/lang/bug45392.phpt @@ -6,7 +6,7 @@ display_errors=stderr <?php if (getenv("USE_ZEND_ALLOC") === "0") { die("skip Zend MM disabled"); -} +} --FILE-- <?php echo __LINE__ . "\n"; diff --git a/tests/lang/compare_objects_basic1.phpt b/tests/lang/compare_objects_basic1.phpt index 07ebd7cc69..cf91803e3f 100644 --- a/tests/lang/compare_objects_basic1.phpt +++ b/tests/lang/compare_objects_basic1.phpt @@ -31,10 +31,10 @@ $obj3 = new class3(); $obj4 = new class4(); $obj5 = new class5(); -echo "\n-- The following compare should return TRUE --\n"; +echo "\n-- The following compare should return TRUE --\n"; var_dump($obj1 == $obj1); -echo "\n-- All the following compares should return FALSE --\n"; +echo "\n-- All the following compares should return FALSE --\n"; var_dump($obj1 == $obj2); var_dump($obj1 == $obj3); var_dump($obj1 == $obj4); diff --git a/tests/lang/compare_objects_basic2.phpt b/tests/lang/compare_objects_basic2.phpt index e822f1e4ee..74d74b8cd0 100644 --- a/tests/lang/compare_objects_basic2.phpt +++ b/tests/lang/compare_objects_basic2.phpt @@ -2,7 +2,7 @@ Test object compare when object handler different --FILE-- -<?php +<?php //Set the default time zone date_default_timezone_set("Europe/London"); diff --git a/tests/lang/engine_assignExecutionOrder_001.phpt b/tests/lang/engine_assignExecutionOrder_001.phpt index 627e69ffc5..f5140b54e2 100644 --- a/tests/lang/engine_assignExecutionOrder_001.phpt +++ b/tests/lang/engine_assignExecutionOrder_001.phpt @@ -14,7 +14,7 @@ function g() { } -echo "\n\nOrder with local assignment:\n"; +echo "\n\nOrder with local assignment:\n"; ${f()} = g(); var_dump($name); @@ -42,7 +42,7 @@ var_dump($oc); class C { public static $name = "original"; - public static $a = array(); + public static $a = array(); public static $string = "hello"; } echo "\n\nOrder with static property assignment:\n"; @@ -55,7 +55,7 @@ var_dump(C::$a); echo "\n\nOrder with indexed string assignment:\n"; $string = "hello"; -function getOffset() { +function getOffset() { echo "in getOffset()\n"; return 0; } diff --git a/tests/lang/engine_assignExecutionOrder_002.phpt b/tests/lang/engine_assignExecutionOrder_002.phpt index c090a452c3..52019f10c8 100644 --- a/tests/lang/engine_assignExecutionOrder_002.phpt +++ b/tests/lang/engine_assignExecutionOrder_002.phpt @@ -28,7 +28,7 @@ $g3 = array(30,30); $g = array($g1,$g2,$g3); list($e[$f++],$e[$f++]) = $g[2]; // expect 30,30 -var_dump($e); +var_dump($e); $i1 = array(1,2); diff --git a/tests/lang/engine_assignExecutionOrder_003.phpt b/tests/lang/engine_assignExecutionOrder_003.phpt index 448b46e8ec..6a9c7f38e3 100644 --- a/tests/lang/engine_assignExecutionOrder_003.phpt +++ b/tests/lang/engine_assignExecutionOrder_003.phpt @@ -5,7 +5,7 @@ Evaluation order during assignments. $b = "bb"; $a = "aa"; -function foo() +function foo() { echo "Bad call\n"; } @@ -75,7 +75,7 @@ $x2 = array(array(2),2); $x3 = array(array(3),3); $bx = array(10); -$x[mod($x1)][mod($x2)] = $bx[mod($x3)]; +$x[mod($x1)][mod($x2)] = $bx[mod($x3)]; // expecting 10,3 diff --git a/tests/lang/engine_assignExecutionOrder_009.phpt b/tests/lang/engine_assignExecutionOrder_009.phpt index 62b3327e06..5401ecc287 100644 --- a/tests/lang/engine_assignExecutionOrder_009.phpt +++ b/tests/lang/engine_assignExecutionOrder_009.phpt @@ -8,18 +8,18 @@ function f($x) { } echo "Function call args:\n"; -var_dump(f($i=0) < f(++$i)); +var_dump(f($i=0) < f(++$i)); var_dump(f($i=0) <= f(++$i)); -var_dump(f($i=0) > f(++$i)); +var_dump(f($i=0) > f(++$i)); var_dump(f($i=0) >= f(++$i)); echo "\nArray indices:\n"; $a[1][2] = 0; $a[3][4] = 1; $i=0; -var_dump($a[$i=1][++$i] < $a[++$i][++$i]); +var_dump($a[$i=1][++$i] < $a[++$i][++$i]); var_dump($a[$i=1][++$i] <= $a[++$i][++$i]); -var_dump($a[$i=1][++$i] > $a[++$i][++$i]); +var_dump($a[$i=1][++$i] > $a[++$i][++$i]); var_dump($a[$i=1][++$i] >= $a[++$i][++$i]); ?> --EXPECT-- diff --git a/tests/lang/error_2_exception_001.phpt b/tests/lang/error_2_exception_001.phpt index e084b92dd7..6ef3a52676 100644 --- a/tests/lang/error_2_exception_001.phpt +++ b/tests/lang/error_2_exception_001.phpt @@ -12,7 +12,7 @@ class MyException extends Exception { function getErrno() { return $this->errno; } - + function getErrmsg() { return $this->errmsg; } diff --git a/tests/lang/execution_order.phpt b/tests/lang/execution_order.phpt index ca3feb32cb..27424c41b9 100644 --- a/tests/lang/execution_order.phpt +++ b/tests/lang/execution_order.phpt @@ -169,7 +169,7 @@ echo "\r\n"; echo "24)"; echo ($c->val=300) + $c->val; echo "\r\n"; - + ?> --EXPECT-- 1)goodgood diff --git a/tests/lang/foreachLoop.002.phpt b/tests/lang/foreachLoop.002.phpt index 31492953a4..5b92736e5d 100644 --- a/tests/lang/foreachLoop.002.phpt +++ b/tests/lang/foreachLoop.002.phpt @@ -35,7 +35,7 @@ foreach ($a as $v) { //avoid infinite loop if test is failing if ($counter++>10) { echo "Loop detected\n"; - break; + break; } } var_dump($a); @@ -49,8 +49,8 @@ foreach ($a as &$v) { //avoid infinite loop if test is failing if ($counter++>10) { echo "Loop detected\n"; - break; - } + break; + } } var_dump($a); @@ -58,7 +58,7 @@ echo "\nPopping elements off an unreferenced array.\n"; $a = array("original.1","original.2","original.3"); foreach ($a as $v) { array_pop($a); - var_dump($v); + var_dump($v); } var_dump($a); diff --git a/tests/lang/foreachLoop.009.phpt b/tests/lang/foreachLoop.009.phpt index 90aa33953b..37b0163358 100644 --- a/tests/lang/foreachLoop.009.phpt +++ b/tests/lang/foreachLoop.009.phpt @@ -28,7 +28,7 @@ $count=0; foreach ($refedArray as $k=>$v3) { array_push($refedArray, "new.$k"); echo "key: $k; value: $v3\n"; - + if ($count++>5) { echo "Loop detected, as expected.\n"; break; @@ -42,7 +42,7 @@ $count=0; foreach ($refedArray as $k=>&$v4) { array_push($refedArray, "new.$k"); echo "key: $k; value: $v4\n"; - + if ($count++>5) { echo "Loop detected, as expected.\n"; break; diff --git a/tests/lang/foreachLoop.010.phpt b/tests/lang/foreachLoop.010.phpt index 2ff0a7b61f..504132d035 100644 --- a/tests/lang/foreachLoop.010.phpt +++ b/tests/lang/foreachLoop.010.phpt @@ -26,7 +26,7 @@ $i=0; foreach ($a as $v) { array_push($a, 'new'); var_dump($v); - + if (++$i>10) { echo "Infinite loop detected\n"; break; diff --git a/tests/lang/foreachLoop.011.phpt b/tests/lang/foreachLoop.011.phpt index eeb08596cb..8e4fca8a40 100644 --- a/tests/lang/foreachLoop.011.phpt +++ b/tests/lang/foreachLoop.011.phpt @@ -1,4 +1,4 @@ ---TEST-- +--TEST-- Changing from an interable type to a non iterable type during the iteration --FILE-- <?php @@ -17,7 +17,7 @@ $a->b=2; $b=&$a; foreach ($a as $v) { var_dump($v); - $b='x'; + $b='x'; } ?> diff --git a/tests/lang/foreachLoop.012.phpt b/tests/lang/foreachLoop.012.phpt index be72ae0e30..b308e9ff57 100644 --- a/tests/lang/foreachLoop.012.phpt +++ b/tests/lang/foreachLoop.012.phpt @@ -12,11 +12,11 @@ function withRefValue($elements, $transform) { $a[] = "v.$i"; } $counter=0; - + echo "--> State of array before loop:\n"; var_dump($a); - - echo "--> Do loop:\n"; + + echo "--> Do loop:\n"; foreach ($a as $k=>$v) { echo " iteration $counter: \$k=$k; \$v=$v\n"; eval($transform); @@ -26,7 +26,7 @@ function withRefValue($elements, $transform) { break; } } - + echo "--> State of array after loop:\n"; var_dump($a); } diff --git a/tests/lang/foreachLoop.013.phpt b/tests/lang/foreachLoop.013.phpt index cd1e0af96e..e53130da00 100644 --- a/tests/lang/foreachLoop.013.phpt +++ b/tests/lang/foreachLoop.013.phpt @@ -12,11 +12,11 @@ function withRefValue($elements, $transform) { $a[] = "v.$i"; } $counter=0; - + echo "--> State of array before loop:\n"; var_dump($a); - - echo "--> Do loop:\n"; + + echo "--> Do loop:\n"; foreach ($a as $k=>&$v) { echo " iteration $counter: \$k=$k; \$v=$v\n"; eval($transform); @@ -26,7 +26,7 @@ function withRefValue($elements, $transform) { break; } } - + echo "--> State of array after loop:\n"; var_dump($a); } diff --git a/tests/lang/foreachLoop.014.phpt b/tests/lang/foreachLoop.014.phpt index 9d45eb8244..9db3470e9c 100644 --- a/tests/lang/foreachLoop.014.phpt +++ b/tests/lang/foreachLoop.014.phpt @@ -12,13 +12,13 @@ function withRefValue($elements, $transform) { $a[] = "v.$i"; } $counter=0; - + $ref = &$a; - + echo "--> State of referenced array before loop:\n"; var_dump($a); - - echo "--> Do loop:\n"; + + echo "--> Do loop:\n"; foreach ($a as $k=>$v) { echo " iteration $counter: \$k=$k; \$v=$v\n"; eval($transform); @@ -28,7 +28,7 @@ function withRefValue($elements, $transform) { break; } } - + echo "--> State of array after loop:\n"; var_dump($a); } diff --git a/tests/lang/foreachLoop.015.phpt b/tests/lang/foreachLoop.015.phpt index 13333ccf4d..876c867512 100644 --- a/tests/lang/foreachLoop.015.phpt +++ b/tests/lang/foreachLoop.015.phpt @@ -12,13 +12,13 @@ function withRefValue($elements, $transform) { $a[] = "v.$i"; } $counter=0; - + $ref = &$a; - + echo "--> State of referenced array before loop:\n"; var_dump($a); - - echo "--> Do loop:\n"; + + echo "--> Do loop:\n"; foreach ($a as $k=>&$v) { echo " iteration $counter: \$k=$k; \$v=$v\n"; eval($transform); @@ -28,7 +28,7 @@ function withRefValue($elements, $transform) { break; } } - + echo "--> State of array after loop:\n"; var_dump($a); } diff --git a/tests/lang/foreachLoop.016.phpt b/tests/lang/foreachLoop.016.phpt index 60af401580..01c44449a7 100644 --- a/tests/lang/foreachLoop.016.phpt +++ b/tests/lang/foreachLoop.016.phpt @@ -10,7 +10,7 @@ Ensure foreach splits the iterated entity from its cow reference set, for all so } var_dump($b); unset($a, $b); - + echo "\n" . '${\'a\'}' . "\n"; $b = $a = array('original'); foreach(${'a'} as $k=>&$v) { @@ -18,7 +18,7 @@ Ensure foreach splits the iterated entity from its cow reference set, for all so } var_dump($b); unset($a, $b); - + echo "\n" . '$$a' . "\n"; $a = 'blah'; $$a = array('original'); @@ -28,7 +28,7 @@ Ensure foreach splits the iterated entity from its cow reference set, for all so } var_dump($b); unset($a, $b); - + echo "\n" . '$a[0]' . "\n"; $b = $a[0] = array('original'); foreach($a[0] as $k=>&$v) { @@ -36,7 +36,7 @@ Ensure foreach splits the iterated entity from its cow reference set, for all so } var_dump($b); unset($a, $b); - + echo "\n" . '$a[0][0]' . "\n"; $b = $a[0][0] = array('original'); foreach($a[0][0] as $k=>&$v) { @@ -44,7 +44,7 @@ Ensure foreach splits the iterated entity from its cow reference set, for all so } var_dump($b); unset($a, $b); - + echo "\n" . '$a->b' . "\n"; $b = $a->b = array('original'); foreach($a->b as $k=>&$v) { @@ -52,7 +52,7 @@ Ensure foreach splits the iterated entity from its cow reference set, for all so } var_dump($b); unset($a, $b); - + echo "\n" . '$a->b->c' . "\n"; $b = $a->b->c = array('original'); foreach($a->b as $k=>&$v) { @@ -60,7 +60,7 @@ Ensure foreach splits the iterated entity from its cow reference set, for all so } var_dump($b); unset($a, $b); - + echo "\n" . '$a->b[0]' . "\n"; $b = $a->b[0] = array('original'); foreach($a->b[0] as $k=>&$v) { @@ -68,7 +68,7 @@ Ensure foreach splits the iterated entity from its cow reference set, for all so } var_dump($b); unset($a, $b); - + echo "\n" . '$a->b[0][0]' . "\n"; $b = $a->b[0][0] = array('original'); foreach($a->b[0][0] as $k=>&$v) { @@ -76,7 +76,7 @@ Ensure foreach splits the iterated entity from its cow reference set, for all so } var_dump($b); unset($a, $b); - + echo "\n" . '$a->b[0]->c' . "\n"; $b = $a->b[0]->c = array('original'); foreach($a->b[0]->c as $k=>&$v) { @@ -84,11 +84,11 @@ Ensure foreach splits the iterated entity from its cow reference set, for all so } var_dump($b); unset($a, $b); - + class C { public static $a; } - + echo "\n" . 'C::$a' . "\n"; C::$a = array('original'); $b = C::$a; @@ -97,7 +97,7 @@ Ensure foreach splits the iterated entity from its cow reference set, for all so } var_dump($b); unset($a, $b); - + echo "\n" . 'C::$a[0]' . "\n"; C::$a[0] = array('original'); $b = C::$a[0]; @@ -106,7 +106,7 @@ Ensure foreach splits the iterated entity from its cow reference set, for all so } var_dump($b); unset(C::$a[0], $b); - + echo "\n" . 'C::$a[0]->b' . "\n"; C::$a[0]->b = array('original'); $b = C::$a[0]->b; diff --git a/tests/lang/foreachLoop.017.phpt b/tests/lang/foreachLoop.017.phpt index bbc21adaa3..d68a82cc4c 100644 --- a/tests/lang/foreachLoop.017.phpt +++ b/tests/lang/foreachLoop.017.phpt @@ -5,7 +5,7 @@ Ensure foreach works with arrays with Binary keys. $a = array ( "\x90" => 10 ); foreach ($a as $val=>$key) echo $key; echo "\nDone\n"; -?> +?> --EXPECT-- 10 Done diff --git a/tests/lang/foreachLoopIterator.001.phpt b/tests/lang/foreachLoopIterator.001.phpt index cba3827451..4ca5648e58 100644 --- a/tests/lang/foreachLoopIterator.001.phpt +++ b/tests/lang/foreachLoopIterator.001.phpt @@ -6,19 +6,19 @@ foreach with Iterator. class MealIterator implements Iterator { private $pos=0; private $myContent=array("breakfast", "lunch", "dinner"); - + public function valid() { global $indent; echo "$indent--> " . __METHOD__ . " ($this->pos)\n"; return $this->pos<3; } - + public function next() { global $indent; echo "$indent--> " . __METHOD__ . " ($this->pos)\n"; return $this->myContent[$this->pos++]; } - + public function rewind() { global $indent; echo "$indent--> " . __METHOD__ . " ($this->pos)\n"; @@ -30,13 +30,13 @@ class MealIterator implements Iterator { echo "$indent--> " . __METHOD__ . " ($this->pos)\n"; return $this->myContent[$this->pos]; } - + public function key() { global $indent; echo "$indent--> " . __METHOD__ . " ($this->pos)\n"; return "meal " . $this->pos; } - + } $f = new MealIterator; @@ -44,7 +44,7 @@ var_dump($f); echo "-----( Simple iteration: )-----\n"; foreach ($f as $k=>$v) { - echo "$k => $v\n"; + echo "$k => $v\n"; } $f->rewind(); @@ -54,14 +54,14 @@ $indent = " "; echo "\n\n\n-----( Nested iteration: )-----\n"; $count=1; foreach ($f as $k=>$v) { - echo "\nTop level " . $count++ . ": \n"; + echo "\nTop level " . $count++ . ": \n"; echo "$k => $v\n"; $indent = " "; foreach ($f as $k=>$v) { - echo " $k => $v\n"; + echo " $k => $v\n"; } $indent = " "; - + } ?> diff --git a/tests/lang/foreachLoopIterator.002.phpt b/tests/lang/foreachLoopIterator.002.phpt index a016dba2b6..fe38145c3b 100644 --- a/tests/lang/foreachLoopIterator.002.phpt +++ b/tests/lang/foreachLoopIterator.002.phpt @@ -14,7 +14,7 @@ class MyIterator implements Iterator { $f = new MyIterator; echo "-----( Try to iterate with &\$value: )-----\n"; foreach ($f as $k=>&$v) { - echo "$k => $v\n"; + echo "$k => $v\n"; } ?> diff --git a/tests/lang/foreachLoopIteratorAggregate.001.phpt b/tests/lang/foreachLoopIteratorAggregate.001.phpt index 094fc3b8bb..47baeab42c 100644 --- a/tests/lang/foreachLoopIteratorAggregate.001.phpt +++ b/tests/lang/foreachLoopIteratorAggregate.001.phpt @@ -5,19 +5,19 @@ foreach with iteratorAggregate class EnglishMealIterator implements Iterator { private $pos=0; private $myContent=array("breakfast", "dinner", "tea"); - + public function valid() { global $indent; echo "$indent--> " . __METHOD__ . " ($this->pos)\n"; return $this->pos < count($this->myContent); } - + public function next() { global $indent; echo "$indent--> " . __METHOD__ . " ($this->pos)\n"; $this->pos++; } - + public function rewind() { global $indent; echo "$indent--> " . __METHOD__ . " ($this->pos)\n"; @@ -29,31 +29,31 @@ class EnglishMealIterator implements Iterator { echo "$indent--> " . __METHOD__ . " ($this->pos)\n"; return $this->myContent[$this->pos]; } - + public function key() { global $indent; echo "$indent--> " . __METHOD__ . " ($this->pos)\n"; return "meal " . $this->pos; } - + } class FrenchMealIterator implements Iterator { private $pos=0; private $myContent=array("petit dejeuner", "dejeuner", "gouter", "dinner"); - + public function valid() { global $indent; echo "$indent--> " . __METHOD__ . " ($this->pos)\n"; return $this->pos < count($this->myContent); } - + public function next() { global $indent; echo "$indent--> " . __METHOD__ . " ($this->pos)\n"; $this->pos++; } - + public function rewind() { global $indent; echo "$indent--> " . __METHOD__ . " ($this->pos)\n"; @@ -65,30 +65,30 @@ class FrenchMealIterator implements Iterator { echo "$indent--> " . __METHOD__ . " ($this->pos)\n"; return $this->myContent[$this->pos]; } - + public function key() { global $indent; echo "$indent--> " . __METHOD__ . " ($this->pos)\n"; return "meal " . $this->pos; } - + } Class EuropeanMeals implements IteratorAggregate { - + private $storedEnglishMealIterator; private $storedFrenchMealIterator; - + public function __construct() { $this->storedEnglishMealIterator = new EnglishMealIterator; $this->storedFrenchMealIterator = new FrenchMealIterator; } - + public function getIterator() { global $indent; echo "$indent--> " . __METHOD__ . "\n"; - + //Alternate between English and French meals static $i = 0; if ($i++%2 == 0) { @@ -97,7 +97,7 @@ Class EuropeanMeals implements IteratorAggregate { return $this->storedFrenchMealIterator; } } - + } $f = new EuropeanMeals; @@ -105,11 +105,11 @@ var_dump($f); echo "-----( Simple iteration 1: )-----\n"; foreach ($f as $k=>$v) { - echo "$k => $v\n"; + echo "$k => $v\n"; } echo "-----( Simple iteration 2: )-----\n"; foreach ($f as $k=>$v) { - echo "$k => $v\n"; + echo "$k => $v\n"; } @@ -117,11 +117,11 @@ $indent = " "; echo "\n\n\n-----( Nested iteration: )-----\n"; $count=1; foreach ($f as $k=>$v) { - echo "\nTop level " . $count++ . ": \n"; + echo "\nTop level " . $count++ . ": \n"; echo "$k => $v\n"; $indent = " "; foreach ($f as $k=>$v) { - echo " $k => $v\n"; + echo " $k => $v\n"; } $indent = " "; } diff --git a/tests/lang/foreachLoopIteratorAggregate.002.phpt b/tests/lang/foreachLoopIteratorAggregate.002.phpt index 23f04feed2..d4b8d2f2da 100644 --- a/tests/lang/foreachLoopIteratorAggregate.002.phpt +++ b/tests/lang/foreachLoopIteratorAggregate.002.phpt @@ -31,7 +31,7 @@ class bad4 implements IteratorAggregate { function f($className) { try { foreach (new $className as $k=>$v) { - echo "$k => $v\n"; + echo "$k => $v\n"; } } catch (Exception $e) { echo $e->getLine() . ": " . $e->getMessage() ."\n"; diff --git a/tests/lang/foreachLoopIteratorAggregate.003.phpt b/tests/lang/foreachLoopIteratorAggregate.003.phpt index cb3586c005..adc8fe5351 100644 --- a/tests/lang/foreachLoopIteratorAggregate.003.phpt +++ b/tests/lang/foreachLoopIteratorAggregate.003.phpt @@ -5,19 +5,19 @@ foreach with nested iteratorAggregates class EnglishMealIterator implements Iterator { private $pos=0; private $myContent=array("breakfast", "dinner", "tea"); - + public function valid() { global $indent; echo "$indent--> " . __METHOD__ . " ($this->pos)\n"; return $this->pos<3; } - + public function next() { global $indent; echo "$indent--> " . __METHOD__ . " ($this->pos)\n"; return $this->myContent[$this->pos++]; } - + public function rewind() { global $indent; echo "$indent--> " . __METHOD__ . " ($this->pos)\n"; @@ -29,13 +29,13 @@ class EnglishMealIterator implements Iterator { echo "$indent--> " . __METHOD__ . " ($this->pos)\n"; return $this->myContent[$this->pos]; } - + public function key() { global $indent; echo "$indent--> " . __METHOD__ . " ($this->pos)\n"; return "meal " . $this->pos; } - + } class A1 implements IteratorAggregate { @@ -58,17 +58,17 @@ class A3 implements IteratorAggregate { echo "\n-----( A1: )-----\n"; foreach (new A1 as $k=>$v) { - echo "$k => $v\n"; + echo "$k => $v\n"; } echo "\n-----( A2: )-----\n"; foreach (new A2 as $k=>$v) { - echo "$k => $v\n"; + echo "$k => $v\n"; } echo "\n-----( A3: )-----\n"; foreach (new A3 as $k=>$v) { - echo "$k => $v\n"; + echo "$k => $v\n"; } ?> diff --git a/tests/lang/foreachLoopIteratorAggregate.004.phpt b/tests/lang/foreachLoopIteratorAggregate.004.phpt index 9a1e612c23..30c422b2c8 100644 --- a/tests/lang/foreachLoopIteratorAggregate.004.phpt +++ b/tests/lang/foreachLoopIteratorAggregate.004.phpt @@ -40,7 +40,7 @@ class c_iter implements Iterator { function __destruct() { } } - + class c implements IteratorAggregate { public $max = 3; diff --git a/tests/lang/foreachLoopObjects.001.phpt b/tests/lang/foreachLoopObjects.001.phpt index 985a00784a..93eeaadc6a 100644 --- a/tests/lang/foreachLoopObjects.001.phpt +++ b/tests/lang/foreachLoopObjects.001.phpt @@ -9,7 +9,7 @@ class C { public $c = "Original c"; protected $d = "Original d"; private $e = "Original e"; - + } echo "\n\nSimple loop.\n"; diff --git a/tests/lang/foreachLoopObjects.002.phpt b/tests/lang/foreachLoopObjects.002.phpt index 6961f69078..e1e96c86f0 100644 --- a/tests/lang/foreachLoopObjects.002.phpt +++ b/tests/lang/foreachLoopObjects.002.phpt @@ -17,7 +17,7 @@ class C { $v="changed.$k"; } } - + static function doForEach($obj) { echo "in C::doForEach\n"; foreach ($obj as $k=>&$v) { @@ -25,7 +25,7 @@ class C { $v="changed.$k"; } } - + function doForEachOnThis() { echo "in C::doForEachOnThis\n"; foreach ($this as $k=>&$v) { @@ -33,14 +33,14 @@ class C { $v="changed.$k"; } } - + } class D extends C { - + private $f = "Original f"; protected $g = "Original g"; - + static function doForEach($obj) { echo "in D::doForEach\n"; foreach ($obj as $k=>&$v) { @@ -63,7 +63,7 @@ class E extends D { public $b = "Overridden b"; public $c = "Overridden c"; protected $d = "Overridden d"; - private $e = "Overridden e"; + private $e = "Overridden e"; static function doForEach($obj) { echo "in E::doForEach\n"; diff --git a/tests/lang/foreachLoopObjects.003.phpt b/tests/lang/foreachLoopObjects.003.phpt index c90342364f..0d0e073eb6 100644 --- a/tests/lang/foreachLoopObjects.003.phpt +++ b/tests/lang/foreachLoopObjects.003.phpt @@ -44,7 +44,7 @@ foreach ($obj as $v) { echo "Loop detected\n"; break; } - var_dump($v); + var_dump($v); } var_dump($obj); @@ -56,9 +56,9 @@ foreach ($obj as &$v) { $obj->$newPropName = "Added property $counter"; if ($counter++>10) { echo "Loop detected\n"; - break; + break; } - var_dump($v); + var_dump($v); } var_dump($obj); @@ -67,7 +67,7 @@ $obj = new C; foreach ($obj as $v) { unset($obj->a); unset($obj->b); - unset($obj->c); + unset($obj->c); var_dump($v); } var_dump($obj); diff --git a/tests/lang/foreachLoopObjects.004.phpt b/tests/lang/foreachLoopObjects.004.phpt index c6cadad0f0..01e4e9fd9a 100644 --- a/tests/lang/foreachLoopObjects.004.phpt +++ b/tests/lang/foreachLoopObjects.004.phpt @@ -16,13 +16,13 @@ $obj = new C; $count=0; foreach ($obj as $v) { if ($v==$obj->b) { - unset($obj->b); + unset($obj->b); } var_dump($v); if (++$count>10) { echo "Loop detected.\n"; break; - } + } } var_dump($obj); diff --git a/tests/lang/foreachLoopObjects.005.phpt b/tests/lang/foreachLoopObjects.005.phpt index 1692bcd2fc..624d9ad10c 100644 --- a/tests/lang/foreachLoopObjects.005.phpt +++ b/tests/lang/foreachLoopObjects.005.phpt @@ -16,13 +16,13 @@ $obj = new C; $count=0; foreach ($obj as $v) { if ($v==$obj->a) { - unset($obj->c); + unset($obj->c); } var_dump($v); if (++$count>10) { echo "Loop detected.\n"; break; - } + } } var_dump($obj); @@ -30,13 +30,13 @@ echo "\nRemoving properties before the current element from an iterated object.\ $obj = new C; foreach ($obj as $v) { if ($v==$obj->b) { - unset($obj->a); + unset($obj->a); } var_dump($v); if (++$count>10) { echo "Loop detected.\n"; break; - } + } } var_dump($obj); diff --git a/tests/lang/foreachLoopObjects.006.phpt b/tests/lang/foreachLoopObjects.006.phpt index 5204aca9ca..3e9b73542a 100644 --- a/tests/lang/foreachLoopObjects.006.phpt +++ b/tests/lang/foreachLoopObjects.006.phpt @@ -30,7 +30,7 @@ foreach ($obj as $v) { if (++$count>10) { echo "Loop detected.\n"; break; - } + } } var_dump($obj); @@ -47,7 +47,7 @@ foreach ($obj as $v) { if (++$count>10) { echo "Loop detected.\n"; break; - } + } } var_dump($obj); diff --git a/tests/lang/func_get_arg.002.phpt b/tests/lang/func_get_arg.002.phpt index 6ab4f95719..5b80ec1773 100644 --- a/tests/lang/func_get_arg.002.phpt +++ b/tests/lang/func_get_arg.002.phpt @@ -9,7 +9,7 @@ function foo($a) var_dump($b); $b++; var_dump(func_get_arg(1)); - + } foo(2, 3); echo "\n"; diff --git a/tests/lang/func_get_arg.004.phpt b/tests/lang/func_get_arg.004.phpt index 5afe4c95eb..0a4547ec18 100644 --- a/tests/lang/func_get_arg.004.phpt +++ b/tests/lang/func_get_arg.004.phpt @@ -5,7 +5,7 @@ func_get_arg on non-existent arg function foo($a) { - var_dump(func_get_arg(2)); + var_dump(func_get_arg(2)); } foo(2, 3); echo "\n"; diff --git a/tests/lang/func_get_args.001.phpt b/tests/lang/func_get_args.001.phpt index 40083aeb37..a17cfb3d19 100644 --- a/tests/lang/func_get_args.001.phpt +++ b/tests/lang/func_get_args.001.phpt @@ -5,7 +5,7 @@ func_get_args with no args function foo() { - var_dump(func_get_args()); + var_dump(func_get_args()); } foo(); diff --git a/tests/lang/func_get_args.002.phpt b/tests/lang/func_get_args.002.phpt index 0a886c2f04..ea78d99a2b 100644 --- a/tests/lang/func_get_args.002.phpt +++ b/tests/lang/func_get_args.002.phpt @@ -5,7 +5,7 @@ func_get_args with variable number of args function foo($a) { - var_dump(func_get_args()); + var_dump(func_get_args()); } foo(1, 2, 3); diff --git a/tests/lang/func_get_args.003.phpt b/tests/lang/func_get_args.003.phpt index 44faf7ebf8..844288d904 100644 --- a/tests/lang/func_get_args.003.phpt +++ b/tests/lang/func_get_args.003.phpt @@ -3,7 +3,7 @@ func_get_args() outside of a function declaration --FILE-- <?php -var_dump(func_get_args()); +var_dump(func_get_args()); ?> --EXPECTREGEX-- diff --git a/tests/lang/func_num_args.001.phpt b/tests/lang/func_num_args.001.phpt index 117e8d0e06..5d7a91d25e 100644 --- a/tests/lang/func_num_args.001.phpt +++ b/tests/lang/func_num_args.001.phpt @@ -5,7 +5,7 @@ func_num_args with no args function foo() { - var_dump(func_num_args()); + var_dump(func_num_args()); } foo(); diff --git a/tests/lang/func_num_args.002.phpt b/tests/lang/func_num_args.002.phpt index 45246a7684..8586fad735 100644 --- a/tests/lang/func_num_args.002.phpt +++ b/tests/lang/func_num_args.002.phpt @@ -5,7 +5,7 @@ func_num_args with variable number of args function foo($a) { - var_dump(func_num_args()); + var_dump(func_num_args()); } foo(1, 2, 3); diff --git a/tests/lang/func_num_args.003.phpt b/tests/lang/func_num_args.003.phpt index dceabbd096..168f79d04e 100644 --- a/tests/lang/func_num_args.003.phpt +++ b/tests/lang/func_num_args.003.phpt @@ -3,7 +3,7 @@ func_num_args() outside of a function declaration --FILE-- <?php -var_dump(func_num_args()); +var_dump(func_num_args()); ?> --EXPECTF-- diff --git a/tests/lang/operators/add_basiclong_64bit.phpt b/tests/lang/operators/add_basiclong_64bit.phpt index eb55d5f210..0168843494 100644 --- a/tests/lang/operators/add_basiclong_64bit.phpt +++ b/tests/lang/operators/add_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1); $longVals = array( MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit, - MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, + MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1 ); @@ -24,18 +24,18 @@ error_reporting(E_ERROR); foreach ($longVals as $longVal) { foreach($otherVals as $otherVal) { - echo "--- testing: $longVal + $otherVal ---\n"; + echo "--- testing: $longVal + $otherVal ---\n"; var_dump($longVal+$otherVal); } } foreach ($otherVals as $otherVal) { foreach($longVals as $longVal) { - echo "--- testing: $otherVal + $longVal ---\n"; + echo "--- testing: $otherVal + $longVal ---\n"; var_dump($otherVal+$longVal); } } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/add_variationStr.phpt b/tests/lang/operators/add_variationStr.phpt index 9bf11ec698..cc5834c578 100644 --- a/tests/lang/operators/add_variationStr.phpt +++ b/tests/lang/operators/add_variationStr.phpt @@ -12,12 +12,12 @@ error_reporting(E_ERROR); foreach ($strVals as $strVal) { foreach($strVals as $otherVal) { - echo "--- testing: '$strVal' + '$otherVal' ---\n"; + echo "--- testing: '$strVal' + '$otherVal' ---\n"; var_dump($strVal+$otherVal); } } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/bitwiseAnd_basiclong_64bit.phpt b/tests/lang/operators/bitwiseAnd_basiclong_64bit.phpt index 5dc322873a..30bdcf4c60 100644 --- a/tests/lang/operators/bitwiseAnd_basiclong_64bit.phpt +++ b/tests/lang/operators/bitwiseAnd_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1); $longVals = array( MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit, - MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, + MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1 ); @@ -24,18 +24,18 @@ error_reporting(E_ERROR); foreach ($longVals as $longVal) { foreach($otherVals as $otherVal) { - echo "--- testing: $longVal & $otherVal ---\n"; + echo "--- testing: $longVal & $otherVal ---\n"; var_dump($longVal&$otherVal); } } foreach ($otherVals as $otherVal) { foreach($longVals as $longVal) { - echo "--- testing: $otherVal & $longVal ---\n"; + echo "--- testing: $otherVal & $longVal ---\n"; var_dump($otherVal&$longVal); } } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/bitwiseAnd_variationStr.phpt b/tests/lang/operators/bitwiseAnd_variationStr.phpt index 5b7cb10b12..50ddb9ddb5 100644 --- a/tests/lang/operators/bitwiseAnd_variationStr.phpt +++ b/tests/lang/operators/bitwiseAnd_variationStr.phpt @@ -12,12 +12,12 @@ error_reporting(E_ERROR); foreach ($strVals as $strVal) { foreach($strVals as $otherVal) { - echo "--- testing: '$strVal' & '$otherVal' ---\n"; + echo "--- testing: '$strVal' & '$otherVal' ---\n"; var_dump(bin2hex($strVal&$otherVal)); } } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/bitwiseNot_basiclong_64bit.phpt b/tests/lang/operators/bitwiseNot_basiclong_64bit.phpt index 86df2d771d..5b8d7c9c48 100644 --- a/tests/lang/operators/bitwiseNot_basiclong_64bit.phpt +++ b/tests/lang/operators/bitwiseNot_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1); $longVals = array( MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit, - MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, + MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1 ); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(~$longVal); } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/bitwiseNot_variationStr.phpt b/tests/lang/operators/bitwiseNot_variationStr.phpt index 98bca9e473..d0f8a75933 100644 --- a/tests/lang/operators/bitwiseNot_variationStr.phpt +++ b/tests/lang/operators/bitwiseNot_variationStr.phpt @@ -13,7 +13,7 @@ foreach ($strVals as $strVal) { echo "--- testing: '$strVal' ---\n"; var_dump(bin2hex(~$strVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/bitwiseOr_basiclong_64bit.phpt b/tests/lang/operators/bitwiseOr_basiclong_64bit.phpt index 50e35a1c28..960fd73e73 100644 --- a/tests/lang/operators/bitwiseOr_basiclong_64bit.phpt +++ b/tests/lang/operators/bitwiseOr_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1); $longVals = array( MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit, - MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, + MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1 ); @@ -24,18 +24,18 @@ error_reporting(E_ERROR); foreach ($longVals as $longVal) { foreach($otherVals as $otherVal) { - echo "--- testing: $longVal | $otherVal ---\n"; + echo "--- testing: $longVal | $otherVal ---\n"; var_dump($longVal|$otherVal); } } foreach ($otherVals as $otherVal) { foreach($longVals as $longVal) { - echo "--- testing: $otherVal | $longVal ---\n"; + echo "--- testing: $otherVal | $longVal ---\n"; var_dump($otherVal|$longVal); } } - + ?> ===DONE=== --EXPECT-- @@ -580,4 +580,4 @@ int(-1) --- testing: 9223372036854775807 | -9.2233720368548E+18 --- int(-1) ===DONE=== - + diff --git a/tests/lang/operators/bitwiseOr_variationStr.phpt b/tests/lang/operators/bitwiseOr_variationStr.phpt index 2d1d353788..a883c4687a 100644 --- a/tests/lang/operators/bitwiseOr_variationStr.phpt +++ b/tests/lang/operators/bitwiseOr_variationStr.phpt @@ -12,12 +12,12 @@ error_reporting(E_ERROR); foreach ($strVals as $strVal) { foreach($strVals as $otherVal) { - echo "--- testing: '$strVal' | '$otherVal' ---\n"; + echo "--- testing: '$strVal' | '$otherVal' ---\n"; var_dump(bin2hex($strVal|$otherVal)); } } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/bitwiseShiftLeft_basiclong_64bit.phpt b/tests/lang/operators/bitwiseShiftLeft_basiclong_64bit.phpt index 99626da6f1..218abf9d7a 100644 --- a/tests/lang/operators/bitwiseShiftLeft_basiclong_64bit.phpt +++ b/tests/lang/operators/bitwiseShiftLeft_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1); $longVals = array( MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit, - MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, + MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1 ); @@ -43,7 +43,7 @@ foreach ($otherVals as $otherVal) { } } } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt b/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt index 7300eca02c..1f66dfce4c 100644 --- a/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt +++ b/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt @@ -20,7 +20,7 @@ foreach ($strVals as $strVal) { } } } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/bitwiseShiftLeft_variationStr_64bit.phpt b/tests/lang/operators/bitwiseShiftLeft_variationStr_64bit.phpt index ddfd2f7c6d..c36e22fef4 100644 --- a/tests/lang/operators/bitwiseShiftLeft_variationStr_64bit.phpt +++ b/tests/lang/operators/bitwiseShiftLeft_variationStr_64bit.phpt @@ -17,7 +17,7 @@ error_reporting(E_ERROR); foreach ($strVals as $strVal) { foreach($strVals as $otherVal) { echo "--- testing: '$strVal' << '$otherVal' ---\n"; - try { + try { var_dump($strVal<<$otherVal); } catch (ArithmeticError $e) { echo "Exception: " . $e->getMessage() . "\n"; @@ -25,7 +25,7 @@ foreach ($strVals as $strVal) { } } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/bitwiseShiftRight_basiclong_64bit.phpt b/tests/lang/operators/bitwiseShiftRight_basiclong_64bit.phpt index 65e7e826b8..7a08ed09da 100644 --- a/tests/lang/operators/bitwiseShiftRight_basiclong_64bit.phpt +++ b/tests/lang/operators/bitwiseShiftRight_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1); $longVals = array( MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit, - MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, + MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1 ); @@ -43,7 +43,7 @@ foreach ($otherVals as $otherVal) { } } } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/bitwiseShiftRight_variationStr.phpt b/tests/lang/operators/bitwiseShiftRight_variationStr.phpt index a4c425aab3..e3c9c8962d 100644 --- a/tests/lang/operators/bitwiseShiftRight_variationStr.phpt +++ b/tests/lang/operators/bitwiseShiftRight_variationStr.phpt @@ -21,7 +21,7 @@ foreach ($strVals as $strVal) { } } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/bitwiseXor_basiclong_64bit.phpt b/tests/lang/operators/bitwiseXor_basiclong_64bit.phpt index 0bfd8089e6..a082617ea8 100644 --- a/tests/lang/operators/bitwiseXor_basiclong_64bit.phpt +++ b/tests/lang/operators/bitwiseXor_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1); $longVals = array( MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit, - MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, + MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1 ); @@ -24,18 +24,18 @@ error_reporting(E_ERROR); foreach ($longVals as $longVal) { foreach($otherVals as $otherVal) { - echo "--- testing: $longVal ^ $otherVal ---\n"; + echo "--- testing: $longVal ^ $otherVal ---\n"; var_dump($longVal^$otherVal); } } foreach ($otherVals as $otherVal) { foreach($longVals as $longVal) { - echo "--- testing: $otherVal ^ $longVal ---\n"; + echo "--- testing: $otherVal ^ $longVal ---\n"; var_dump($otherVal^$longVal); } } - + ?> ===DONE=== --EXPECT-- @@ -580,4 +580,4 @@ int(-2) --- testing: 9223372036854775807 ^ -9.2233720368548E+18 --- int(-1) ===DONE=== - + diff --git a/tests/lang/operators/bitwiseXor_variationStr.phpt b/tests/lang/operators/bitwiseXor_variationStr.phpt index 64d5eb75d8..dced933ee4 100644 --- a/tests/lang/operators/bitwiseXor_variationStr.phpt +++ b/tests/lang/operators/bitwiseXor_variationStr.phpt @@ -12,12 +12,12 @@ error_reporting(E_ERROR); foreach ($strVals as $strVal) { foreach($strVals as $otherVal) { - echo "--- testing: '$strVal' ^ '$otherVal' ---\n"; + echo "--- testing: '$strVal' ^ '$otherVal' ---\n"; var_dump(bin2hex($strVal^$otherVal)); } } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/divide_basiclong_64bit.phpt b/tests/lang/operators/divide_basiclong_64bit.phpt index 0dd08f534f..4349ae0025 100644 --- a/tests/lang/operators/divide_basiclong_64bit.phpt +++ b/tests/lang/operators/divide_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1); $longVals = array( MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit, - MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, + MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1 ); @@ -24,18 +24,18 @@ error_reporting(E_ERROR); foreach ($longVals as $longVal) { foreach($otherVals as $otherVal) { - echo "--- testing: $longVal / $otherVal ---\n"; + echo "--- testing: $longVal / $otherVal ---\n"; var_dump($longVal/$otherVal); } } foreach ($otherVals as $otherVal) { foreach($longVals as $longVal) { - echo "--- testing: $otherVal / $longVal ---\n"; + echo "--- testing: $otherVal / $longVal ---\n"; var_dump($otherVal/$longVal); } } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/divide_variationStr.phpt b/tests/lang/operators/divide_variationStr.phpt index 88ff8f1840..f908642765 100644 --- a/tests/lang/operators/divide_variationStr.phpt +++ b/tests/lang/operators/divide_variationStr.phpt @@ -12,12 +12,12 @@ error_reporting(E_ERROR); foreach ($strVals as $strVal) { foreach($strVals as $otherVal) { - echo "--- testing: '$strVal' / '$otherVal' ---\n"; + echo "--- testing: '$strVal' / '$otherVal' ---\n"; var_dump($strVal/$otherVal); } } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/modulus_basiclong_64bit.phpt b/tests/lang/operators/modulus_basiclong_64bit.phpt index 6806bd53a8..155649d203 100644 --- a/tests/lang/operators/modulus_basiclong_64bit.phpt +++ b/tests/lang/operators/modulus_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1); $longVals = array( MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit, - MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, + MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1 ); @@ -43,7 +43,7 @@ foreach ($otherVals as $otherVal) { } } } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/modulus_variationStr.phpt b/tests/lang/operators/modulus_variationStr.phpt index 6441428e3e..21765ecb7c 100644 --- a/tests/lang/operators/modulus_variationStr.phpt +++ b/tests/lang/operators/modulus_variationStr.phpt @@ -21,7 +21,7 @@ foreach ($strVals as $strVal) { } } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/multiply_basiclong_64bit.phpt b/tests/lang/operators/multiply_basiclong_64bit.phpt index 31d9188a77..512c3fbc18 100644 --- a/tests/lang/operators/multiply_basiclong_64bit.phpt +++ b/tests/lang/operators/multiply_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1); $longVals = array( MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit, - MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, + MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1 ); @@ -24,18 +24,18 @@ error_reporting(E_ERROR); foreach ($longVals as $longVal) { foreach($otherVals as $otherVal) { - echo "--- testing: $longVal * $otherVal ---\n"; + echo "--- testing: $longVal * $otherVal ---\n"; var_dump($longVal*$otherVal); } } foreach ($otherVals as $otherVal) { foreach($longVals as $longVal) { - echo "--- testing: $otherVal * $longVal ---\n"; + echo "--- testing: $otherVal * $longVal ---\n"; var_dump($otherVal*$longVal); } } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/multiply_variationStr.phpt b/tests/lang/operators/multiply_variationStr.phpt index 01d7e05074..50735e2548 100644 --- a/tests/lang/operators/multiply_variationStr.phpt +++ b/tests/lang/operators/multiply_variationStr.phpt @@ -12,12 +12,12 @@ error_reporting(E_ERROR); foreach ($strVals as $strVal) { foreach($strVals as $otherVal) { - echo "--- testing: '$strVal' * '$otherVal' ---\n"; + echo "--- testing: '$strVal' * '$otherVal' ---\n"; var_dump($strVal*$otherVal); } } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/negate_basiclong_64bit.phpt b/tests/lang/operators/negate_basiclong_64bit.phpt index 47b25e5397..bce8982126 100644 --- a/tests/lang/operators/negate_basiclong_64bit.phpt +++ b/tests/lang/operators/negate_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1); $longVals = array( MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit, - MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, + MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1 ); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(-$longVal); } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/negate_variationStr.phpt b/tests/lang/operators/negate_variationStr.phpt index ccff2fba2c..7956ef4a1c 100644 --- a/tests/lang/operators/negate_variationStr.phpt +++ b/tests/lang/operators/negate_variationStr.phpt @@ -13,7 +13,7 @@ foreach ($strVals as $strVal) { echo "--- testing: '$strVal' ---\n"; var_dump(-$strVal); } - + ?> ===DONE=== --EXPECTF-- diff --git a/tests/lang/operators/operator_equals_basic.phpt b/tests/lang/operators/operator_equals_basic.phpt index 9de4ed1a2a..1f83a48180 100644 --- a/tests/lang/operators/operator_equals_basic.phpt +++ b/tests/lang/operators/operator_equals_basic.phpt @@ -22,20 +22,20 @@ $invalid_float2 = array("- 67345.76567", "-67,345.76567", -67345.76566, -6.73457 $toCompare = array( - true, $valid_true, $valid_false, + true, $valid_true, $valid_false, false, $valid_false, $valid_true, $int1, $valid_int1, $invalid_int1, $int2, $valid_int2, $invalid_int2, $float1, $valid_float1, $invalid_float1, $float2, $valid_float2, $invalid_float2 ); - + $failed = false; for ($i = 0; $i < count($toCompare); $i +=3) { $typeToTest = $toCompare[$i]; $valid_compares = $toCompare[$i + 1]; $invalid_compares = $toCompare[$i + 2]; - + foreach($valid_compares as $compareVal) { if ($typeToTest == $compareVal) { // do nothing @@ -45,19 +45,19 @@ for ($i = 0; $i < count($toCompare); $i +=3) { $failed = true; } } - + foreach($invalid_compares as $compareVal) { if ($typeToTest == $compareVal) { echo "FAILED: '$typeToTest' == '$compareVal'\n"; $failed = true; } } - + } if ($failed == false) { echo "Test Passed\n"; } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/operator_equals_variation.phpt b/tests/lang/operators/operator_equals_variation.phpt index d72253404b..ad561454ae 100644 --- a/tests/lang/operators/operator_equals_variation.phpt +++ b/tests/lang/operators/operator_equals_variation.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -55,7 +55,7 @@ for ($i = 0; $i < count($invalidEqual); $i +=2) { if ($failed == false) { echo "Test Passed\n"; } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/operator_equals_variation_64bit.phpt b/tests/lang/operators/operator_equals_variation_64bit.phpt index ada6c2d7ec..15d440978e 100644 --- a/tests/lang/operators/operator_equals_variation_64bit.phpt +++ b/tests/lang/operators/operator_equals_variation_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -57,7 +57,7 @@ for ($i = 0; $i < count($invalidEqual); $i +=2) { if ($failed == false) { echo "Test Passed\n"; } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/operator_gt_basic.phpt b/tests/lang/operators/operator_gt_basic.phpt index db856c62e6..66c457f0b1 100644 --- a/tests/lang/operators/operator_gt_basic.phpt +++ b/tests/lang/operators/operator_gt_basic.phpt @@ -24,19 +24,19 @@ $toCompare = array( // boolean test will result in both sides being converted to boolean so !0 = true and true is not > true for example // also note that a string of "0" is converted to false but a string of "0.0" is converted to true // false cannot be tested as 0 can never be > 0 or 1 - true, $valid_false, $valid_true, + true, $valid_false, $valid_true, $int1, $valid_int1, $invalid_int1, $int2, $valid_int2, $invalid_int2, $float1, $valid_float1, $invalid_float1, $float2, $valid_float2, $invalid_float2 ); - + $failed = false; for ($i = 0; $i < count($toCompare); $i +=3) { $typeToTest = $toCompare[$i]; $valid_compares = $toCompare[$i + 1]; $invalid_compares = $toCompare[$i + 2]; - + foreach($valid_compares as $compareVal) { if ($typeToTest > $compareVal) { // do nothing @@ -46,14 +46,14 @@ for ($i = 0; $i < count($toCompare); $i +=3) { $failed = true; } } - + foreach($invalid_compares as $compareVal) { if ($typeToTest > $compareVal) { echo "FAILED: '$typeToTest' > '$compareVal'\n"; $failed = true; } } - + } if ($failed == false) { echo "Test Passed\n"; diff --git a/tests/lang/operators/operator_gt_or_equal_basic.phpt b/tests/lang/operators/operator_gt_or_equal_basic.phpt index f1b1e01048..006c22baeb 100644 --- a/tests/lang/operators/operator_gt_or_equal_basic.phpt +++ b/tests/lang/operators/operator_gt_or_equal_basic.phpt @@ -22,19 +22,19 @@ $invalid_float2 = array(-67345.76564, -6.734576564E4); $toCompare = array( true, array_merge($valid_false, $valid_true), NULL, - false, $valid_false, $valid_true, + false, $valid_false, $valid_true, $int1, $valid_int1, $invalid_int1, $int2, $valid_int2, $invalid_int2, $float1, $valid_float1, $invalid_float1, $float2, $valid_float2, $invalid_float2 ); - + $failed = false; for ($i = 0; $i < count($toCompare); $i +=3) { $typeToTest = $toCompare[$i]; $valid_compares = $toCompare[$i + 1]; $invalid_compares = $toCompare[$i + 2]; - + foreach($valid_compares as $compareVal) { if ($typeToTest >= $compareVal) { // do nothing @@ -44,7 +44,7 @@ for ($i = 0; $i < count($toCompare); $i +=3) { $failed = true; } } - + if ($invalid_compares != NULL) { foreach($invalid_compares as $compareVal) { if ($typeToTest >= $compareVal) { @@ -53,7 +53,7 @@ for ($i = 0; $i < count($toCompare); $i +=3) { } } } - + } if ($failed == false) { echo "Test Passed\n"; diff --git a/tests/lang/operators/operator_gt_or_equal_variation.phpt b/tests/lang/operators/operator_gt_or_equal_variation.phpt index 2355ab4c45..1e3a338e73 100644 --- a/tests/lang/operators/operator_gt_or_equal_variation.phpt +++ b/tests/lang/operators/operator_gt_or_equal_variation.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -55,7 +55,7 @@ for ($i = 0; $i < count($invalidGtOrEqual); $i +=2) { if ($failed == false) { echo "Test Passed\n"; } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/operator_gt_or_equal_variation_64bit.phpt b/tests/lang/operators/operator_gt_or_equal_variation_64bit.phpt index 8a1ed35f10..d6245abbfc 100644 --- a/tests/lang/operators/operator_gt_or_equal_variation_64bit.phpt +++ b/tests/lang/operators/operator_gt_or_equal_variation_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -55,7 +55,7 @@ for ($i = 0; $i < count($invalidGtOrEqual); $i +=2) { if ($failed == false) { echo "Test Passed\n"; } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/operator_gt_variation.phpt b/tests/lang/operators/operator_gt_variation.phpt index 937ebbbb63..4c56ec5e6a 100644 --- a/tests/lang/operators/operator_gt_variation.phpt +++ b/tests/lang/operators/operator_gt_variation.phpt @@ -2,7 +2,7 @@ Test > operator : max int 32bit range --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -50,7 +50,7 @@ for ($i = 0; $i < count($invalidGreaterThan); $i +=2) { if ($failed == false) { echo "Test Passed\n"; } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/operator_gt_variation_64bit.phpt b/tests/lang/operators/operator_gt_variation_64bit.phpt index 15c6b88319..60a34c8986 100644 --- a/tests/lang/operators/operator_gt_variation_64bit.phpt +++ b/tests/lang/operators/operator_gt_variation_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -54,7 +54,7 @@ for ($i = 0; $i < count($invalidGreaterThan); $i +=2) { if ($failed == false) { echo "Test Passed\n"; } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/operator_identical_basic.phpt b/tests/lang/operators/operator_identical_basic.phpt index e3a0fe272f..ad2277ae7a 100644 --- a/tests/lang/operators/operator_identical_basic.phpt +++ b/tests/lang/operators/operator_identical_basic.phpt @@ -15,7 +15,7 @@ $invalid_int2 = array("-67835", "-67835abc", " -67835", "-67835 ", -67835.000, $float1 = 57385.45835; $float2 = -67345.76567; -$valid_float1 = array(57385.45835, 5.738545835e4); +$valid_float1 = array(57385.45835, 5.738545835e4); $valid_float2 = array(-67345.76567, -6.734576567E4); $invalid_float1 = array("57385.45835", "57385.45835aaa", " 57385.45835", "57385. 45835", "57,385.45835", 57385.45834, 5.738545834e4); $invalid_float2 = array("-67345.76567", "-67345.76567aaa", " -67345.76567", "- 67345.76567", "-67,345.76567", -67345.76566, -6.734576566E4); @@ -29,13 +29,13 @@ $toCompare = array( $float1, $valid_float1, $invalid_float1, $float2, $valid_float2, $invalid_float2 ); - + $failed = false; for ($i = 0; $i < count($toCompare); $i +=3) { $typeToTest = $toCompare[$i]; $valid_compares = $toCompare[$i + 1]; $invalid_compares = $toCompare[$i + 2]; - + foreach($valid_compares as $compareVal) { if ($typeToTest === $compareVal) { // do nothing @@ -45,19 +45,19 @@ for ($i = 0; $i < count($toCompare); $i +=3) { $failed = true; } } - + foreach($invalid_compares as $compareVal) { if ($typeToTest === $compareVal) { echo "FAILED: '$typeToTest' == '$compareVal'\n"; $failed = true; } } - + } if ($failed == false) { echo "Test Passed\n"; } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/operator_identical_variation.phpt b/tests/lang/operators/operator_identical_variation.phpt index a215fef0a4..8b8e1dc7ea 100644 --- a/tests/lang/operators/operator_identical_variation.phpt +++ b/tests/lang/operators/operator_identical_variation.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -55,7 +55,7 @@ for ($i = 0; $i < count($invalidIdentical); $i +=2) { if ($failed == false) { echo "Test Passed\n"; } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/operator_identical_variation_64bit.phpt b/tests/lang/operators/operator_identical_variation_64bit.phpt index 0c8d398daf..cd098699f2 100644 --- a/tests/lang/operators/operator_identical_variation_64bit.phpt +++ b/tests/lang/operators/operator_identical_variation_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -57,7 +57,7 @@ for ($i = 0; $i < count($invalidIdentical); $i +=2) { if ($failed == false) { echo "Test Passed\n"; } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/operator_lt_basic.phpt b/tests/lang/operators/operator_lt_basic.phpt index 41f18ef9d2..4574fb7d1d 100644 --- a/tests/lang/operators/operator_lt_basic.phpt +++ b/tests/lang/operators/operator_lt_basic.phpt @@ -21,19 +21,19 @@ $invalid_float2 = array(-67345.76567, -6.734576567E4); $toCompare = array( - false, $valid_true, $valid_false, + false, $valid_true, $valid_false, $int1, $valid_int1, $invalid_int1, $int2, $valid_int2, $invalid_int2, $float1, $valid_float1, $invalid_float1, $float2, $valid_float2, $invalid_float2 ); - + $failed = false; for ($i = 0; $i < count($toCompare); $i +=3) { $typeToTest = $toCompare[$i]; $valid_compares = $toCompare[$i + 1]; $invalid_compares = $toCompare[$i + 2]; - + foreach($valid_compares as $compareVal) { if ($typeToTest < $compareVal) { // do nothing @@ -43,14 +43,14 @@ for ($i = 0; $i < count($toCompare); $i +=3) { $failed = true; } } - + foreach($invalid_compares as $compareVal) { if ($typeToTest < $compareVal) { echo "FAILED: '$typeToTest' < '$compareVal'\n"; $failed = true; } } - + } if ($failed == false) { echo "Test Passed\n"; diff --git a/tests/lang/operators/operator_lt_or_equal_basic.phpt b/tests/lang/operators/operator_lt_or_equal_basic.phpt index 85a86e1996..a8b4b43c6b 100644 --- a/tests/lang/operators/operator_lt_or_equal_basic.phpt +++ b/tests/lang/operators/operator_lt_or_equal_basic.phpt @@ -27,13 +27,13 @@ $toCompare = array( $float1, $valid_float1, $invalid_float1, $float2, $valid_float2, $invalid_float2 ); - + $failed = false; for ($i = 0; $i < count($toCompare); $i +=3) { $typeToTest = $toCompare[$i]; $valid_compares = $toCompare[$i + 1]; $invalid_compares = $toCompare[$i + 2]; - + foreach($valid_compares as $compareVal) { if ($typeToTest <= $compareVal) { // do nothing @@ -43,7 +43,7 @@ for ($i = 0; $i < count($toCompare); $i +=3) { $failed = true; } } - + if ($invalid_compares != NULL) { foreach($invalid_compares as $compareVal) { if ($typeToTest <= $compareVal) { @@ -52,7 +52,7 @@ for ($i = 0; $i < count($toCompare); $i +=3) { } } } - + } if ($failed == false) { echo "Test Passed\n"; diff --git a/tests/lang/operators/operator_lt_or_equal_variation.phpt b/tests/lang/operators/operator_lt_or_equal_variation.phpt index 5724511a0e..a003138ceb 100644 --- a/tests/lang/operators/operator_lt_or_equal_variation.phpt +++ b/tests/lang/operators/operator_lt_or_equal_variation.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -55,7 +55,7 @@ for ($i = 0; $i < count($invalidLtOrEqual); $i +=2) { if ($failed == false) { echo "Test Passed\n"; } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/operator_lt_or_equal_variation_64bit.phpt b/tests/lang/operators/operator_lt_or_equal_variation_64bit.phpt index f3b16c1fc9..50afd9b3e5 100644 --- a/tests/lang/operators/operator_lt_or_equal_variation_64bit.phpt +++ b/tests/lang/operators/operator_lt_or_equal_variation_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -55,7 +55,7 @@ for ($i = 0; $i < count($invalidLtOrEqual); $i +=2) { if ($failed == false) { echo "Test Passed\n"; } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/operator_lt_variation.phpt b/tests/lang/operators/operator_lt_variation.phpt index f210fe4657..18a6631665 100644 --- a/tests/lang/operators/operator_lt_variation.phpt +++ b/tests/lang/operators/operator_lt_variation.phpt @@ -2,7 +2,7 @@ Test < operator : max int 32bit range --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -48,7 +48,7 @@ for ($i = 0; $i < count($invalidLessThan); $i +=2) { if ($failed == false) { echo "Test Passed\n"; } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/operator_lt_variation_64bit.phpt b/tests/lang/operators/operator_lt_variation_64bit.phpt index 3ee274aea0..663b840e61 100644 --- a/tests/lang/operators/operator_lt_variation_64bit.phpt +++ b/tests/lang/operators/operator_lt_variation_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -52,7 +52,7 @@ for ($i = 0; $i < count($invalidLessThan); $i +=2) { if ($failed == false) { echo "Test Passed\n"; } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/operator_notequals_basic.phpt b/tests/lang/operators/operator_notequals_basic.phpt index cef0be6279..35bd83e445 100644 --- a/tests/lang/operators/operator_notequals_basic.phpt +++ b/tests/lang/operators/operator_notequals_basic.phpt @@ -22,20 +22,20 @@ $invalid_float2 = array("-67345.76567", "-67345.76567aaa", " -67345.76567", -6. $toCompare = array( - true, $valid_false, $valid_true, + true, $valid_false, $valid_true, false, $valid_true, $valid_false, $int1, $valid_int1, $invalid_int1, $int2, $valid_int2, $invalid_int2, $float1, $valid_float1, $invalid_float1, $float2, $valid_float2, $invalid_float2 ); - + $failed = false; for ($i = 0; $i < count($toCompare); $i +=3) { $typeToTest = $toCompare[$i]; $valid_compares = $toCompare[$i + 1]; $invalid_compares = $toCompare[$i + 2]; - + foreach($valid_compares as $compareVal) { if ($typeToTest != $compareVal && $typeToTest <> $compareVal) { // do nothing @@ -45,19 +45,19 @@ for ($i = 0; $i < count($toCompare); $i +=3) { $failed = true; } } - + foreach($invalid_compares as $compareVal) { if ($typeToTest != $compareVal || $typeToTest <> $compareVal) { echo "FAILED: '$typeToTest' != '$compareVal'\n"; $failed = true; } } - + } if ($failed == false) { echo "Test Passed\n"; } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/operator_notequals_variation.phpt b/tests/lang/operators/operator_notequals_variation.phpt index 25bbfc5859..137888506f 100644 --- a/tests/lang/operators/operator_notequals_variation.phpt +++ b/tests/lang/operators/operator_notequals_variation.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -37,7 +37,7 @@ for ($i = 0; $i < count($validNotEquals); $i +=2) { else { echo "FAILED: '$typeToTestVal' == '$compareVal'\n"; $failed = true; - } + } } } // test invalid values @@ -55,7 +55,7 @@ for ($i = 0; $i < count($invalidNotEquals); $i +=2) { if ($failed == false) { echo "Test Passed\n"; } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/operator_notequals_variation_64bit.phpt b/tests/lang/operators/operator_notequals_variation_64bit.phpt index 6fbc496fa5..ea06b49264 100644 --- a/tests/lang/operators/operator_notequals_variation_64bit.phpt +++ b/tests/lang/operators/operator_notequals_variation_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -57,7 +57,7 @@ for ($i = 0; $i < count($invalidNotEquals); $i +=2) { if ($failed == false) { echo "Test Passed\n"; } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/operator_notidentical_basic.phpt b/tests/lang/operators/operator_notidentical_basic.phpt index 9f21ea4bca..9c3db36cdc 100644 --- a/tests/lang/operators/operator_notidentical_basic.phpt +++ b/tests/lang/operators/operator_notidentical_basic.phpt @@ -17,7 +17,7 @@ $float1 = 57385.45835; $float2 = -67345.76567; $valid_float1 = array("57385.45835", "57385.45835aaa", " 57385.45835", "57385. 45835", "57,385.45835", 57385.45834, 5.738545834e4); $valid_float2 = array("-67345.76567", "-67345.76567aaa", " -67345.76567", "- 67345.76567", "-67,345.76567", -67345.76566, -6.734576566E4); -$invalid_float1 = array(57385.45835, 5.738545835e4); +$invalid_float1 = array(57385.45835, 5.738545835e4); $invalid_float2 = array(-67345.76567, -6.734576567E4); @@ -29,13 +29,13 @@ $toCompare = array( $float1, $valid_float1, $invalid_float1, $float2, $valid_float2, $invalid_float2 ); - + $failed = false; for ($i = 0; $i < count($toCompare); $i +=3) { $typeToTest = $toCompare[$i]; $valid_compares = $toCompare[$i + 1]; $invalid_compares = $toCompare[$i + 2]; - + foreach($valid_compares as $compareVal) { if ($typeToTest !== $compareVal) { // do nothing @@ -45,19 +45,19 @@ for ($i = 0; $i < count($toCompare); $i +=3) { $failed = true; } } - + foreach($invalid_compares as $compareVal) { if ($typeToTest !== $compareVal) { echo "FAILED: '$typeToTest' !== '$compareVal'\n"; $failed = true; } } - + } if ($failed == false) { echo "Test Passed\n"; } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/operator_notidentical_variation.phpt b/tests/lang/operators/operator_notidentical_variation.phpt index a9fbcf60e1..bae03f85b7 100644 --- a/tests/lang/operators/operator_notidentical_variation.phpt +++ b/tests/lang/operators/operator_notidentical_variation.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -36,7 +36,7 @@ for ($i = 0; $i < count($validNotIdentical); $i +=2) { } else { echo "FAILED: '$typeToTestVal' === '$compareVal'\n"; - $failed = true; + $failed = true; } } } @@ -56,7 +56,7 @@ for ($i = 0; $i < count($invalidNotIdentical); $i +=2) { if ($failed == false) { echo "Test Passed\n"; } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/operator_notidentical_variation_64bit.phpt b/tests/lang/operators/operator_notidentical_variation_64bit.phpt index aa5aab7a59..d24f8b6234 100644 --- a/tests/lang/operators/operator_notidentical_variation_64bit.phpt +++ b/tests/lang/operators/operator_notidentical_variation_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -57,7 +57,7 @@ for ($i = 0; $i < count($invalidNotIdentical); $i +=2) { if ($failed == false) { echo "Test Passed\n"; } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/operator_spaceship_basic.phpt b/tests/lang/operators/operator_spaceship_basic.phpt index 81b0516757..13b80612dc 100644 --- a/tests/lang/operators/operator_spaceship_basic.phpt +++ b/tests/lang/operators/operator_spaceship_basic.phpt @@ -24,19 +24,19 @@ $toCompare = array( // boolean test will result in both sides being converted to boolean so !0 = true and true is not > true for example // also note that a string of "0" is converted to false but a string of "0.0" is converted to true // false cannot be tested as 0 can never be > 0 or 1 - true, $valid_false, $valid_true, + true, $valid_false, $valid_true, $int1, $valid_int1, $invalid_int1, $int2, $valid_int2, $invalid_int2, $float1, $valid_float1, $invalid_float1, $float2, $valid_float2, $invalid_float2 ); - + $failed = false; for ($i = 0; $i < count($toCompare); $i +=3) { $typeToTest = $toCompare[$i]; $valid_compares = $toCompare[$i + 1]; $invalid_compares = $toCompare[$i + 2]; - + foreach($valid_compares as $compareVal) { if (($typeToTest <=> $compareVal) === 1) { // do nothing @@ -60,7 +60,7 @@ for ($i = 0; $i < count($toCompare); $i +=3) { $failed = true; } } - + foreach($invalid_compares as $compareVal) { if (($typeToTest <=> $compareVal) === 1) { echo "FAILED: ('$typeToTest' <=> '$compareVal') === 1\n"; @@ -75,7 +75,7 @@ for ($i = 0; $i < count($toCompare); $i +=3) { $failed = true; } } - + if (($typeToTest <=> $typeToTest) === 0) { // do nothing } diff --git a/tests/lang/operators/postdec_basiclong_64bit.phpt b/tests/lang/operators/postdec_basiclong_64bit.phpt index f3e825ca3d..5d0af4d553 100644 --- a/tests/lang/operators/postdec_basiclong_64bit.phpt +++ b/tests/lang/operators/postdec_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1); $longVals = array( MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit, - MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, + MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1 ); @@ -24,7 +24,7 @@ foreach ($longVals as $longVal) { $longVal--; var_dump($longVal); } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/postdec_variationStr.phpt b/tests/lang/operators/postdec_variationStr.phpt index 0db326d27e..da88951e46 100644 --- a/tests/lang/operators/postdec_variationStr.phpt +++ b/tests/lang/operators/postdec_variationStr.phpt @@ -14,7 +14,7 @@ foreach ($strVals as $strVal) { $strVal--; var_dump($strVal); } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/postinc_basiclong_64bit.phpt b/tests/lang/operators/postinc_basiclong_64bit.phpt index 18e8bddedd..d1003e22a5 100644 --- a/tests/lang/operators/postinc_basiclong_64bit.phpt +++ b/tests/lang/operators/postinc_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1); $longVals = array( MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit, - MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, + MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1 ); @@ -24,7 +24,7 @@ foreach ($longVals as $longVal) { $longVal++; var_dump($longVal); } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/postinc_variationStr.phpt b/tests/lang/operators/postinc_variationStr.phpt index 35e19888e1..c83d598fb7 100644 --- a/tests/lang/operators/postinc_variationStr.phpt +++ b/tests/lang/operators/postinc_variationStr.phpt @@ -14,7 +14,7 @@ foreach ($strVals as $strVal) { $strVal++; var_dump($strVal); } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/predec_basiclong_64bit.phpt b/tests/lang/operators/predec_basiclong_64bit.phpt index b2b11709b3..1f460a06e0 100644 --- a/tests/lang/operators/predec_basiclong_64bit.phpt +++ b/tests/lang/operators/predec_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1); $longVals = array( MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit, - MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, + MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1 ); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(--$longVal); } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/predec_variationStr.phpt b/tests/lang/operators/predec_variationStr.phpt index 1d1fade74d..8fb1bffac8 100644 --- a/tests/lang/operators/predec_variationStr.phpt +++ b/tests/lang/operators/predec_variationStr.phpt @@ -13,7 +13,7 @@ foreach ($strVals as $strVal) { echo "--- testing: '$strVal' ---\n"; var_dump(--$strVal); } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/preinc_basiclong_64bit.phpt b/tests/lang/operators/preinc_basiclong_64bit.phpt index e24cc283aa..40a03f9d7a 100644 --- a/tests/lang/operators/preinc_basiclong_64bit.phpt +++ b/tests/lang/operators/preinc_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1); $longVals = array( MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit, - MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, + MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1 ); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(++$longVal); } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/subtract_basiclong_64bit.phpt b/tests/lang/operators/subtract_basiclong_64bit.phpt index ca80e3f52d..0c403f343e 100644 --- a/tests/lang/operators/subtract_basiclong_64bit.phpt +++ b/tests/lang/operators/subtract_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1); $longVals = array( MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit, - MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, + MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1 ); @@ -24,18 +24,18 @@ error_reporting(E_ERROR); foreach ($longVals as $longVal) { foreach($otherVals as $otherVal) { - echo "--- testing: $longVal - $otherVal ---\n"; + echo "--- testing: $longVal - $otherVal ---\n"; var_dump($longVal-$otherVal); } } foreach ($otherVals as $otherVal) { foreach($longVals as $longVal) { - echo "--- testing: $otherVal - $longVal ---\n"; + echo "--- testing: $otherVal - $longVal ---\n"; var_dump($otherVal-$longVal); } } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/operators/subtract_variationStr.phpt b/tests/lang/operators/subtract_variationStr.phpt index 51b5ed4dca..393b172fb1 100644 --- a/tests/lang/operators/subtract_variationStr.phpt +++ b/tests/lang/operators/subtract_variationStr.phpt @@ -12,12 +12,12 @@ error_reporting(E_ERROR); foreach ($strVals as $strVal) { foreach($strVals as $otherVal) { - echo "--- testing: '$strVal' - '$otherVal' ---\n"; + echo "--- testing: '$strVal' - '$otherVal' ---\n"; var_dump($strVal-$otherVal); } } - + ?> ===DONE=== --EXPECT-- diff --git a/tests/lang/passByReference_005.phpt b/tests/lang/passByReference_005.phpt index d637467681..e3b0e21c5c 100644 --- a/tests/lang/passByReference_005.phpt +++ b/tests/lang/passByReference_005.phpt @@ -43,32 +43,32 @@ class C { function v($val) { $val = "Val changed"; } - + function r(&$ref) { $ref = "Ref changed"; } - + function vv($val1, $val2) { $val1 = "Val1 changed"; $val2 = "Val2 changed"; } - + function vr($val, &$ref) { $val = "Val changed"; $ref = "Ref changed"; } - + function rv(&$ref, $val) { $val = "Val changed"; $ref = "Ref changed"; } - + function rr(&$ref1, &$ref2) { $ref1 = "Ref1 changed"; $ref2 = "Ref2 changed"; } -} +} echo "\n ---- Pass by ref / pass by val: functions ----\n"; unset($u1, $u2); diff --git a/tests/lang/passByReference_006.phpt b/tests/lang/passByReference_006.phpt index d3857cac40..f725092618 100644 --- a/tests/lang/passByReference_006.phpt +++ b/tests/lang/passByReference_006.phpt @@ -30,7 +30,7 @@ class C { $ref5 = "Ref5 changed"; } -} +} echo "\n ---- Pass uninitialised array & object by ref: function call ---\n"; unset($u1, $u2, $u3, $u4, $u5); diff --git a/tests/lang/passByReference_007.phpt b/tests/lang/passByReference_007.phpt index 300ce56d7c..51594da0f3 100644 --- a/tests/lang/passByReference_007.phpt +++ b/tests/lang/passByReference_007.phpt @@ -7,7 +7,7 @@ class C { global $a; return $a; } - + static function &sreturnReference() { global $a; return $a; @@ -17,7 +17,7 @@ class C { global $a; return $a; } - + function &returnReference() { global $a; return $a; diff --git a/tests/lang/passByReference_010.phpt b/tests/lang/passByReference_010.phpt index c2e4ba1eaf..431659a24a 100644 --- a/tests/lang/passByReference_010.phpt +++ b/tests/lang/passByReference_010.phpt @@ -6,30 +6,30 @@ Passing assignments by reference function f(&$a) { var_dump($a); $a = "a.changed"; -} +} echo "\n\n---> Pass constant assignment by reference:\n"; f($a="a.original"); -var_dump($a); +var_dump($a); echo "\n\n---> Pass variable assignment by reference:\n"; unset($a); $a = "a.original"; f($b = $a); -var_dump($a); +var_dump($a); echo "\n\n---> Pass reference assignment by reference:\n"; unset($a, $b); $a = "a.original"; f($b =& $a); -var_dump($a); +var_dump($a); echo "\n\n---> Pass concat assignment by reference:\n"; unset($a, $b); $b = "b.original"; $a = "a.original"; f($b .= $a); -var_dump($a); +var_dump($a); ?> --EXPECTF-- diff --git a/tests/lang/returnByReference.004.phpt b/tests/lang/returnByReference.004.phpt index b37506ce0a..1b01bafae6 100644 --- a/tests/lang/returnByReference.004.phpt +++ b/tests/lang/returnByReference.004.phpt @@ -10,7 +10,7 @@ Class C { static function &returnConstantByRef() { return 100; } - + static function &returnVariableByRef() { return $GLOBALS['a']; } diff --git a/tests/lang/returnByReference.005.phpt b/tests/lang/returnByReference.005.phpt index adb11617c4..d446553973 100644 --- a/tests/lang/returnByReference.005.phpt +++ b/tests/lang/returnByReference.005.phpt @@ -6,11 +6,11 @@ Class C { function returnConstantByValue() { return 100; } - + function &returnConstantByRef() { return 100; } - + static function &returnVariableByRef() { return $GLOBALS['a']; } diff --git a/tests/lang/returnByReference.007.phpt b/tests/lang/returnByReference.007.phpt index e2ae4e6cd3..4879c16f93 100644 --- a/tests/lang/returnByReference.007.phpt +++ b/tests/lang/returnByReference.007.phpt @@ -6,15 +6,15 @@ class C { static function returnConstantByValue() { return 100; } - + static function &returnConstantByRef() { return 100; } - + static function &returnVariableByRef() { return $GLOBALS['a']; } - + static function &returnFunctionCallByRef($functionToCall) { return C::$functionToCall(); } diff --git a/tests/lang/returnByReference.008.phpt b/tests/lang/returnByReference.008.phpt index 6492342cb5..b39832b5d8 100644 --- a/tests/lang/returnByReference.008.phpt +++ b/tests/lang/returnByReference.008.phpt @@ -6,15 +6,15 @@ class C { function returnConstantByValue() { return 100; } - + function &returnConstantByRef() { return 100; } - + function &returnVariableByRef() { return $GLOBALS['a']; } - + function &returnFunctionCallByRef($functionToCall) { return $this->$functionToCall(); } diff --git a/tests/lang/returnByReference.009.phpt b/tests/lang/returnByReference.009.phpt index 9e7470edbc..0d51a22158 100644 --- a/tests/lang/returnByReference.009.phpt +++ b/tests/lang/returnByReference.009.phpt @@ -6,7 +6,7 @@ Returning a references returned by another function function &returnVarByRef () { $b=1; - return $b; + return $b; } function &testReturnVarByRef() { @@ -14,7 +14,7 @@ function &testReturnVarByRef() { } function returnVal () { -return 1; +return 1; } function &testReturnValByRef() { diff --git a/tests/lang/static_basic_001.phpt b/tests/lang/static_basic_001.phpt index e7a9ff163f..47da74d8ce 100644 --- a/tests/lang/static_basic_001.phpt +++ b/tests/lang/static_basic_001.phpt @@ -5,12 +5,12 @@ Static keyword - basic tests echo "\nSame variable used as static and non static.\n"; function staticNonStatic() { - echo "---------\n"; + echo "---------\n"; $a=0; - echo "$a\n"; + echo "$a\n"; static $a=10; echo "$a\n"; - $a++; + $a++; } staticNonStatic(); staticNonStatic(); diff --git a/tests/lang/static_basic_002.phpt b/tests/lang/static_basic_002.phpt index 06e2f724ec..7e4e0bc3f4 100644 --- a/tests/lang/static_basic_002.phpt +++ b/tests/lang/static_basic_002.phpt @@ -15,7 +15,7 @@ var_dump($a); function foo() { static $a = 13; static $a = 14; - + var_dump($a); } diff --git a/tests/lang/static_variation_001.phpt b/tests/lang/static_variation_001.phpt index 3c540368ed..d8ebfd2ea1 100644 --- a/tests/lang/static_variation_001.phpt +++ b/tests/lang/static_variation_001.phpt @@ -12,9 +12,9 @@ function f1() { static $a = array(4,5,6); var_dump($a); } - + var_dump($a); - + } f1(); @@ -25,12 +25,12 @@ eval(' static $b = array(10,11,12); '); function f2() { eval(' static $b = array(1,2,3); '); - + function g2a() { eval(' static $b = array(4,5,6); '); - var_dump($b); + var_dump($b); } - + eval('function g2b() { static $b = array(7, 8, 9); var_dump($b); } '); var_dump($b); } diff --git a/tests/lang/static_variation_002.phpt b/tests/lang/static_variation_002.phpt index 2be680822e..abb359c1d4 100644 --- a/tests/lang/static_variation_002.phpt +++ b/tests/lang/static_variation_002.phpt @@ -7,7 +7,7 @@ Class C { function f() { static $a = array(1,2,3); eval(' static $k = array(4,5,6); '); - + function cfg() { static $a = array(7,8,9); eval(' static $k = array(10,11,12); '); diff --git a/tests/lang/this_assignment.phpt b/tests/lang/this_assignment.phpt index 14644d69a9..a7c76174a5 100644 --- a/tests/lang/this_assignment.phpt +++ b/tests/lang/this_assignment.phpt @@ -6,7 +6,7 @@ class first { function me() { echo "first"; } - function who() { + function who() { global $a,$b; $this->me(); $a->me(); @@ -20,7 +20,7 @@ class first { class second { - function who() { + function who() { global $a,$b; $this->me(); $a->me(); diff --git a/tests/output/bug60321.phpt b/tests/output/bug60321.phpt index 9802a57ccd..e9c109dbf7 100644 --- a/tests/output/bug60321.phpt +++ b/tests/output/bug60321.phpt @@ -2,7 +2,7 @@ Bug #60321 (ob_get_status(true) no longer returns an array when buffer is empty) --FILE-- <?php -$return = ob_get_status(true); +$return = ob_get_status(true); var_dump($return); --EXPECT-- array(0) { diff --git a/tests/output/bug65593.phpt b/tests/output/bug65593.phpt index 3375a6bf08..2e40afa076 100644 --- a/tests/output/bug65593.phpt +++ b/tests/output/bug65593.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #65593 (ob_start(function(){ob_start();});) --FILE-- -<?php +<?php echo "Test\n"; ob_start(function(){ob_start();}); diff --git a/tests/output/flush_basic_001.phpt b/tests/output/flush_basic_001.phpt index 1cc363d63c..fb1ce2c208 100644 --- a/tests/output/flush_basic_001.phpt +++ b/tests/output/flush_basic_001.phpt @@ -2,11 +2,11 @@ Test basic functionality of flush() --FILE-- <?php -/* +/* * proto void flush(void) * Function is implemented in ext/standard/basic_functions.c. */ - + // Verify return type var_dump(flush()); diff --git a/tests/output/flush_error_001.phpt b/tests/output/flush_error_001.phpt index 1f079e6009..e80f69c6b8 100644 --- a/tests/output/flush_error_001.phpt +++ b/tests/output/flush_error_001.phpt @@ -2,7 +2,7 @@ Test wrong number of arguments for flush() (no impact) --FILE-- <?php -/* +/* * proto void flush(void) * Function is implemented in ext/standard/basic_functions.c. */ diff --git a/tests/output/ob_clean_basic_001.phpt b/tests/output/ob_clean_basic_001.phpt index afaa7e2f4a..a6d15d7aac 100644 --- a/tests/output/ob_clean_basic_001.phpt +++ b/tests/output/ob_clean_basic_001.phpt @@ -5,7 +5,7 @@ Test ob_clean() function : basic functionality /* Prototype : proto bool ob_clean(void) * Description: Clean (delete) the current output buffer * Source code: main/output.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ob_clean() : basic functionality ***\n"; diff --git a/tests/output/ob_clean_error_001.phpt b/tests/output/ob_clean_error_001.phpt index 8060c2be8b..53f3a53c0c 100644 --- a/tests/output/ob_clean_error_001.phpt +++ b/tests/output/ob_clean_error_001.phpt @@ -5,7 +5,7 @@ Test ob_clean() function : error conditions /* Prototype : proto bool ob_clean(void) * Description: Clean (delete) the current output buffer * Source code: main/output.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ob_clean() : error conditions ***\n"; diff --git a/tests/output/ob_end_clean_basic_001.phpt b/tests/output/ob_end_clean_basic_001.phpt index 54e840bdbd..87942c2f6d 100644 --- a/tests/output/ob_end_clean_basic_001.phpt +++ b/tests/output/ob_end_clean_basic_001.phpt @@ -2,10 +2,10 @@ Test return type and value, as well as basic behaviour, for ob_end_clean() --FILE-- <?php -/* +/* * proto bool ob_end_clean(void) * Function is implemented in main/output.c -*/ +*/ var_dump(ob_end_clean()); diff --git a/tests/output/ob_end_clean_error_001.phpt b/tests/output/ob_end_clean_error_001.phpt index 0279db7b41..09bacaa081 100644 --- a/tests/output/ob_end_clean_error_001.phpt +++ b/tests/output/ob_end_clean_error_001.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for ob_end_clean() --FILE-- <?php -/* +/* * proto bool ob_end_clean(void) * Function is implemented in main/output.c -*/ +*/ $extra_arg = 1; diff --git a/tests/output/ob_end_flush_basic_001.phpt b/tests/output/ob_end_flush_basic_001.phpt index cba7802761..5185a2efad 100644 --- a/tests/output/ob_end_flush_basic_001.phpt +++ b/tests/output/ob_end_flush_basic_001.phpt @@ -5,7 +5,7 @@ Test ob_end_flush() function : basic functionality /* Prototype : proto bool ob_end_flush(void) * Description: Flush (send) the output buffer, and delete current output buffer * Source code: main/output.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ob_end_flush() : basic functionality ***\n"; diff --git a/tests/output/ob_end_flush_error_001.phpt b/tests/output/ob_end_flush_error_001.phpt index 2cd9a64e0d..f1afb4bd3c 100644 --- a/tests/output/ob_end_flush_error_001.phpt +++ b/tests/output/ob_end_flush_error_001.phpt @@ -5,7 +5,7 @@ Test ob_end_flush() function : error conditions /* Prototype : proto bool ob_end_flush(void) * Description: Flush (send) the output buffer, and delete current output buffer * Source code: main/output.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ob_end_flush() : error conditions ***\n"; diff --git a/tests/output/ob_flush_basic_001.phpt b/tests/output/ob_flush_basic_001.phpt index 57de5e31ad..8e8349369d 100644 --- a/tests/output/ob_flush_basic_001.phpt +++ b/tests/output/ob_flush_basic_001.phpt @@ -5,7 +5,7 @@ Test ob_flush() function : basic functionality /* Prototype : proto bool ob_flush(void) * Description: Flush (send) contents of the output buffer. The last buffer content is sent to next buffer * Source code: main/output.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ob_flush() : basic functionality ***\n"; diff --git a/tests/output/ob_flush_error_001.phpt b/tests/output/ob_flush_error_001.phpt index f24a19b8ce..714d01cb70 100644 --- a/tests/output/ob_flush_error_001.phpt +++ b/tests/output/ob_flush_error_001.phpt @@ -5,7 +5,7 @@ Test ob_flush() function : error conditions /* Prototype : proto bool ob_flush(void) * Description: Flush (send) contents of the output buffer. The last buffer content is sent to next buffer * Source code: main/output.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ob_flush() : error conditions ***\n"; diff --git a/tests/output/ob_get_clean_basic_001.phpt b/tests/output/ob_get_clean_basic_001.phpt index 7e1c475c63..2ccf490485 100644 --- a/tests/output/ob_get_clean_basic_001.phpt +++ b/tests/output/ob_get_clean_basic_001.phpt @@ -2,10 +2,10 @@ Test return type and value, as well as basic behaviour, of ob_get_clean() --FILE-- <?php -/* +/* * proto bool ob_get_clean(void) * Function is implemented in main/output.c -*/ +*/ var_dump(ob_get_clean()); diff --git a/tests/output/ob_get_clean_basic_002.phpt b/tests/output/ob_get_clean_basic_002.phpt index c877642e23..9b74438594 100644 --- a/tests/output/ob_get_clean_basic_002.phpt +++ b/tests/output/ob_get_clean_basic_002.phpt @@ -2,10 +2,10 @@ Test basic behaviour of ob_get_clean() --FILE-- <?php -/* +/* * proto bool ob_get_clean(void) * Function is implemented in main/output.c -*/ +*/ ob_start(); diff --git a/tests/output/ob_get_clean_error_001.phpt b/tests/output/ob_get_clean_error_001.phpt index d6e2dd7b61..563e62c35a 100644 --- a/tests/output/ob_get_clean_error_001.phpt +++ b/tests/output/ob_get_clean_error_001.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for ob_get_clean() --FILE-- <?php -/* +/* * proto bool ob_get_clean(void) * Function is implemented in main/output.c -*/ +*/ $extra_arg = 1; diff --git a/tests/output/ob_get_contents_basic_001.phpt b/tests/output/ob_get_contents_basic_001.phpt index a3b1f0cb5e..2778c21d69 100644 --- a/tests/output/ob_get_contents_basic_001.phpt +++ b/tests/output/ob_get_contents_basic_001.phpt @@ -7,7 +7,7 @@ Iain Lewis <ilewis@php.net> /* Prototype : proto string ob_get_contents(void) * Description: Return the contents of the output buffer * Source code: main/output.c - * Alias to functions: + * Alias to functions: */ @@ -35,14 +35,14 @@ ob_end_flush(); echo "\ncheck that contents disappear after a flush\n"; ob_start(); -echo "Hello World\n"; +echo "Hello World\n"; ob_flush(); var_dump(ob_get_contents()); ob_end_flush(); echo "\ncheck that no contents found after an end\n"; ob_start(); -echo "Hello World\n"; +echo "Hello World\n"; ob_end_flush(); var_dump(ob_get_contents()); diff --git a/tests/output/ob_get_contents_error_001.phpt b/tests/output/ob_get_contents_error_001.phpt index 94e3f31368..00ccf30bef 100644 --- a/tests/output/ob_get_contents_error_001.phpt +++ b/tests/output/ob_get_contents_error_001.phpt @@ -7,7 +7,7 @@ Iain Lewis <ilewis@php.net> /* Prototype : proto string ob_get_contents(void) * Description: Return the contents of the output buffer * Source code: main/output.c - * Alias to functions: + * Alias to functions: */ diff --git a/tests/output/ob_get_length_basic_001.phpt b/tests/output/ob_get_length_basic_001.phpt index ef52044c0c..892d106719 100644 --- a/tests/output/ob_get_length_basic_001.phpt +++ b/tests/output/ob_get_length_basic_001.phpt @@ -2,10 +2,10 @@ Test return type and value, as well as basic behaviour, of ob_get_length() --FILE-- <?php -/* +/* * proto int ob_get_length(void) * Function is implemented in main/output.c -*/ +*/ echo "No output buffers\n"; var_dump(ob_get_length()); diff --git a/tests/output/ob_get_length_error_001.phpt b/tests/output/ob_get_length_error_001.phpt index 3de0cb10a8..8e4318122b 100644 --- a/tests/output/ob_get_length_error_001.phpt +++ b/tests/output/ob_get_length_error_001.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for ob_get_length() --FILE-- <?php -/* +/* * proto int ob_get_length(void) * Function is implemented in main/output.c -*/ +*/ $extra_arg = 1; diff --git a/tests/output/ob_get_level_basic_001.phpt b/tests/output/ob_get_level_basic_001.phpt index 65f3291355..fe8df5a17a 100644 --- a/tests/output/ob_get_level_basic_001.phpt +++ b/tests/output/ob_get_level_basic_001.phpt @@ -5,7 +5,7 @@ Test ob_get_level() function : basic functionality /* Prototype : proto int ob_get_level(void) * Description: Return the nesting level of the output buffer * Source code: main/output.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ob_get_level() : basic functionality ***\n"; diff --git a/tests/output/ob_get_level_error_001.phpt b/tests/output/ob_get_level_error_001.phpt index 9694da54a0..ede78fc17b 100644 --- a/tests/output/ob_get_level_error_001.phpt +++ b/tests/output/ob_get_level_error_001.phpt @@ -5,7 +5,7 @@ Test ob_get_level() function : error conditions /* Prototype : proto int ob_get_level(void) * Description: Return the nesting level of the output buffer * Source code: main/output.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ob_get_level() : error conditions ***\n"; diff --git a/tests/output/ob_implicit_flush_basic_001.phpt b/tests/output/ob_implicit_flush_basic_001.phpt index 2bbf8fd45a..b980dda917 100644 --- a/tests/output/ob_implicit_flush_basic_001.phpt +++ b/tests/output/ob_implicit_flush_basic_001.phpt @@ -5,7 +5,7 @@ Test ob_implicit_flush() function : check return value (always null). /* Prototype : proto void ob_implicit_flush([int flag]) * Description: Turn implicit flush on/off and is equivalent to calling flush() after every output call * Source code: main/output.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ob_implicit_flush() : check return value ***\n"; diff --git a/tests/output/ob_implicit_flush_basic_002.phpt b/tests/output/ob_implicit_flush_basic_002.phpt index df985a49b9..1f895d1037 100644 --- a/tests/output/ob_implicit_flush_basic_002.phpt +++ b/tests/output/ob_implicit_flush_basic_002.phpt @@ -5,7 +5,7 @@ Test ob_implicit_flush() function : ensure implicit flushing does not apply to u /* Prototype : proto void ob_implicit_flush([int flag]) * Description: Turn implicit flush on/off and is equivalent to calling flush() after every output call * Source code: main/output.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ob_implicit_flush() : ensure implicit flushing does not apply to user buffers. ***\n"; diff --git a/tests/output/ob_implicit_flush_error_001.phpt b/tests/output/ob_implicit_flush_error_001.phpt index 1fac1b34d9..c70304aecc 100644 --- a/tests/output/ob_implicit_flush_error_001.phpt +++ b/tests/output/ob_implicit_flush_error_001.phpt @@ -5,7 +5,7 @@ Test ob_implicit_flush() function : wrong number of arguments /* Prototype : proto void ob_implicit_flush([int flag]) * Description: Turn implicit flush on/off and is equivalent to calling flush() after every output call * Source code: main/output.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ob_implicit_flush() : error conditions ***\n"; diff --git a/tests/output/ob_implicit_flush_variation_001.phpt b/tests/output/ob_implicit_flush_variation_001.phpt index 8f2442f8f8..0e8ce5313d 100644 --- a/tests/output/ob_implicit_flush_variation_001.phpt +++ b/tests/output/ob_implicit_flush_variation_001.phpt @@ -7,7 +7,7 @@ Test ob_implicit_flush() function : usage variation /* Prototype : void ob_implicit_flush([int flag]) * Description: Turn implicit flush on/off and is equivalent to calling flush() after every output call * Source code: main/output.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ob_implicit_flush() : usage variation ***\n"; diff --git a/tests/output/ob_start_basic_001.phpt b/tests/output/ob_start_basic_001.phpt index 02275c62c5..0b06f6077f 100644 --- a/tests/output/ob_start_basic_001.phpt +++ b/tests/output/ob_start_basic_001.phpt @@ -2,10 +2,10 @@ Test return type and value for ob_start() --FILE-- <?php -/* +/* * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]]) * Function is implemented in main/output.c -*/ +*/ var_dump(ob_start()); diff --git a/tests/output/ob_start_basic_004.phpt b/tests/output/ob_start_basic_004.phpt index 9fe19e9b0f..11ced5779d 100644 --- a/tests/output/ob_start_basic_004.phpt +++ b/tests/output/ob_start_basic_004.phpt @@ -4,10 +4,10 @@ ob_start() chunk_size: confirm buffer is flushed after any output call that caus opcache.optimization_level=0 --FILE-- <?php -/* +/* * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]]) * Function is implemented in main/output.c -*/ +*/ // In HEAD, $chunk_size value of 1 should not have any special behaviour (http://marc.info/?l=php-internals&m=123476465621346&w=2). function callback($string) { global $callback_invocations; diff --git a/tests/output/ob_start_basic_005.phpt b/tests/output/ob_start_basic_005.phpt index 4048ad25a2..7cab6ed35f 100644 --- a/tests/output/ob_start_basic_005.phpt +++ b/tests/output/ob_start_basic_005.phpt @@ -2,10 +2,10 @@ ob_start(): non-static method as static callbacks. --FILE-- <?php -/* +/* * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]]) * Function is implemented in main/output.c -*/ +*/ Class C { function h($string) { diff --git a/tests/output/ob_start_basic_006.phpt b/tests/output/ob_start_basic_006.phpt index 464e71be33..d4d0fcc149 100644 --- a/tests/output/ob_start_basic_006.phpt +++ b/tests/output/ob_start_basic_006.phpt @@ -2,10 +2,10 @@ ob_start(): ensure multiple buffer initialization with a single call using arrays is not supported on PHP6 (http://bugs.php.net/42641) --FILE-- <?php -/* +/* * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]]) * Function is implemented in main/output.c -*/ +*/ function f($string) { static $i=0; @@ -27,7 +27,7 @@ Class C { $len = strlen($string); return "C::g[call:$i; len:$len] - $string\n"; } - + function h($string) { static $i=0; $i++; diff --git a/tests/output/ob_start_callbacks.phpt b/tests/output/ob_start_callbacks.phpt index da52d85f7f..6815bccd63 100644 --- a/tests/output/ob_start_callbacks.phpt +++ b/tests/output/ob_start_callbacks.phpt @@ -1,7 +1,7 @@ --TEST-- Test ob_start() with callbacks in variables --FILE-- -<?php +<?php // Closure in variable $a = function ($s) { return strtoupper($s); }; diff --git a/tests/output/ob_start_error_001.phpt b/tests/output/ob_start_error_001.phpt index 92372c7747..29288e2028 100644 --- a/tests/output/ob_start_error_001.phpt +++ b/tests/output/ob_start_error_001.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments and wrong arg types for ob_start() --FILE-- <?php -/* +/* * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]]) * Function is implemented in main/output.c -*/ +*/ function justPrint($str) { return $str; diff --git a/tests/output/ob_start_error_002.phpt b/tests/output/ob_start_error_002.phpt index 38c789908d..7cac3ee4b3 100644 --- a/tests/output/ob_start_error_002.phpt +++ b/tests/output/ob_start_error_002.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments and wrong arg types for ob_start() --FILE-- <?php -/* +/* * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]]) * Function is implemented in main/output.c -*/ +*/ Class C { static function f($str) { diff --git a/tests/output/ob_start_error_003.phpt b/tests/output/ob_start_error_003.phpt index 7fa292a739..3af56f7a2b 100644 --- a/tests/output/ob_start_error_003.phpt +++ b/tests/output/ob_start_error_003.phpt @@ -2,10 +2,10 @@ Test ob_start() with object supplied but no method. --FILE-- <?php -/* +/* * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]]) * Function is implemented in main/output.c -*/ +*/ Class C { } diff --git a/tests/output/ob_start_error_004.phpt b/tests/output/ob_start_error_004.phpt index 7ddf998557..83f5dc8d1c 100644 --- a/tests/output/ob_start_error_004.phpt +++ b/tests/output/ob_start_error_004.phpt @@ -2,10 +2,10 @@ Test ob_start() with non existent callback method. --FILE-- <?php -/* +/* * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]]) * Function is implemented in main/output.c -*/ +*/ Class C { } diff --git a/tests/output/ob_start_error_005.phpt b/tests/output/ob_start_error_005.phpt index 134f2249b7..d6f9dc4c10 100644 --- a/tests/output/ob_start_error_005.phpt +++ b/tests/output/ob_start_error_005.phpt @@ -3,10 +3,10 @@ ob_start(): ensure buffers can't be added from within callback. --FILE-- <?php -/* +/* * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]]) * Function is implemented in main/output.c -*/ +*/ function f($str) { ob_start(); diff --git a/tests/security/open_basedir_dir.phpt b/tests/security/open_basedir_dir.phpt index b1d6272bdc..6dababa54b 100644 --- a/tests/security/open_basedir_dir.phpt +++ b/tests/security/open_basedir_dir.phpt @@ -8,7 +8,7 @@ require_once "open_basedir.inc"; $initdir = getcwd(); test_open_basedir_before("dir"); -test_open_basedir_error("dir"); +test_open_basedir_error("dir"); var_dump(dir($initdir."/test/ok/")); var_dump(dir($initdir."/test/ok")); diff --git a/tests/security/open_basedir_disk_free_space.phpt b/tests/security/open_basedir_disk_free_space.phpt index 365300ae61..e04ed410c4 100644 --- a/tests/security/open_basedir_disk_free_space.phpt +++ b/tests/security/open_basedir_disk_free_space.phpt @@ -7,7 +7,7 @@ open_basedir=. require_once "open_basedir.inc"; $initdir = getcwd(); test_open_basedir_before("disk_free_space"); -test_open_basedir_error("disk_free_space"); +test_open_basedir_error("disk_free_space"); var_dump(disk_free_space($initdir."/test/ok")); test_open_basedir_after("disk_free_space"); diff --git a/tests/security/open_basedir_file.phpt b/tests/security/open_basedir_file.phpt index ad222e894b..e319482f7d 100644 --- a/tests/security/open_basedir_file.phpt +++ b/tests/security/open_basedir_file.phpt @@ -8,7 +8,7 @@ require_once "open_basedir.inc"; $initdir = getcwd(); test_open_basedir_before("file"); test_open_basedir_error("file"); - + var_dump(file("ok.txt")); var_dump(file("../ok/ok.txt")); var_dump(file($initdir."/test/ok/ok.txt")); diff --git a/tests/security/open_basedir_file_get_contents.phpt b/tests/security/open_basedir_file_get_contents.phpt index 8ee5ddb793..b5a34de074 100644 --- a/tests/security/open_basedir_file_get_contents.phpt +++ b/tests/security/open_basedir_file_get_contents.phpt @@ -8,7 +8,7 @@ require_once "open_basedir.inc"; $initdir = getcwd(); test_open_basedir_before("file_get_contents"); test_open_basedir_error("file_get_contents"); - + var_dump(file_get_contents("ok.txt")); var_dump(file_get_contents("../ok/ok.txt")); var_dump(file_get_contents($initdir."/test/ok/ok.txt")); diff --git a/tests/security/open_basedir_is_executable.phpt b/tests/security/open_basedir_is_executable.phpt index 375d4277cd..f0d8f20ba4 100644 --- a/tests/security/open_basedir_is_executable.phpt +++ b/tests/security/open_basedir_is_executable.phpt @@ -7,7 +7,7 @@ open_basedir=. require_once "open_basedir.inc"; $initdir = getcwd(); test_open_basedir_before("is_executable"); -test_open_basedir_error("is_executable"); +test_open_basedir_error("is_executable"); var_dump(is_executable("ok.txt")); var_dump(is_executable("../ok/ok.txt")); diff --git a/tests/security/open_basedir_opendir.phpt b/tests/security/open_basedir_opendir.phpt index 774b853569..fc3111e361 100644 --- a/tests/security/open_basedir_opendir.phpt +++ b/tests/security/open_basedir_opendir.phpt @@ -7,7 +7,7 @@ open_basedir=. require_once "open_basedir.inc"; $initdir = getcwd(); test_open_basedir_before("opendir"); -test_open_basedir_error("opendir"); +test_open_basedir_error("opendir"); var_dump(opendir($initdir."/test/ok/")); var_dump(opendir($initdir."/test/ok")); diff --git a/tests/security/open_basedir_scandir.phpt b/tests/security/open_basedir_scandir.phpt index caffaa1e5d..3ef9b153f4 100644 --- a/tests/security/open_basedir_scandir.phpt +++ b/tests/security/open_basedir_scandir.phpt @@ -7,7 +7,7 @@ open_basedir=. require_once "open_basedir.inc"; $initdir = getcwd(); test_open_basedir_before("scandir"); -test_open_basedir_error("scandir"); +test_open_basedir_error("scandir"); var_dump(scandir($initdir."/test/ok/")); var_dump(scandir($initdir."/test/ok")); diff --git a/tests/strings/001.phpt b/tests/strings/001.phpt index 98ceceb350..bf1fb67711 100644 --- a/tests/strings/001.phpt +++ b/tests/strings/001.phpt @@ -1,7 +1,7 @@ --TEST-- String functions --FILE-- -<?php +<?php error_reporting(0); diff --git a/tests/strings/004.phpt b/tests/strings/004.phpt index 7bcb452937..44bb000d14 100644 --- a/tests/strings/004.phpt +++ b/tests/strings/004.phpt @@ -7,7 +7,7 @@ highlight.keyword=#007700 highlight.default=#0000BB highlight.html=#000000 --FILE-- -<?php +<?php $var = highlight_string("<br /><?php echo \"foo\"; ?><br />"); $var = highlight_string("<br /><?php echo \"bar\"; ?><br />", TRUE); echo "\n[$var]\n"; |