diff options
Diffstat (limited to 'Zend')
575 files changed, 990 insertions, 991 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 3e990fb768..5addbbdecb 100644 --- a/Zend/tests/008.phpt +++ b/Zend/tests/008.phpt @@ -22,7 +22,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 45e1832914..d38f8adda5 100644 --- a/Zend/tests/010.phpt +++ b/Zend/tests/010.phpt @@ -41,7 +41,7 @@ var_dump(get_parent_class(1)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 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 0548a38f88..e3f64885d4 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 ); - // dump and see if its destroyed, expcted: NULL - var_dump( $scalar_var ); + unset( $scalar_var ); + // dump and see if its destroyed, expcted: NULL + 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,36 +90,36 @@ $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) ); var_dump( isset($array_var['non_existent'], $array_var['none']) ); var_dump( empty($array_var['non_existent']) ); - // testing empty and isset on arrays + // testing empty and isset on arrays var_dump( empty($array_var) ); // expecting bool(false), except: array(), which is considered empty var_dump( isset($array_var) ); // expecting bool(true), except: array(), which is not set - // get the keys of the $array_var + // get the keys of the $array_var $keys = array_keys($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,10 +127,10 @@ 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 + // dump the array to see that that array did not get modified // because of using isset, empty and unset on its element var_dump($array_var); } @@ -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,12 +183,12 @@ 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 + + // dump the resource to see if there any effect on it var_dump($resource); } // unset and dump the array containing all the resources to see that -// unset works correctly +// unset works correctly unset($resources); var_dump($resources); var_dump( isset($resources) ); //expected: bool(false) @@ -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; } @@ -215,8 +215,8 @@ class Point } $point1 = new Point(30,40); -// use unset/empty/isset to check the object -var_dump($point1); // dump the object +// use unset/empty/isset to check the object +var_dump($point1); // dump the object // check the object and member that is not set var_dump( isset($point1) ); // expected: bool(true) @@ -229,7 +229,7 @@ $point1->setLable("Point1"); var_dump( isset($point1->$lable) ); //expected: bool(true) var_dump( empty($point1->$lable) ); //expected: bool(false) -// dump the object to see that obj was not harmed +// dump the object to see that obj was not harmed // because of the usage of the isset & empty var_dump($point1); @@ -270,36 +270,36 @@ var_dump($point2); /* testing variation in operation for isset(), empty() & unset(). Note: Most of the variation for function unset() is testing by a - set of testcases named "Zend/tests/unset_cv??.phpt", only + set of testcases named "Zend/tests/unset_cv??.phpt", only variation not tested are attempted here */ echo "\n*** Testing possible variation in operation for isset(), empty() & unset() ***\n"; -/* unset() variation1: checking unset on static variable inside a function. +/* unset() variation1: checking unset on static variable inside a function. * unset() destroys the variable only in the context of the rest of a function * Following calls will restore the previous value of a variable. */ 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"; - // check using isset and empty + + 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"; - // check using isset and empty + 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(); @@ -308,10 +308,10 @@ test_unset1(); echo "\n** Testing unset() variation 2: unset on a variable passed by ref. inside of a function **\n"; -/* unset() variation2: Pass by reference - * If a variable that is PASSED BY REFERENCE is unset() inside of a function, +/* unset() variation2: Pass by reference + * If a variable that is PASSED BY REFERENCE is unset() inside of a function, * only the local variable is destroyed. The variable in the calling environment - * will retain the same value as before unset() was called. + * will retain the same value as before unset() was called. */ function test_unset2( &$ref_val ) { // unset the variable passed @@ -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) ); - + + // check the $global_var using isset and empty + 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) ); + + // check the $global_var using isset and empty + 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 6ad8af109d..873ea68f6f 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 4ed154f6f6..634aa50414 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"; ?> ---EXPECTF-- +--EXPECTF-- var1 value var2 value in func1 diff --git a/Zend/tests/add_001.phpt b/Zend/tests/add_001.phpt index 8d12aea11d..5286bc5b3c 100644 --- a/Zend/tests/add_001.phpt +++ b/Zend/tests/add_001.phpt @@ -29,7 +29,7 @@ var_dump($c); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(3) { [0]=> int(1) diff --git a/Zend/tests/add_002.phpt b/Zend/tests/add_002.phpt index 4d804fe3e8..ec3843fae0 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 int 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 a3705479e2..5f3c328c01 100644 --- a/Zend/tests/add_003.phpt +++ b/Zend/tests/add_003.phpt @@ -1,5 +1,5 @@ --TEST-- -adding arrays to objects +adding arrays to objects --FILE-- <?php @@ -19,7 +19,7 @@ var_dump($c); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Notice: Object of class stdClass could not be converted to int 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 7e9bc25d8f..af84c01da9 100644 --- a/Zend/tests/add_005.phpt +++ b/Zend/tests/add_005.phpt @@ -16,7 +16,7 @@ var_dump($c); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 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..6d9af8a9f5 100644 --- a/Zend/tests/add_007.phpt +++ b/Zend/tests/add_007.phpt @@ -1,5 +1,5 @@ --TEST-- -adding strings to arrays +adding strings to arrays --FILE-- <?php @@ -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 109b2ce995..0ebbc25fec 100644 --- a/Zend/tests/and_001.phpt +++ b/Zend/tests/and_001.phpt @@ -30,7 +30,7 @@ var_dump($s); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 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 599b3e1604..fab5227764 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 ) { - } + } } ?> --EXPECTF-- 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 4b3cd31b92..3dccc1cd60 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 d37ebbcbd8..d4a2e549f4 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"; ?> ---EXPECTF-- +--EXPECTF-- int(2) int(2) Done diff --git a/Zend/tests/assign_to_var_002.phpt b/Zend/tests/assign_to_var_002.phpt index e682765e53..6926da83cc 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"; ?> ---EXPECTF-- +--EXPECTF-- 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 911ee0bb8e..a0d8acbf29 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"; ?> ---EXPECTF-- +--EXPECTF-- NULL NULL Done diff --git a/Zend/tests/assign_to_var_004.phpt b/Zend/tests/assign_to_var_004.phpt index 787362acc4..36258bc155 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"; ?> ---EXPECTF-- +--EXPECTF-- 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 6e07a378c2..3e868ccaf9 100644 --- a/Zend/tests/bug21478.phpt +++ b/Zend/tests/bug21478.phpt @@ -1,7 +1,7 @@ --TEST-- -Bug #21478 (Zend/zend_alloc.c :: shutdown_memory_manager produces segfault) +Bug #21478 (Zend/zend_alloc.c :: shutdown_memory_manager produces segfault) --SKIPIF-- -<?php +<?php if (!function_exists('stream_filter_register')) die('skip stream_filter_register() not available'); ?> --FILE-- @@ -27,7 +27,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..7235859d3a 100644 --- a/Zend/tests/bug24635.phpt +++ b/Zend/tests/bug24635.phpt @@ -15,12 +15,12 @@ class SectionClass { $this->Comment = $comment; } function __destruct() { - out($this->Comment); // this line doesn't crash PHP + out($this->Comment); // this line doesn't crash PHP out("\n<!-- End Section: " . $this->Comment . "-->"); // this line } } 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 347eb55571..5d99a152b9 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..0ab4760d48 100644 --- a/Zend/tests/bug26802.phpt +++ b/Zend/tests/bug26802.phpt @@ -14,15 +14,15 @@ $function(); class foo { static $method = 'global_func'; - + static public function foo_func() { echo __METHOD__ . "\n"; } } -/* The following is a BC break with PHP 4 where it would - * call foo::fail. In PHP 5 we first evaluate static class +/* The following is a BC break with PHP 4 where it would + * call foo::fail. In PHP 5 we first evaluate static class * properties and then do the function call. */ $method = 'foo_func'; 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 771270f93b..275a33562a 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 72d953c9fa..a8dca37080 100644 --- a/Zend/tests/bug33771.phpt +++ b/Zend/tests/bug33771.phpt @@ -33,7 +33,7 @@ var_dump(error_reporting()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 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 0a89d23aa1..46b2487a62 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 catched\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/bug36568.phpt b/Zend/tests/bug36568.phpt index d621491a4c..e837b7df59 100644 --- a/Zend/tests/bug36568.phpt +++ b/Zend/tests/bug36568.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #36568 (memory_limit has no effect) --SKIPIF-- -<?php +<?php if (!function_exists('memory_get_usage')) die('skip PHP is configured without memory_limit'); ?> --INI-- 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/bug38461.phpt b/Zend/tests/bug38461.phpt index 281d999019..6f571876b8 100644 --- a/Zend/tests/bug38461.phpt +++ b/Zend/tests/bug38461.phpt @@ -21,5 +21,5 @@ $op->x = 'test'; echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- Done 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..d10e6d9ab7 100644 --- a/Zend/tests/bug39438.phpt +++ b/Zend/tests/bug39438.phpt @@ -19,12 +19,12 @@ $test2=array( 'lastuploaddate' => 1088427240, 'dependencies' => array ( 'depends' => array( - 'typo3' =>'', - 'php' =>'', + 'typo3' =>'', + 'php' =>'', 'cms' => '' - ), - 'conflicts' => array('' =>'') - ), + ), + 'conflicts' => array('' =>'') + ), 'authorname' => 'Mirko Balluff', 'authoremail' => 'balluff@amt1.de', 'ownerusername' => 'amt1', @@ -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 6f7477a9eb..cb38a5d971 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"; ?> ---EXPECTF-- +--EXPECTF-- 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 7caac215e0..3b8701d09d 100644 --- a/Zend/tests/bug41026.phpt +++ b/Zend/tests/bug41026.phpt @@ -20,7 +20,7 @@ try_class::main (); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 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 0751cbd690..d0a77a548c 100644 --- a/Zend/tests/bug41075.phpt +++ b/Zend/tests/bug41075.phpt @@ -26,6 +26,6 @@ try { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 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 9f6c5f8504..fc1db11087 100644 --- a/Zend/tests/bug43450.phpt +++ b/Zend/tests/bug43450.phpt @@ -8,7 +8,7 @@ opcache.enable_cli=0 <?php error_reporting(E_ALL|E_STRICT); -class Foo +class Foo { public function __toString() { @@ -19,7 +19,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/bug45742.phpt b/Zend/tests/bug45742.phpt index bde690b39a..1c28c35890 100644 --- a/Zend/tests/bug45742.phpt +++ b/Zend/tests/bug45742.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #45742 Wrong class array inpretetion using constant indexes +Bug #45742 Wrong class array inpretetion using constant indexes --FILE-- <?php class Constants { 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/bug45805.phpt b/Zend/tests/bug45805.phpt index 1bb03e917e..6e95149663 100644 --- a/Zend/tests/bug45805.phpt +++ b/Zend/tests/bug45805.phpt @@ -33,7 +33,7 @@ class B { set_error_handler( array('PHPUnit_Util_ErrorHandler', 'handleError'), E_ALL | E_STRICT ); - + $o = new B; $o->bar(); ?> 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 7526d802ab..13695f8afa 100644 --- a/Zend/tests/bug46196.phpt +++ b/Zend/tests/bug46196.phpt @@ -5,9 +5,9 @@ Olivier Doucet --FILE-- <?php /* Prototype : void restore_error_handler(void) - * Description: Restores the previously defined error handler function + * 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 4196fc77f3..aaf5a942a6 100644 --- a/Zend/tests/bug47353.phpt +++ b/Zend/tests/bug47353.phpt @@ -22,5 +22,5 @@ $a = new A(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 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/bug48228.phpt b/Zend/tests/bug48228.phpt index 1f0d0a54a1..9be02aa4d8 100644 --- a/Zend/tests/bug48228.phpt +++ b/Zend/tests/bug48228.phpt @@ -7,7 +7,7 @@ function do_throw() { throw new Exception(); } -class aa +class aa { function check() { 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 067e892e66..59b66641e0 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 9a6dade9e1..d28a41b273 100644 --- a/Zend/tests/bug53632.phpt +++ b/Zend/tests/bug53632.phpt @@ -6,5 +6,5 @@ $d = 2.2250738585072011e-308; echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 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 137a43fcaa..99d2bbe765 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()); } - + ?> --EXPECTF-- 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 1dcba1dbc5..0d39693808 100644 --- a/Zend/tests/bug60536_002.phpt +++ b/Zend/tests/bug60536_002.phpt @@ -5,7 +5,7 @@ The same rules are applied for properties that are defined in the class hierarch error_reporting(E_ALL | E_STRICT); class Base { - private $hello; + private $hello; } trait THello1 { @@ -31,7 +31,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 d944a0a41e..df3bc6cc1f 100644 --- a/Zend/tests/bug60536_003.phpt +++ b/Zend/tests/bug60536_003.phpt @@ -31,7 +31,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 e0c9dc0b4d..324a90e55d 100644 --- a/Zend/tests/bug60536_004.phpt +++ b/Zend/tests/bug60536_004.phpt @@ -5,7 +5,7 @@ Introducing new private variables of the same name in a subclass is ok, and does error_reporting(E_ALL | E_STRICT); class Base { - private $hello; + private $hello; } trait THello1 { @@ -29,7 +29,7 @@ class Notice extends Base { } echo "POST-CLASS-GUARD2\n"; ?> ---EXPECTF-- +--EXPECTF-- PRE-CLASS-GUARD POST-CLASS-GUARD POST-CLASS-GUARD2 diff --git a/Zend/tests/bug60536_005.phpt b/Zend/tests/bug60536_005.phpt index a285ed47ab..b8aa07ccb4 100644 --- a/Zend/tests/bug60536_005.phpt +++ b/Zend/tests/bug60536_005.phpt @@ -5,7 +5,7 @@ Introducing new private variables of the same name in a subclass is ok, and does error_reporting(E_ALL | E_STRICT); class Base { - protected $hello; + protected $hello; } trait THello1 { @@ -28,7 +28,7 @@ class Notice extends Base { } echo "POST-CLASS-GUARD2\n"; ?> ---EXPECTF-- +--EXPECTF-- 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 e6b0e60ff3..8c4bca992c 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/bug63462.phpt b/Zend/tests/bug63462.phpt index e936a6fa69..6e60d12d43 100644 --- a/Zend/tests/bug63462.phpt +++ b/Zend/tests/bug63462.phpt @@ -11,8 +11,8 @@ class Test { public function __construct() { unset( - $this->publicProperty, - $this->protectedProperty, + $this->publicProperty, + $this->protectedProperty, $this->privateProperty ); } diff --git a/Zend/tests/bug63635.phpt b/Zend/tests/bug63635.phpt index 6f6fc6a44f..03cbfaf751 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 $childs = array(); - + function __construct(Node $parent=NULL) { if ($parent) { $parent->childs[] = $this; } $this->childs[] = $this; } - + function __destruct() { $this->childs = NULL; - } + } } define("MAX", 16); diff --git a/Zend/tests/bug64354.phpt b/Zend/tests/bug64354.phpt index 03a4b80b4b..d881779df1 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/bug70785.phpt b/Zend/tests/bug70785.phpt index 3c427ba069..f48bc3cdb9 100644 --- a/Zend/tests/bug70785.phpt +++ b/Zend/tests/bug70785.phpt @@ -8,7 +8,7 @@ set_error_handler(function($no, $msg) { }); try { - if ($a === null) { // ZEND_VM_SMART_BRANCH + if ($a === null) { // ZEND_VM_SMART_BRANCH undefined_function('Null'); } } catch (Exception $e) { diff --git a/Zend/tests/bug70805.phpt b/Zend/tests/bug70805.phpt index ec835bcd1b..1177233184 100644 --- a/Zend/tests/bug70805.phpt +++ b/Zend/tests/bug70805.phpt @@ -37,7 +37,7 @@ $t[] = &$t; unset($t); // This is used to trigger C::__destruct while doing gc_colloct_roots $e = $a; -unset($a); // This one can not be putted into roots buf because it's full, thus gc_colloct_roots will be called, +unset($a); // This one can not be putted into roots buf because it's full, thus gc_colloct_roots will be called, // but C::__destructor which is called in gc_colloct_roots will put $a into buf // which will make $a be putted into gc roots buf twice var_dump(gc_collect_cycles()); 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/bug70914.phpt b/Zend/tests/bug70914.phpt index e5f5d7460e..0382076efb 100644 --- a/Zend/tests/bug70914.phpt +++ b/Zend/tests/bug70914.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #70914 zend_throw_or_error() format string vulnerability +Bug #70914 zend_throw_or_error() format string vulnerability --SKIPIF-- <?php if (!extension_loaded("pdo_sqlite")) { 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..7bde3aa95a 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 c0cf2f87ca..d530265d77 100644 --- a/Zend/tests/bug74408.phpt +++ b/Zend/tests/bug74408.phpt @@ -13,7 +13,7 @@ error_reporting = E_ALL | E_DEPRECATED | E_STRICT $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 e66d292971..e0615fc4a6 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 e9b35f9570..d6ac94dd4d 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 525b853fbf..d4554d62e2 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.phpt b/Zend/tests/cast_to_array.phpt Binary files differindex 5e351052bb..12261c8e84 100644 --- a/Zend/tests/cast_to_array.phpt +++ b/Zend/tests/cast_to_array.phpt diff --git a/Zend/tests/cast_to_bool.phpt b/Zend/tests/cast_to_bool.phpt index 75ab09d1b5..e0edd35ded 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"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(false) diff --git a/Zend/tests/cast_to_double.phpt b/Zend/tests/cast_to_double.phpt index a1a1adc1dc..d2ee8ca1e9 100644 --- a/Zend/tests/cast_to_double.phpt +++ b/Zend/tests/cast_to_double.phpt @@ -1,5 +1,5 @@ --TEST-- -casting different variables to double +casting different variables to double --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/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/cast_to_object.phpt b/Zend/tests/cast_to_object.phpt Binary files differindex 04d68053e2..b7e5f219f6 100644 --- a/Zend/tests/cast_to_object.phpt +++ b/Zend/tests/cast_to_object.phpt diff --git a/Zend/tests/cast_to_string.phpt b/Zend/tests/cast_to_string.phpt Binary files differindex f8b57a22c5..b3d245f1ed 100644 --- a/Zend/tests/cast_to_string.phpt +++ b/Zend/tests/cast_to_string.phpt 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 9aad8088da..726b9b8357 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 c2782ff1c9..d9f1236740 100644 --- a/Zend/tests/class_constants_003.phpt +++ b/Zend/tests/class_constants_003.phpt @@ -27,7 +27,7 @@ unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(1) int(5) Done diff --git a/Zend/tests/class_constants_004.phpt b/Zend/tests/class_constants_004.phpt index 73a42ede7a..1ca49ebdf0 100644 --- a/Zend/tests/class_constants_004.phpt +++ b/Zend/tests/class_constants_004.phpt @@ -21,9 +21,9 @@ $const = __NAMESPACE__ .'\\foo'; // class $const2 = __NAMESPACE__ .'\\Ifoo'; // interface var_dump( foo, - \foo\foo, - namespace\foo, - \foo\foo::foo, + \foo\foo, + namespace\foo, + \foo\foo::foo, $const::foo, \foo, constant('foo'), 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 68ebd9da38..dd7fe3ecff 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 error_reporting(E_ALL|E_STRICT); 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 77d7ce6906..8dd403fd56 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 5e5009c323..cbf2c953e3 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"; ?> ---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_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/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/debug_backtrace_with_include_and_this.phpt b/Zend/tests/debug_backtrace_with_include_and_this.phpt index 695c8d2150..7cc868105a 100644 --- a/Zend/tests/debug_backtrace_with_include_and_this.phpt +++ b/Zend/tests/debug_backtrace_with_include_and_this.phpt @@ -1,5 +1,5 @@ --TEST-- -debug_backtrace segmentation fault with include and error handler +debug_backtrace segmentation fault with include and error handler --FILE-- <?php class CLWrapper { 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..7873d624aa 100644 --- a/Zend/tests/dereference_001.phpt +++ b/Zend/tests/dereference_001.phpt @@ -12,11 +12,11 @@ var_dump(a()[1][0]); // int(5) function b() { return array(); } -var_dump(b()[0]); // Notice: Undefined offset: 0 +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 5fa264a11e..b53c4cdc31 100644 --- a/Zend/tests/div_001.phpt +++ b/Zend/tests/div_001.phpt @@ -25,7 +25,7 @@ var_dump($c); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 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..ba55c1a2c5 100644 --- a/Zend/tests/errmsg_017.phpt +++ b/Zend/tests/errmsg_017.phpt @@ -1,5 +1,5 @@ --TEST-- -errmsg: __unset() must take exactly 1 argument +errmsg: __unset() must take exactly 1 argument --FILE-- <?php @@ -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..b803499e50 100644 --- a/Zend/tests/errmsg_018.phpt +++ b/Zend/tests/errmsg_018.phpt @@ -1,5 +1,5 @@ --TEST-- -errmsg: static abstract function +errmsg: static abstract function --FILE-- <?php @@ -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..bb8ebff5ab 100644 --- a/Zend/tests/errmsg_019.phpt +++ b/Zend/tests/errmsg_019.phpt @@ -1,5 +1,5 @@ --TEST-- -errmsg: __destruct() cannot take arguments +errmsg: __destruct() cannot take arguments --FILE-- <?php @@ -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 011e6fdea9..abfb2b9c23 100644 --- a/Zend/tests/errmsg_024.phpt +++ b/Zend/tests/errmsg_024.phpt @@ -13,5 +13,5 @@ class test extends test1 { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 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 d5d2bf38d3..ec28bb71af 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"; ?> ---EXPECTF-- +--EXPECTF-- array(3) { [0]=> int(1) diff --git a/Zend/tests/errmsg_041.phpt b/Zend/tests/errmsg_041.phpt index bfcafd261d..2a60652a42 100644 --- a/Zend/tests/errmsg_041.phpt +++ b/Zend/tests/errmsg_041.phpt @@ -7,5 +7,5 @@ var_dump("abc" instanceof stdclass); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: instanceof expects an object instance, constant given in %s on line %d 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 175ea37e80..f3c4bca653 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"; ?> ---EXPECTF-- +--EXPECTF-- int(32767) Done diff --git a/Zend/tests/error_reporting07.phpt b/Zend/tests/error_reporting07.phpt index 09b7690d3c..fe7278cbec 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"; ?> ---EXPECTF-- +--EXPECTF-- 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 12b1db57ba..1b6501a975 100644 --- a/Zend/tests/error_reporting10.phpt +++ b/Zend/tests/error_reporting10.phpt @@ -29,7 +29,7 @@ var_dump(error_reporting()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 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 8f6572ef01..7a85cff021 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"; ?> ---EXPECTF-- +--EXPECTF-- 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 137a6cabb4..7e1636a0cf 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"; ?> ---EXPECTF-- +--EXPECTF-- 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 cc99bc6230..ca0ae07f81 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"; ?> ---EXPECTF-- +--EXPECTF-- string(25) "foo1(): Exception thrown!" diff --git a/Zend/tests/exception_handler_006.phpt b/Zend/tests/exception_handler_006.phpt index 05a5d927fa..904bb42383 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"; ?> ---EXPECTF-- +--EXPECTF-- string(24) "foo(): Exception thrown!" 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 1a7be521b2..d84f3dd9d4 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 188c70ab18..7d6a14e375 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"; ?> ---EXPECTF-- +--EXPECTF-- array(2) { ["a"]=> int(1) diff --git a/Zend/tests/function_exists_basic.phpt b/Zend/tests/function_exists_basic.phpt index 469e3d8c9a..5832231551 100644 --- a/Zend/tests/function_exists_basic.phpt +++ b/Zend/tests/function_exists_basic.phpt @@ -1,11 +1,11 @@ --TEST-- -function_exists function : basic functionality +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..8ce8a92885 100644 --- a/Zend/tests/function_exists_error.phpt +++ b/Zend/tests/function_exists_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test function_exists() function : error conditions +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/function_exists_variation1.phpt b/Zend/tests/function_exists_variation1.phpt index 16b05fc036..fc26f1e80e 100644 --- a/Zend/tests/function_exists_variation1.phpt +++ b/Zend/tests/function_exists_variation1.phpt @@ -3,10 +3,10 @@ Test function_exists() function : usage variations - test values for $str argume --FILE-- <?php -/* +/* * proto bool function_exists(string function_name) * Function is implemented in Zend/zend_builtin_functions.c -*/ +*/ echo "*** Testing function_exists() function: with unexpected inputs for 'str' argument ***\n"; @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource diff --git a/Zend/tests/gc_029_zts.phpt b/Zend/tests/gc_029_zts.phpt index 5d16e83348..b291b6d92b 100644 --- a/Zend/tests/gc_029_zts.phpt +++ b/Zend/tests/gc_029_zts.phpt @@ -1,6 +1,6 @@ --TEST-- GC 029: GC and destructors ---SKIPIF-- +--SKIPIF-- <?php if (!PHP_ZTS) { print "skip only for zts build"; } --INI-- zend.enable_gc=1 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 a2a3d0ca20..877b41cbcd 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 62f326c053..b95d43d3e1 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..f782b90892 100644 --- a/Zend/tests/get_defined_functions_basic.phpt +++ b/Zend/tests/get_defined_functions_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -get_defined_functions() function : basic functionality +get_defined_functions() function : basic functionality --FILE-- <?php @@ -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_functions_error.phpt b/Zend/tests/get_defined_functions_error.phpt index fadd804b99..1735446b2e 100644 --- a/Zend/tests/get_defined_functions_error.phpt +++ b/Zend/tests/get_defined_functions_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test get_defined_functions() function : error conditions +Test get_defined_functions() function : error conditions --FILE-- <?php @@ -17,7 +17,7 @@ $extra_arg = 10; $extra_arg2 = 20; var_dump( get_defined_functions($extra_arg, $extra_arg2) ); -?> +?> ===Done=== --EXPECTF-- *** Testing get_defined_functions() : error conditions *** @@ -26,5 +26,4 @@ var_dump( get_defined_functions($extra_arg, $extra_arg2) ); Warning: get_defined_functions() expects at most 1 parameter, 2 given in %s on line %d NULL - ===Done=== diff --git a/Zend/tests/get_defined_vars.phpt b/Zend/tests/get_defined_vars.phpt index 81aa97a455..e999bd291d 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"; -?> +?> --EXPECTF-- *** 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..9a9c5401fe 100644 --- a/Zend/tests/globals_001.phpt +++ b/Zend/tests/globals_001.phpt @@ -1,5 +1,5 @@ --TEST-- -globals in global scope +globals in global scope --INI-- variables_order="egpcs" --FILE-- @@ -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..6e21b7fbc0 100644 --- a/Zend/tests/globals_004.phpt +++ b/Zend/tests/globals_004.phpt @@ -1,5 +1,5 @@ --TEST-- -globals in local scope - 3 +globals in local scope - 3 --INI-- variables_order="egpcs" --FILE-- @@ -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 43218b1b05..059bb8192e 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/heredoc_017.phpt b/Zend/tests/heredoc_017.phpt index e0ffddf05f..6c4b8f3cde 100644 --- a/Zend/tests/heredoc_017.phpt +++ b/Zend/tests/heredoc_017.phpt @@ -1,7 +1,7 @@ --TEST-- Testinh heredoc syntax --FILE-- -<?php +<?php $a = <<<A A; 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 d9b56495e9..9d91985f23 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"; ?> ---EXPECTF-- +--EXPECTF-- 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..71c50c2595 100644 --- a/Zend/tests/inter_01.phpt +++ b/Zend/tests/inter_01.phpt @@ -1,5 +1,5 @@ --TEST-- -Inherited constant from interface +Inherited constant from interface --FILE-- <?php interface foo { @@ -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 ea0bd84760..f0278d04f6 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 20a2fd83bb..68582047d9 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 4fca6ddd72..75dcd1470e 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 ba293a2468..036c4d9517 100644 --- a/Zend/tests/lsb_015.phpt +++ b/Zend/tests/lsb_015.phpt @@ -1,5 +1,5 @@ --TEST-- -ZE2 Late Static Binding with exceptions +ZE2 Late Static Binding with exceptions --FILE-- <?php function foo() { @@ -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 1683ffe638..92a444aee8 100644 --- a/Zend/tests/lsb_019.phpt +++ b/Zend/tests/lsb_019.phpt @@ -1,5 +1,5 @@ --TEST-- -ZE2 Late Static Binding properties and methods declared as protected and overridden as public. +ZE2 Late Static Binding properties and methods declared as protected and overridden as public. --FILE-- <?php class TestClass { @@ -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 65ef97ab43..c1adbe4fa7 100644 --- a/Zend/tests/lsb_020.phpt +++ b/Zend/tests/lsb_020.phpt @@ -1,5 +1,5 @@ --TEST-- -ZE2 Late Static Binding properties and methods declared as public and overridden as public. +ZE2 Late Static Binding properties and methods declared as public and overridden as public. --FILE-- <?php class TestClass { @@ -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 6eb0f000c9..2d581f2ad7 100644 --- a/Zend/tests/not_001.phpt +++ b/Zend/tests/not_001.phpt @@ -16,7 +16,7 @@ var_dump(bin2hex($s1)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 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 84bcdb6916..63bef94673 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 28ef61bcdd..dfa35371b5 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 0a7c4bc82d..0df9b6f85e 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 0f85498e2c..036e6e22c0 100644 --- a/Zend/tests/objects_010.phpt +++ b/Zend/tests/objects_010.phpt @@ -12,5 +12,5 @@ class test { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 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_32bit.phpt b/Zend/tests/oct_overflow_32bit.phpt index 5b62778e40..af312b07d7 100644 --- a/Zend/tests/oct_overflow_32bit.phpt +++ b/Zend/tests/oct_overflow_32bit.phpt @@ -22,7 +22,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 9bf8a89da7..8357f99fc0 100644 --- a/Zend/tests/offset_bool.phpt +++ b/Zend/tests/offset_bool.phpt @@ -24,7 +24,7 @@ var_dump($bool[$arr]); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- NULL NULL NULL diff --git a/Zend/tests/offset_long.phpt b/Zend/tests/offset_long.phpt index c65a5ba3f8..88eae14361 100644 --- a/Zend/tests/offset_long.phpt +++ b/Zend/tests/offset_long.phpt @@ -24,7 +24,7 @@ var_dump($long[$arr]); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- NULL NULL NULL diff --git a/Zend/tests/offset_null.phpt b/Zend/tests/offset_null.phpt index 9364f0a2e5..e9f77a788e 100644 --- a/Zend/tests/offset_null.phpt +++ b/Zend/tests/offset_null.phpt @@ -24,7 +24,7 @@ var_dump($null[$arr]); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 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 1e4e5131a5..de09cee825 100644 --- a/Zend/tests/or_001.phpt +++ b/Zend/tests/or_001.phpt @@ -21,7 +21,7 @@ var_dump($s); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 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/return_types/030.phpt b/Zend/tests/return_types/030.phpt index 288137f05c..0550f6f40b 100644 --- a/Zend/tests/return_types/030.phpt +++ b/Zend/tests/return_types/030.phpt @@ -1,5 +1,5 @@ --TEST-- -Nullable return value +Nullable return value --FILE-- <?php function foo($x) : ?array { 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_array.phpt b/Zend/tests/settype_array.phpt Binary files differindex 5da023205e..562d349099 100644 --- a/Zend/tests/settype_array.phpt +++ b/Zend/tests/settype_array.phpt diff --git a/Zend/tests/settype_bool.phpt b/Zend/tests/settype_bool.phpt index cf59200b81..4413996724 100644 --- a/Zend/tests/settype_bool.phpt +++ b/Zend/tests/settype_bool.phpt @@ -36,7 +36,7 @@ foreach ($vars as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 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 0abf2f9810..ddf3601914 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"; ?> ---EXPECTF-- +--EXPECTF-- NULL NULL NULL diff --git a/Zend/tests/settype_object.phpt b/Zend/tests/settype_object.phpt Binary files differindex 7f9e5bc64b..be2694c312 100644 --- a/Zend/tests/settype_object.phpt +++ b/Zend/tests/settype_object.phpt diff --git a/Zend/tests/settype_resource.phpt b/Zend/tests/settype_resource.phpt Binary files differindex cc8cde34fd..a6721cb757 100644 --- a/Zend/tests/settype_resource.phpt +++ b/Zend/tests/settype_resource.phpt diff --git a/Zend/tests/settype_string.phpt b/Zend/tests/settype_string.phpt Binary files differindex d3beb54cb7..3a2d59ecae 100644 --- a/Zend/tests/settype_string.phpt +++ b/Zend/tests/settype_string.phpt 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 466b3f1c08..dd224675bc 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 612caa0662..4e811ba67c 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 9f5f03521e..2989814f39 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 78abe7d1bc..df12f9b554 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(); ?> ---EXPECTF-- +--EXPECTF-- 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 605b1d8e9e..0914cbf3d7 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(); ?> ---EXPECTF-- +--EXPECTF-- 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 56a3464067..00068e8cc7 100644 --- a/Zend/tests/traits/bugs/abstract-methods04.phpt +++ b/Zend/tests/traits/bugs/abstract-methods04.phpt @@ -1,5 +1,5 @@ --TEST-- -Abstract Trait Methods should behave like common abstract methods and +Abstract Trait Methods should behave like common abstract methods and implementstion may be provided by other traits. Sorting order shouldn't influence result. --FILE-- <?php @@ -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(); ?> ---EXPECTF-- +--EXPECTF-- 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 ac86692880..39eb82cbbd 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(); ?> ---EXPECTF-- +--EXPECTF-- 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 e0b5286e4f..d814dd3999 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(); ?> ---EXPECTF-- +--EXPECTF-- 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 0bbea11005..387c016492 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(); ?> ---EXPECTF-- +--EXPECTF-- 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 64712d40a4..db4386fbd9 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! ?> ---EXPECTF-- +--EXPECTF-- 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 aa7f03dcb8..e493430d16 100644 --- a/Zend/tests/traits/flattening001.phpt +++ b/Zend/tests/traits/flattening001.phpt @@ -36,7 +36,7 @@ $o->setText('bar'); var_dump($o->getText()); ?> ---EXPECTF-- +--EXPECTF-- 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 251af29711..71ec4b1450 100644 --- a/Zend/tests/traits/flattening002.phpt +++ b/Zend/tests/traits/flattening002.phpt @@ -1,5 +1,5 @@ --TEST-- -parent:: works like in a method defined without traits. +parent:: works like in a method defined without traits. --FILE-- <?php error_reporting(E_ALL); @@ -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(); ?> ---EXPECTF-- +--EXPECTF-- Hello World!
\ No newline at end of file diff --git a/Zend/tests/traits/flattening003.phpt b/Zend/tests/traits/flattening003.phpt index d189ca70c1..0e131a7792 100644 --- a/Zend/tests/traits/flattening003.phpt +++ b/Zend/tests/traits/flattening003.phpt @@ -28,5 +28,5 @@ $o = new MyHelloWorld(); $o->sayHello(); $o->sayWorld(); ?> ---EXPECTF-- +--EXPECTF-- Hello World!
\ No newline at end of file diff --git a/Zend/tests/traits/inheritance001.phpt b/Zend/tests/traits/inheritance001.phpt index e8195c4749..22d4ba666a 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! ?> ---EXPECTF-- +--EXPECTF-- Hello Universe!
\ No newline at end of file diff --git a/Zend/tests/traits/inheritance002.phpt b/Zend/tests/traits/inheritance002.phpt index 51badc5a4c..20c2afe1f4 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(); ?> ---EXPECTF-- +--EXPECTF-- 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 d892112416..e85dd5fb2f 100644 --- a/Zend/tests/traits/language001.phpt +++ b/Zend/tests/traits/language001.phpt @@ -17,5 +17,5 @@ class TraitsTest { $test = new TraitsTest(); $test->hello(); ?> ---EXPECTF-- +--EXPECTF-- Hello diff --git a/Zend/tests/traits/language002.phpt b/Zend/tests/traits/language002.phpt index d093f2952d..2c20133ebd 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(); ?> ---EXPECTF-- +--EXPECTF-- Hello World!
\ No newline at end of file diff --git a/Zend/tests/traits/language003.phpt b/Zend/tests/traits/language003.phpt index 77d4429f43..8324179265 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(); ?> ---EXPECTF-- +--EXPECTF-- Hello
\ No newline at end of file diff --git a/Zend/tests/traits/language004.phpt b/Zend/tests/traits/language004.phpt index 4df307ab8d..98673f14dc 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(); ?> ---EXPECTF-- +--EXPECTF-- Hello World
\ No newline at end of file diff --git a/Zend/tests/traits/language005.phpt b/Zend/tests/traits/language005.phpt index 20eaeb35c2..11e28af6e6 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(); ?> ---EXPECTF-- +--EXPECTF-- bAB
\ No newline at end of file diff --git a/Zend/tests/traits/language006.phpt b/Zend/tests/traits/language006.phpt index 5a32359bb5..6dc6ba9c98 100644 --- a/Zend/tests/traits/language006.phpt +++ b/Zend/tests/traits/language006.phpt @@ -27,5 +27,5 @@ $o->setWorld(' World!'); $o->sayHelloWorld(); ?> ---EXPECTF-- +--EXPECTF-- Hello World!
\ No newline at end of file diff --git a/Zend/tests/traits/language007.phpt b/Zend/tests/traits/language007.phpt index 3b65d0123a..3ccbc85929 100644 --- a/Zend/tests/traits/language007.phpt +++ b/Zend/tests/traits/language007.phpt @@ -26,5 +26,5 @@ $o->sayHello(); $o->sayWorld(); ?> ---EXPECTF-- +--EXPECTF-- 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 e55c8d84aa..db19eddc90 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(); ?> ---EXPECTF-- +--EXPECTF-- 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 481dd64ec7..439099d93a 100644 --- a/Zend/tests/traits/language012.phpt +++ b/Zend/tests/traits/language012.phpt @@ -22,6 +22,6 @@ $o->inc(); $o->inc(); ?> ---EXPECTF-- +--EXPECTF-- 1 2 diff --git a/Zend/tests/traits/language013.phpt b/Zend/tests/traits/language013.phpt index a55cbbed34..ec245b3fee 100644 --- a/Zend/tests/traits/language013.phpt +++ b/Zend/tests/traits/language013.phpt @@ -30,7 +30,7 @@ $p->inc(); $p->inc(); ?> ---EXPECTF-- +--EXPECTF-- 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 002a252a72..eb1c5a520e 100644 --- a/Zend/tests/traits/property001.phpt +++ b/Zend/tests/traits/property001.phpt @@ -32,7 +32,7 @@ class TraitsTest2 { var_dump(property_exists('TraitsTest', 'foo')); var_dump(property_exists('TraitsTest2', 'foo')); ?> ---EXPECTF-- +--EXPECTF-- 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 27361e04d2..4234484d95 100644 --- a/Zend/tests/traits/property002.phpt +++ b/Zend/tests/traits/property002.phpt @@ -26,7 +26,7 @@ var_dump(property_exists('TraitsTest', 'world')); $t = new TraitsTest; $t->test(); ?> ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) hello World!
\ No newline at end of file diff --git a/Zend/tests/traits/property003.phpt b/Zend/tests/traits/property003.phpt index b4f0105d20..dc88ce3178 100644 --- a/Zend/tests/traits/property003.phpt +++ b/Zend/tests/traits/property003.phpt @@ -24,7 +24,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
\ No newline at end of file diff --git a/Zend/tests/traits/property004.phpt b/Zend/tests/traits/property004.phpt index 393b492b7f..483108dfb0 100644 --- a/Zend/tests/traits/property004.phpt +++ b/Zend/tests/traits/property004.phpt @@ -24,7 +24,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
\ No newline at end of file diff --git a/Zend/tests/traits/property005.phpt b/Zend/tests/traits/property005.phpt index 3d2d4484f5..135f28a342 100644 --- a/Zend/tests/traits/property005.phpt +++ b/Zend/tests/traits/property005.phpt @@ -5,7 +5,7 @@ The same rules are applied for properties that are defined in the class hierarch error_reporting(E_ALL | E_STRICT); class Base { - private $hello; + private $hello; } trait THello1 { @@ -31,7 +31,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 bfe74543fd..0dd80d8ba2 100644 --- a/Zend/tests/traits/property006.phpt +++ b/Zend/tests/traits/property006.phpt @@ -5,7 +5,7 @@ Introducing new private variables of the same name in a subclass is ok, and does error_reporting(E_ALL | E_STRICT); class Base { - private $hello; + private $hello; } trait THello1 { @@ -29,7 +29,7 @@ class Notice extends Base { } echo "POST-CLASS-GUARD2\n"; ?> ---EXPECTF-- +--EXPECTF-- PRE-CLASS-GUARD POST-CLASS-GUARD POST-CLASS-GUARD2 diff --git a/Zend/tests/traits/property007.phpt b/Zend/tests/traits/property007.phpt index fb3c517876..bdaca61ef2 100644 --- a/Zend/tests/traits/property007.phpt +++ b/Zend/tests/traits/property007.phpt @@ -5,7 +5,7 @@ Introducing new private variables of the same name in a subclass is ok, and does error_reporting(E_ALL | E_STRICT); class Base { - protected $hello; + protected $hello; } trait THello1 { @@ -28,7 +28,7 @@ class Notice extends Base { } echo "POST-CLASS-GUARD2\n"; ?> ---EXPECTF-- +--EXPECTF-- PRE-CLASS-GUARD POST-CLASS-GUARD POST-CLASS-GUARD2 diff --git a/Zend/tests/traits/property008.phpt b/Zend/tests/traits/property008.phpt index e263692d60..5c463b596c 100644 --- a/Zend/tests/traits/property008.phpt +++ b/Zend/tests/traits/property008.phpt @@ -41,7 +41,7 @@ $b = new SubclassB; var_dump($b); ?> ---EXPECTF-- +--EXPECTF-- 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 0c3f597a0a..0ae27cd480 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 dab6af6a58..66db8cd97c 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 ad33c68131..df8db61c90 100644 --- a/Zend/tests/try/try_catch_finally_007.phpt +++ b/Zend/tests/try/try_catch_finally_007.phpt @@ -16,10 +16,10 @@ function foo($ret = FALSE) { } finally { var_dump("finally1"); throw new Exception("exception"); - } + } } catch (Exception $e) { goto local; -local: +local: var_dump("catched"); if ($ret) return "return"; } finally { 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 e1a521dff9..afcd6e76ec 100644 --- a/Zend/tests/xor_001.phpt +++ b/Zend/tests/xor_001.phpt @@ -11,6 +11,6 @@ var_dump($c); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(1) Done diff --git a/Zend/tests/xor_002.phpt b/Zend/tests/xor_002.phpt index 0cf4054fa4..ae07dfc031 100644 --- a/Zend/tests/xor_002.phpt +++ b/Zend/tests/xor_002.phpt @@ -29,7 +29,7 @@ var_dump(bin2hex($s)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(6) "030107" string(6) "030107" string(8) "070a1e11" diff --git a/Zend/tests/xor_003.phpt b/Zend/tests/xor_003.phpt index 8aa1c636b7..8b15025ec6 100644 --- a/Zend/tests/xor_003.phpt +++ b/Zend/tests/xor_003.phpt @@ -12,7 +12,7 @@ var_dump($f ^ $f); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(1) int(0) int(0) diff --git a/Zend/tests/zend_strtod.phpt b/Zend/tests/zend_strtod.phpt index 7f4bca5966..f7089932f2 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"; ?> ---EXPECTF-- +--EXPECTF-- float(-100) float(808792757210) float(-4.5646456464565E+27) |