diff --git a/hphp/test/zend/bad/001.php.exp b/hphp/test/zend/bad/001.php.exp index ad4ab7020..de30f3991 100644 --- a/hphp/test/zend/bad/001.php.exp +++ b/hphp/test/zend/bad/001.php.exp @@ -1,16 +1,13 @@ int(0) int(1) - HipHop Warning: Missing argument 1 for test2(), called in hphp/test/zend/bad/001.php on line %d int(0) int(2) int(0) - HipHop Warning: Missing argument 2 for test3() in hphp/test/zend/bad/001.php on line %d int(1) int(2) int(1) - HipHop Warning: func_num_args(): Called from the global scope - no function context in hphp/test/zend/bad/001.php on line %d int(-1) Done diff --git a/hphp/test/zend/bad/002.php.exp b/hphp/test/zend/bad/002.php.exp index 2d61d2b53..89c1c1f1c 100644 --- a/hphp/test/zend/bad/002.php.exp +++ b/hphp/test/zend/bad/002.php.exp @@ -1,63 +1,45 @@ HipHop Warning: func_get_arg(): The argument number should be >= 0 in hphp/test/zend/bad/002.php on line %d bool(false) - HipHop Warning: func_get_arg(): Argument 0 not passed to function in hphp/test/zend/bad/002.php on line %d bool(false) - HipHop Warning: func_get_arg(): Argument 1 not passed to function in hphp/test/zend/bad/002.php on line %d bool(false) - HipHop Warning: func_get_arg(): The argument number should be >= 0 in hphp/test/zend/bad/002.php on line %d bool(false) int(10) - HipHop Warning: func_get_arg(): Argument 1 not passed to function in hphp/test/zend/bad/002.php on line %d bool(false) int(1) - HipHop Warning: func_get_arg(): Argument 1 not passed to function in hphp/test/zend/bad/002.php on line %d bool(false) - HipHop Warning: Missing argument 1 for test2(), called in hphp/test/zend/bad/002.php on line %d and defined in hphp/test/zend/bad/002.php on line %d - HipHop Warning: func_get_arg(): Argument 0 not passed to function in hphp/test/zend/bad/002.php on line %d bool(false) - HipHop Warning: func_get_arg(): Argument 1 not passed to function in hphp/test/zend/bad/002.php on line %d bool(false) int(1) int(2) - HipHop Warning: func_get_arg(): Argument 2 not passed to function in hphp/test/zend/bad/002.php on line %d bool(false) - HipHop Warning: func_get_arg(): The argument number should be >= 0 in hphp/test/zend/bad/002.php on line %d bool(false) - HipHop Warning: func_get_arg(): Argument 0 not passed to function in hphp/test/zend/bad/002.php on line %d bool(false) - HipHop Warning: func_get_arg(): Argument 1 not passed to function in hphp/test/zend/bad/002.php on line %d bool(false) - HipHop Warning: Missing argument 2 for test3() in hphp/test/zend/bad/002.php on line %d int(1) - HipHop Warning: func_get_arg(): Argument 1 not passed to function in hphp/test/zend/bad/002.php on line %d bool(false) - HipHop Warning: func_get_arg(): Argument 2 not passed to function in hphp/test/zend/bad/002.php on line %d bool(false) int(1) int(2) - HipHop Warning: func_get_arg(): Argument 2 not passed to function in hphp/test/zend/bad/002.php on line %d bool(false) int(1) - HipHop Warning: func_get_arg(): Argument 1 not passed to function in hphp/test/zend/bad/002.php on line %d bool(false) - HipHop Warning: func_get_arg(): Called from the global scope - no function context in hphp/test/zend/bad/002.php on line %d bool(false) Done diff --git a/hphp/test/zend/bad/003.php.exp b/hphp/test/zend/bad/003.php.exp index 8260ce163..e546da3d3 100644 --- a/hphp/test/zend/bad/003.php.exp +++ b/hphp/test/zend/bad/003.php.exp @@ -8,7 +8,6 @@ array(1) { [0]=> int(1) } - HipHop Warning: Missing argument 1 for test2(), called in hphp/test/zend/bad/003.php on line %d and defined in hphp/test/zend/bad/003.php on line %d array(0) { } @@ -20,7 +19,6 @@ array(2) { } array(0) { } - HipHop Warning: Missing argument 2 for test3() in hphp/test/zend/bad/003.php on line %d array(1) { [0]=> @@ -36,7 +34,6 @@ array(1) { [0]=> int(1) } - HipHop Warning: func_get_args(): Called from the global scope - no function context in hphp/test/zend/bad/003.php on line %d bool(false) Done diff --git a/hphp/test/zend/bad/004.php.exp b/hphp/test/zend/bad/004.php.exp index 0bf4ea9c6..44e7df854 100644 --- a/hphp/test/zend/bad/004.php.exp +++ b/hphp/test/zend/bad/004.php.exp @@ -1,7 +1,6 @@ HipHop Warning: strncmp() expects exactly 3 parameters, 2 given in hphp/test/zend/bad/004.php on line %d NULL int(0) - HipHop Warning: Length must be greater than or equal to 0 in hphp/test/zend/bad/004.php on line %d bool(false) int(0) diff --git a/hphp/test/zend/bad/006.php.exp b/hphp/test/zend/bad/006.php.exp index 488c8b48a..12f134423 100644 --- a/hphp/test/zend/bad/006.php.exp +++ b/hphp/test/zend/bad/006.php.exp @@ -1,6 +1,5 @@ HipHop Warning: strncasecmp() expects exactly 3 parameters, 1 given in hphp/test/zend/bad/006.php on line %d NULL - HipHop Warning: Length must be greater than or equal to 0 in hphp/test/zend/bad/006.php on line %d bool(false) int(0) diff --git a/hphp/test/zend/bad/007.php.exp b/hphp/test/zend/bad/007.php.exp index 335e836fc..ede82d4e0 100644 --- a/hphp/test/zend/bad/007.php.exp +++ b/hphp/test/zend/bad/007.php.exp @@ -1,9 +1,7 @@ HipHop Warning: each() expects exactly 1 parameter, 0 given in hphp/test/zend/bad/007.php on line %d NULL - HipHop Warning: Variable passed to each() is not an array or object in hphp/test/zend/bad/007.php on line %d NULL - HipHop Warning: Variable passed to each() is not an array or object in hphp/test/zend/bad/007.php on line %d NULL array(4) { diff --git a/hphp/test/zend/bad/008.php.exp b/hphp/test/zend/bad/008.php.exp index 2076151a0..6e3291ee8 100644 --- a/hphp/test/zend/bad/008.php.exp +++ b/hphp/test/zend/bad/008.php.exp @@ -1,25 +1,19 @@ HipHop Warning: define() expects at least 2 parameters, 0 given in hphp/test/zend/bad/008.php on line %d NULL - HipHop Warning: define() expects at least 2 parameters, 1 given in hphp/test/zend/bad/008.php on line %d NULL bool(true) - HipHop Warning: define() expects parameter 3 to be boolean, array given in hphp/test/zend/bad/008.php on line %d NULL - HipHop Warning: define() expects parameter 1 to be string, array given in hphp/test/zend/bad/008.php on line %d NULL bool(true) bool(true) bool(true) - HipHop Notice: Constant test const already defined in hphp/test/zend/bad/008.php on line %d bool(false) - HipHop Warning: Constants may only evaluate to scalar values in hphp/test/zend/bad/008.php on line %d bool(false) - HipHop Warning: Constants may only evaluate to scalar values in hphp/test/zend/bad/008.php on line %d bool(false) int(1) diff --git a/hphp/test/zend/bad/009.php.exp b/hphp/test/zend/bad/009.php.exp index c4defa337..55eb9fc82 100644 --- a/hphp/test/zend/bad/009.php.exp +++ b/hphp/test/zend/bad/009.php.exp @@ -5,10 +5,8 @@ Strict Standards: Non-static method foo::bar() should not be called statically i string(3) "foo" string(3) "foo" string(3) "foo" - HipHop Warning: get_class() called without object from outside a class in hphp/test/zend/bad/009.php on line %d bool(false) - HipHop Warning: get_class() expects parameter 1 to be object, string given in hphp/test/zend/bad/009.php on line %d bool(false) string(3) "foo" diff --git a/hphp/test/zend/bad/011.php.exp b/hphp/test/zend/bad/011.php.exp index ccf5dde90..1d3202c27 100644 --- a/hphp/test/zend/bad/011.php.exp +++ b/hphp/test/zend/bad/011.php.exp @@ -1,6 +1,5 @@ HipHop Warning: property_exists() expects exactly 2 parameters, 0 given in hphp/test/zend/bad/011.php on line %d NULL - HipHop Warning: property_exists() expects exactly 2 parameters, 1 given in hphp/test/zend/bad/011.php on line %d NULL bool(true) @@ -16,13 +15,10 @@ bool(true) bool(true) bool(false) bool(false) - HipHop Warning: First parameter must either be an object or the name of an existing class in hphp/test/zend/bad/011.php on line %d NULL - HipHop Warning: First parameter must either be an object or the name of an existing class in hphp/test/zend/bad/011.php on line %d NULL - HipHop Warning: First parameter must either be an object or the name of an existing class in hphp/test/zend/bad/011.php on line %d NULL bool(true) diff --git a/hphp/test/zend/bad/012.php.exp b/hphp/test/zend/bad/012.php.exp index bfe5b67ea..34c681a29 100644 --- a/hphp/test/zend/bad/012.php.exp +++ b/hphp/test/zend/bad/012.php.exp @@ -2,7 +2,6 @@ HipHop Warning: class_exists() expects at least 1 parameter, 0 given in hphp/tes NULL bool(false) bool(false) - HipHop Warning: class_exists() expects parameter 1 to be string, array given in hphp/test/zend/bad/012.php on line %d NULL bool(false) diff --git a/hphp/test/zend/bad/013.php.exp b/hphp/test/zend/bad/013.php.exp index 4ef173a16..345bc04d2 100644 --- a/hphp/test/zend/bad/013.php.exp +++ b/hphp/test/zend/bad/013.php.exp @@ -2,7 +2,6 @@ HipHop Warning: interface_exists() expects at least 1 parameter, 0 given in hphp NULL bool(false) bool(false) - HipHop Warning: interface_exists() expects parameter 1 to be string, array given in hphp/test/zend/bad/013.php on line %d NULL bool(false) diff --git a/hphp/test/zend/bad/014.php.exp b/hphp/test/zend/bad/014.php.exp index 7c5c6288f..a93205741 100644 --- a/hphp/test/zend/bad/014.php.exp +++ b/hphp/test/zend/bad/014.php.exp @@ -8,7 +8,6 @@ array(2) { [1]=> string(%d) "%s" } - HipHop Warning: get_included_files() expects exactly 0 parameters, 2 given in hphp/test/zend/bad/014.php on line %d NULL array(2) { @@ -17,7 +16,6 @@ array(2) { [1]=> string(%d) "%s" } - HipHop Warning: get_included_files() expects exactly 0 parameters, 1 given in hphp/test/zend/bad/014.php on line %d NULL array(2) { diff --git a/hphp/test/zend/bad/015.php.exp b/hphp/test/zend/bad/015.php.exp index b5199f17f..157e0ba19 100644 --- a/hphp/test/zend/bad/015.php.exp +++ b/hphp/test/zend/bad/015.php.exp @@ -1,18 +1,13 @@ HipHop Warning: trigger_error() expects at least 1 parameter, 0 given in hphp/test/zend/bad/015.php on line %d NULL - HipHop Notice: error in hphp/test/zend/bad/015.php on line %d bool(true) - HipHop Warning: trigger_error() expects parameter 1 to be string, array given in hphp/test/zend/bad/015.php on line %d NULL - HipHop Warning: Invalid error type specified in hphp/test/zend/bad/015.php on line %d bool(false) - HipHop Warning: Invalid error type specified in hphp/test/zend/bad/015.php on line %d bool(false) - HipHop Warning: error in hphp/test/zend/bad/015.php on line %d bool(true) diff --git a/hphp/test/zend/bad/017.php.exp b/hphp/test/zend/bad/017.php.exp index 8d4c7d7b0..e442b2ebb 100644 --- a/hphp/test/zend/bad/017.php.exp +++ b/hphp/test/zend/bad/017.php.exp @@ -1,6 +1,5 @@ HipHop Warning: get_resource_type() expects exactly 1 parameter, 0 given in hphp/test/zend/bad/017.php on line %d NULL - HipHop Warning: get_resource_type() expects parameter 1 to be resource, string given in hphp/test/zend/bad/017.php on line %d NULL string(6) "stream" @@ -9,26 +8,21 @@ string(5) "array" int(%d) string(5) "array" int(%d) - HipHop Warning: get_loaded_extensions() expects at most 1 parameter, 2 given in hphp/test/zend/bad/017.php on line %d NULL - HipHop Warning: get_defined_constants() expects at most 1 parameter, 2 given in hphp/test/zend/bad/017.php on line %d NULL string(5) "array" string(5) "array" int(%d) - HipHop Warning: get_defined_functions() expects exactly 0 parameters, 1 given in hphp/test/zend/bad/017.php on line %d NULL string(5) "array" int(%d) - HipHop Warning: get_declared_interfaces() expects exactly 0 parameters, 1 given in hphp/test/zend/bad/017.php on line %d NULL string(5) "array" int(%d) - HipHop Warning: get_extension_funcs() expects exactly 1 parameter, 0 given in hphp/test/zend/bad/017.php on line %d NULL bool(false) diff --git a/hphp/test/zend/bad/018.php.exp b/hphp/test/zend/bad/018.php.exp index 96dd1b39e..b5ce642e0 100644 --- a/hphp/test/zend/bad/018.php.exp +++ b/hphp/test/zend/bad/018.php.exp @@ -1,12 +1,9 @@ HipHop Warning: constant() expects exactly 1 parameter, 0 given in hphp/test/zend/bad/018.php on line %d NULL - HipHop Warning: constant() expects exactly 1 parameter, 2 given in hphp/test/zend/bad/018.php on line %d NULL - HipHop Warning: constant(): Couldn't find constant in hphp/test/zend/bad/018.php on line %d NULL - HipHop Warning: constant() expects parameter 1 to be string, array given in hphp/test/zend/bad/018.php on line %d NULL int(1) diff --git a/hphp/test/zend/bad/019.php b/hphp/test/zend/bad/019.php index 3fec84eaa..41b4ac941 100644 --- a/hphp/test/zend/bad/019.php +++ b/hphp/test/zend/bad/019.php @@ -13,7 +13,7 @@ echo "*** Testing unset(), empty() & isset() with scalar variables ***\n"; // testing scalar variables $scalar_variables = array( - 0, + 0, 1, +1 -1, @@ -49,23 +49,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) ); @@ -87,36 +87,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 @@ -124,10 +124,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); } @@ -141,7 +141,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) } @@ -180,12 +180,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) @@ -197,12 +197,12 @@ class Point var $x; var $y; var $lable; - + function Point($x, $y) { $this->x = $x; $this->y = $y; } - + function setLable($lable) { $this->lable = $lable; } @@ -212,8 +212,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) @@ -226,7 +226,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); @@ -267,36 +267,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(); @@ -305,10 +305,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 @@ -326,7 +326,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 @@ -337,17 +337,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/hphp/test/zend/bad/019.php.exp b/hphp/test/zend/bad/019.php.exp index b0dca4c80..e63eb4e6a 100644 --- a/hphp/test/zend/bad/019.php.exp +++ b/hphp/test/zend/bad/019.php.exp @@ -3,7 +3,6 @@ bool(true) bool(true) bool(true) - HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -15,7 +14,6 @@ bool(false) bool(true) bool(true) bool(false) - HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -27,7 +25,6 @@ bool(false) bool(true) bool(true) bool(true) - HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -39,7 +36,6 @@ bool(false) bool(true) bool(true) bool(false) - HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -51,7 +47,6 @@ bool(false) bool(true) bool(true) bool(false) - HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -63,7 +58,6 @@ bool(false) bool(true) bool(true) bool(false) - HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -75,7 +69,6 @@ bool(false) bool(true) bool(true) bool(false) - HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -87,7 +80,6 @@ bool(false) bool(true) bool(true) bool(true) - HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -99,7 +91,6 @@ bool(false) bool(true) bool(true) bool(false) - HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -111,7 +102,6 @@ bool(false) bool(true) bool(true) bool(false) - HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -123,7 +113,6 @@ bool(false) bool(true) bool(true) bool(false) - HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -135,7 +124,6 @@ bool(false) bool(true) bool(true) bool(false) - HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -147,7 +135,6 @@ bool(false) bool(true) bool(true) bool(true) - HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -159,7 +146,6 @@ bool(false) bool(true) bool(true) bool(true) - HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -171,7 +157,6 @@ bool(false) bool(true) bool(true) bool(false) - HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -183,7 +168,6 @@ bool(false) bool(true) bool(true) bool(false) - HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -195,7 +179,6 @@ bool(false) bool(true) bool(true) bool(false) - HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -207,7 +190,6 @@ bool(false) bool(true) bool(true) bool(false) - HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -219,7 +201,6 @@ bool(false) bool(true) bool(true) bool(true) - HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -231,7 +212,6 @@ bool(false) bool(true) bool(true) bool(false) - HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -243,7 +223,6 @@ bool(false) bool(true) bool(true) bool(false) - HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -255,7 +234,6 @@ bool(false) bool(true) bool(true) bool(false) - HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -267,7 +245,6 @@ bool(false) bool(true) bool(true) bool(false) - HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -279,7 +256,6 @@ bool(false) bool(true) bool(true) bool(false) - HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -291,7 +267,6 @@ bool(false) bool(true) bool(true) bool(true) - HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -303,7 +278,6 @@ bool(false) bool(true) bool(true) bool(false) - HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -315,7 +289,6 @@ bool(false) bool(true) bool(true) bool(true) - HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -332,7 +305,6 @@ bool(false) bool(true) bool(true) bool(true) - HipHop Notice: Undefined variable: array_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -348,18 +320,14 @@ bool(true) -- Innerloop Iteration 1 of Outerloop Iteration 2 -- array(0) { } - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) array(0) { } - HipHop Notice: Undefined variable: array_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -375,18 +343,14 @@ bool(true) -- Innerloop Iteration 1 of Outerloop Iteration 3 -- array(0) { } - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) array(0) { } - HipHop Notice: Undefined variable: array_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -402,18 +366,14 @@ bool(true) -- Innerloop Iteration 1 of Outerloop Iteration 4 -- array(0) { } - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) array(0) { } - HipHop Notice: Undefined variable: array_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -429,18 +389,14 @@ bool(true) -- Innerloop Iteration 1 of Outerloop Iteration 5 -- array(0) { } - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) array(0) { } - HipHop Notice: Undefined variable: array_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -462,13 +418,10 @@ array(3) { [3]=> int(4) } - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) array(3) { @@ -486,13 +439,10 @@ array(2) { [3]=> int(4) } - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) array(2) { @@ -506,13 +456,10 @@ array(1) { [3]=> int(4) } - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) array(1) { @@ -522,18 +469,14 @@ array(1) { -- Innerloop Iteration 4 of Outerloop Iteration 6 -- array(0) { } - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) array(0) { } - HipHop Notice: Undefined variable: array_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -553,13 +496,10 @@ array(2) { [2]=> float(5.6) } - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) array(2) { @@ -573,13 +513,10 @@ array(1) { [2]=> float(5.6) } - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) array(1) { @@ -589,18 +526,14 @@ array(1) { -- Innerloop Iteration 3 of Outerloop Iteration 7 -- array(0) { } - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) array(0) { } - HipHop Notice: Undefined variable: array_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -618,13 +551,10 @@ array(1) { [2]=> string(3) "two" } - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) array(1) { @@ -634,18 +564,14 @@ array(1) { -- Innerloop Iteration 2 of Outerloop Iteration 8 -- array(0) { } - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) array(0) { } - HipHop Notice: Undefined variable: array_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -663,13 +589,10 @@ array(1) { ["Age"]=> string(2) "30" } - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) array(1) { @@ -679,18 +602,14 @@ array(1) { -- Innerloop Iteration 2 of Outerloop Iteration 9 -- array(0) { } - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) array(0) { } - HipHop Notice: Undefined variable: array_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -714,13 +633,10 @@ array(4) { [""]=> string(0) "" } - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) array(4) { @@ -742,13 +658,10 @@ array(3) { [""]=> string(0) "" } - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) array(3) { @@ -766,13 +679,10 @@ array(2) { [""]=> string(0) "" } - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) array(2) { @@ -786,13 +696,10 @@ array(1) { [""]=> string(0) "" } - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) array(1) { @@ -802,18 +709,14 @@ array(1) { -- Innerloop Iteration 5 of Outerloop Iteration 10 -- array(0) { } - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d bool(true) array(0) { } - HipHop Notice: Undefined variable: array_var in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -831,7 +734,6 @@ bool(false) bool(true) bool(false) bool(false) - HipHop Notice: Undefined variable: resource in hphp/test/zend/bad/019.php on line %d NULL -- Iteration 2 -- @@ -844,10 +746,8 @@ bool(false) bool(true) bool(false) bool(false) - HipHop Notice: Undefined variable: resource in hphp/test/zend/bad/019.php on line %d NULL - HipHop Notice: Undefined variable: resources in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -864,16 +764,12 @@ object(Point)#%d (3) { } bool(true) bool(false) - HipHop Notice: Undefined variable: lable in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: lable in hphp/test/zend/bad/019.php on line %d bool(true) - HipHop Notice: Undefined variable: lable in hphp/test/zend/bad/019.php on line %d bool(false) - HipHop Notice: Undefined variable: lable in hphp/test/zend/bad/019.php on line %d bool(true) object(Point)#%d (3) { @@ -898,7 +794,6 @@ bool(true) bool(false) bool(false) bool(true) - HipHop Notice: Undefined variable: point1 in hphp/test/zend/bad/019.php on line %d NULL bool(false) @@ -928,27 +823,24 @@ object(Point)#%d (3) { value of static_var before unset: 1 bool(true) bool(false) - HipHop Notice: Undefined variable: static_var in hphp/test/zend/bad/019.php on line %d -value of static_var after unset: +value of static_var after unset: bool(false) bool(true) value of static_var after new assignment: 20 value of static_var before unset: 2 bool(true) bool(false) - HipHop Notice: Undefined variable: static_var in hphp/test/zend/bad/019.php on line %d -value of static_var after unset: +value of static_var after unset: bool(false) bool(true) value of static_var after new assignment: 20 value of static_var before unset: 3 bool(true) bool(false) - HipHop Notice: Undefined variable: static_var in hphp/test/zend/bad/019.php on line %d -value of static_var after unset: +value of static_var after unset: bool(false) bool(true) value of static_var after new assignment: 20 diff --git a/hphp/test/zend/bad/020.php.exp b/hphp/test/zend/bad/020.php.exp index 6f29c6548..80238998b 100644 --- a/hphp/test/zend/bad/020.php.exp +++ b/hphp/test/zend/bad/020.php.exp @@ -1,12 +1,9 @@ HipHop Warning: func_get_arg() expects exactly 1 parameter, 3 given in hphp/test/zend/bad/020.php on line %d NULL - HipHop Warning: func_get_arg(): Called from the global scope - no function context in hphp/test/zend/bad/020.php on line %d bool(false) - HipHop Warning: func_get_arg() expects exactly 1 parameter, 0 given in hphp/test/zend/bad/020.php on line %d NULL - HipHop Warning: func_get_arg(): Argument 1 not passed to function in hphp/test/zend/bad/020.php on line %d bool(false) Done diff --git a/hphp/test/zend/bad/024.php.exp b/hphp/test/zend/bad/024.php.exp index f9f01d276..7c7b991c1 100644 --- a/hphp/test/zend/bad/024.php.exp +++ b/hphp/test/zend/bad/024.php.exp @@ -1,34 +1,22 @@ HipHop Notice: Undefined variable: a in hphp/test/zend/bad/024.php on line %d NULL - HipHop Notice: Undefined variable: %s in hphp/test/zend/bad/024.php on line %d - HipHop Notice: Undefined variable: %s in hphp/test/zend/bad/024.php on line %d NULL - HipHop Notice: Undefined variable: a in hphp/test/zend/bad/024.php on line %d int(1) - HipHop Notice: Undefined variable: %s in hphp/test/zend/bad/024.php on line %d - HipHop Notice: Undefined variable: %s in hphp/test/zend/bad/024.php on line %d int(0) - HipHop Notice: Undefined variable: a in hphp/test/zend/bad/024.php on line %d NULL - HipHop Notice: Undefined variable: b in hphp/test/zend/bad/024.php on line %d int(1) - HipHop Notice: Trying to get property of non-object in hphp/test/zend/bad/024.php on line %d NULL - HipHop Notice: Trying to get property of non-object in hphp/test/zend/bad/024.php on line %d NULL - HipHop Notice: Undefined variable: c in hphp/test/zend/bad/024.php on line %d - HipHop Notice: Trying to get property of non-object in hphp/test/zend/bad/024.php on line %d - HipHop Notice: Trying to get property of non-object in hphp/test/zend/bad/024.php on line %d NULL diff --git a/hphp/test/zend/bad/026.php.exp b/hphp/test/zend/bad/026.php.exp index 6a6df74cb..5895d2eea 100644 --- a/hphp/test/zend/bad/026.php.exp +++ b/hphp/test/zend/bad/026.php.exp @@ -1,5 +1,4 @@ HipHop Notice: Trying to get property of non-object in hphp/test/zend/bad/026.php on line %d ok - HipHop Warning: Creating default object from empty value in hphp/test/zend/bad/026.php on line %d ok diff --git a/hphp/test/zend/bad/028.php.exp b/hphp/test/zend/bad/028.php.exp index 97f83aab2..f9ec098f9 100644 --- a/hphp/test/zend/bad/028.php.exp +++ b/hphp/test/zend/bad/028.php.exp @@ -1,7 +1,5 @@ bool(true) bool(true) bool(true) - HipHop Notice: Undefined offset: 2 in hphp/test/zend/bad/028.php on line %d - HipHop Fatal error: Function name must be a string in hphp/test/zend/bad/028.php on line %d diff --git a/hphp/test/zend/bad/030.php b/hphp/test/zend/bad/030.php index b2975fb0c..96689fddc 100644 --- a/hphp/test/zend/bad/030.php +++ b/hphp/test/zend/bad/030.php @@ -4,7 +4,7 @@ class foo { public $test = 0; private $test_2 = 1; protected $test_3 = 2; - + public function bar() { try { throw new Exception('foo'); @@ -12,13 +12,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/hphp/test/zend/bad/031.php b/hphp/test/zend/bad/031.php index 8ac00f26b..f74887e80 100644 --- a/hphp/test/zend/bad/031.php +++ b/hphp/test/zend/bad/031.php @@ -1,4 +1,4 @@ -test(); - } + } } new c; diff --git a/hphp/test/zend/bad/add_002.php.exp b/hphp/test/zend/bad/add_002.php.exp index 074726afe..ca7912635 100644 --- a/hphp/test/zend/bad/add_002.php.exp +++ b/hphp/test/zend/bad/add_002.php.exp @@ -1,3 +1,2 @@ HipHop Notice: Object of class stdClass could not be converted to int in hphp/test/zend/bad/add_002.php on line %d - HipHop Fatal error: Unsupported operand types in hphp/test/zend/bad/add_002.php on line %d diff --git a/hphp/test/zend/bad/add_003.php.exp b/hphp/test/zend/bad/add_003.php.exp index 1638677ea..6895a8e26 100644 --- a/hphp/test/zend/bad/add_003.php.exp +++ b/hphp/test/zend/bad/add_003.php.exp @@ -1,3 +1,2 @@ HipHop Notice: Object of class stdClass could not be converted to int in hphp/test/zend/bad/add_003.php on line %d - HipHop Fatal error: Unsupported operand types in hphp/test/zend/bad/add_003.php on line %d diff --git a/hphp/test/zend/bad/alias01.php b/hphp/test/zend/bad/alias01.php index a038dc6d0..aec797fe2 100644 --- a/hphp/test/zend/bad/alias01.php +++ b/hphp/test/zend/bad/alias01.php @@ -4,7 +4,7 @@ trait T1 { function m2() { echo "T:m2\n"; } } -class C1 { +class C1 { use T1 { m1 as a1; } } diff --git a/hphp/test/zend/bad/alias01.php.exp b/hphp/test/zend/bad/alias01.php.exp index d5195e70d..e9f7fa40a 100644 --- a/hphp/test/zend/bad/alias01.php.exp +++ b/hphp/test/zend/bad/alias01.php.exp @@ -1,5 +1,4 @@ T:m1 T:m1 T:m2 - HipHop Fatal error: Call to undefined method C1::a2() in hphp/test/zend/bad/alias01.php on line %d diff --git a/hphp/test/zend/bad/argument_restriction_001.php b/hphp/test/zend/bad/argument_restriction_001.php index 79630a497..d6a3f25d9 100644 --- a/hphp/test/zend/bad/argument_restriction_001.php +++ b/hphp/test/zend/bad/argument_restriction_001.php @@ -1,11 +1,11 @@ \ No newline at end of file diff --git a/hphp/test/zend/bad/argument_restriction_001.php.exp b/hphp/test/zend/bad/argument_restriction_001.php.exp index 76d55d20c..ee686a270 100644 --- a/hphp/test/zend/bad/argument_restriction_001.php.exp +++ b/hphp/test/zend/bad/argument_restriction_001.php.exp @@ -1 +1 @@ -Strict Standards: Declaration of Sub::test() should be compatible with & Base::test($foo, array $bar, $option = NULL, $extra = 'llllllllll...') in %sargument_restriction_001.php on line %d +Strict Standards: Declaration of Sub::test() should be compatible with & Base::test($foo, array $bar, $option = NULL, $extra = 'llllllllll...') in %sargument_restriction_001.php on line %d diff --git a/hphp/test/zend/bad/argument_restriction_002.php b/hphp/test/zend/bad/argument_restriction_002.php index 966e02ad2..107e50faf 100644 --- a/hphp/test/zend/bad/argument_restriction_002.php +++ b/hphp/test/zend/bad/argument_restriction_002.php @@ -1,11 +1,11 @@ \ No newline at end of file diff --git a/hphp/test/zend/bad/argument_restriction_003.php b/hphp/test/zend/bad/argument_restriction_003.php index 9ae00a2d6..5817a6f74 100644 --- a/hphp/test/zend/bad/argument_restriction_003.php +++ b/hphp/test/zend/bad/argument_restriction_003.php @@ -4,11 +4,11 @@ class Foo { Abstract Class Base { public function test(Foo $foo, array $bar, $option = NULL, $extra = "lllllllllllllllllllllllllllllllllllllllllllllllllll") { - } + } } class Sub extends Base { public function test() { - } + } } ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/argument_restriction_005.php b/hphp/test/zend/bad/argument_restriction_005.php index 3a914bc5d..736a36399 100644 --- a/hphp/test/zend/bad/argument_restriction_005.php +++ b/hphp/test/zend/bad/argument_restriction_005.php @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/hphp/test/zend/bad/argument_restriction_006.php b/hphp/test/zend/bad/argument_restriction_006.php index b6feecd4f..c9a2f9a72 100644 --- a/hphp/test/zend/bad/argument_restriction_006.php +++ b/hphp/test/zend/bad/argument_restriction_006.php @@ -1,11 +1,11 @@ \ No newline at end of file diff --git a/hphp/test/zend/bad/bug21478.php b/hphp/test/zend/bad/bug21478.php index 9a1902ae6..d7107e1d7 100644 --- a/hphp/test/zend/bad/bug21478.php +++ b/hphp/test/zend/bad/bug21478.php @@ -20,7 +20,7 @@ fwrite($fp, "This is a test.\n"); print "Done.\n"; fclose($fp); // Uncommenting the following 'print' line causes the segfault to stop occuring -// print "2\n"; +// print "2\n"; readfile(dirname(__FILE__)."/test.txt"); unlink(dirname(__FILE__)."/test.txt"); ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/bug26010.php.exp b/hphp/test/zend/bad/bug26010.php.exp index e834e51ab..e18a6ced6 100644 --- a/hphp/test/zend/bad/bug26010.php.exp +++ b/hphp/test/zend/bad/bug26010.php.exp @@ -2,3 +2,4 @@ array(1) { ["public"]=> string(6) "public" } + diff --git a/hphp/test/zend/bad/bug26077.php.exp b/hphp/test/zend/bad/bug26077.php.exp deleted file mode 100644 index d26c0f908..000000000 --- a/hphp/test/zend/bad/bug26077.php.exp +++ /dev/null @@ -1 +0,0 @@ -===DONE=== diff --git a/hphp/test/zend/bad/bug26166.php b/hphp/test/zend/bad/bug26166.php index 912e60fd5..b77264e2e 100644 --- a/hphp/test/zend/bad/bug26166.php +++ b/hphp/test/zend/bad/bug26166.php @@ -45,7 +45,7 @@ echo $o; echo "===THROW===\n"; -class Error +class Error { function __toString() { throw new Exception("This is an error!"); diff --git a/hphp/test/zend/bad/bug26166.php.exp b/hphp/test/zend/bad/bug26166.php.exp index ad84ae5ad..9a62567ff 100644 --- a/hphp/test/zend/bad/bug26166.php.exp +++ b/hphp/test/zend/bad/bug26166.php.exp @@ -2,5 +2,4 @@ Hello World! ===NONE=== string(52) "Method None::__toString() must return a string value" ===THROW=== - HipHop Fatal error: Method Error::__toString() must not throw an exception in %sbug26166.php on line %d diff --git a/hphp/test/zend/bad/bug26229.php b/hphp/test/zend/bad/bug26229.php index eb8232354..856d20f87 100644 --- a/hphp/test/zend/bad/bug26229.php +++ b/hphp/test/zend/bad/bug26229.php @@ -2,7 +2,7 @@ class array_iterator implements IteratorAggregate { public function getIterator() { - return array('foo', 'bar'); + return array('foo', 'bar'); } } diff --git a/hphp/test/zend/bad/bug26801.php.exp b/hphp/test/zend/bad/bug26801.php.exp deleted file mode 100644 index d26c0f908..000000000 --- a/hphp/test/zend/bad/bug26801.php.exp +++ /dev/null @@ -1 +0,0 @@ -===DONE=== diff --git a/hphp/test/zend/bad/bug27798.php b/hphp/test/zend/bad/bug27798.php index 213a01cc5..249d05709 100644 --- a/hphp/test/zend/bad/bug27798.php +++ b/hphp/test/zend/bad/bug27798.php @@ -5,7 +5,7 @@ class Base public $Foo = 1; protected $Bar = 2; private $Baz = 3; - + function __construct() { echo __METHOD__ . "\n"; diff --git a/hphp/test/zend/bad/bug29674.php b/hphp/test/zend/bad/bug29674.php index 957f238b4..fee321d94 100644 --- a/hphp/test/zend/bad/bug29674.php +++ b/hphp/test/zend/bad/bug29674.php @@ -3,7 +3,7 @@ class BaseClass { private $private_base = "Base"; - + function printVars () { var_dump($this->private_base); diff --git a/hphp/test/zend/bad/bug29674.php.exp b/hphp/test/zend/bad/bug29674.php.exp index 04a9b97eb..99e368432 100644 --- a/hphp/test/zend/bad/bug29674.php.exp +++ b/hphp/test/zend/bad/bug29674.php.exp @@ -1,9 +1,7 @@ ===BASE=== string(4) "Base" - HipHop Notice: Undefined property: BaseClass::$private_child in %sbug29674.php on line %d NULL ===CHILD=== string(4) "Base" - HipHop Fatal error: Cannot access private property ChildClass::$private_child in %sbug29674.php on line %d diff --git a/hphp/test/zend/bad/bug29689.php.exp b/hphp/test/zend/bad/bug29689.php.exp index 3661aad63..cce97475e 100644 --- a/hphp/test/zend/bad/bug29689.php.exp +++ b/hphp/test/zend/bad/bug29689.php.exp @@ -1,5 +1,5 @@ foo: foo foo2 -bar: bar +bar: bar HipHop Notice: Undefined property: bar::$foo2 in hphp/test/zend/bad/bug29689.php on line %d ---baz-- diff --git a/hphp/test/zend/bad/bug29896.php.exp b/hphp/test/zend/bad/bug29896.php.exp index b3a4c99be..5b804c99d 100644 --- a/hphp/test/zend/bad/bug29896.php.exp +++ b/hphp/test/zend/bad/bug29896.php.exp @@ -1,3 +1,4 @@ #0 userErrorHandler(8, Undefined variable: b, %sbug29896.php, 11, Array ([A1] => Test1)) called at [%sbug29896.php:11] #1 GenerateError1(Test1) called at [%sbug29896.php:16] #2 GenerateError2(Test2) called at [%sbug29896.php:19] + diff --git a/hphp/test/zend/bad/bug29944.php.exp b/hphp/test/zend/bad/bug29944.php.exp index 9766475a4..4f25bafb1 100644 --- a/hphp/test/zend/bad/bug29944.php.exp +++ b/hphp/test/zend/bad/bug29944.php.exp @@ -1 +1,2 @@ ok + diff --git a/hphp/test/zend/bad/bug30162.php b/hphp/test/zend/bad/bug30162.php index 08f625a3e..64635f4ec 100644 --- a/hphp/test/zend/bad/bug30162.php +++ b/hphp/test/zend/bad/bug30162.php @@ -21,7 +21,7 @@ class hariCow extends FIIFO { } catch(Exception $e) { } } - + public function __toString() { return "Rusticus in asino sedet."; } diff --git a/hphp/test/zend/bad/bug30346.php.exp b/hphp/test/zend/bad/bug30346.php.exp deleted file mode 100644 index ca5cabd02..000000000 --- a/hphp/test/zend/bad/bug30346.php.exp +++ /dev/null @@ -1,2 +0,0 @@ -page_show -===DONE=== diff --git a/hphp/test/zend/bad/bug30394.php.exp b/hphp/test/zend/bad/bug30394.php.exp deleted file mode 100644 index e881e43b4..000000000 --- a/hphp/test/zend/bad/bug30394.php.exp +++ /dev/null @@ -1 +0,0 @@ -2 - 3 diff --git a/hphp/test/zend/bad/bug30519.php.exp b/hphp/test/zend/bad/bug30519.php.exp index 048e2d41e..b0f0aa2bf 100644 --- a/hphp/test/zend/bad/bug30519.php.exp +++ b/hphp/test/zend/bad/bug30519.php.exp @@ -1 +1,2 @@ HipHop Fatal error: Interface 'a' not found in %sbug30519.php on line 2 + diff --git a/hphp/test/zend/bad/bug30725.php.exp b/hphp/test/zend/bad/bug30725.php.exp deleted file mode 100644 index a0a5d3e0c..000000000 --- a/hphp/test/zend/bad/bug30725.php.exp +++ /dev/null @@ -1,2 +0,0 @@ -Caught -===DONE=== diff --git a/hphp/test/zend/bad/bug30998.php b/hphp/test/zend/bad/bug30998.php index a6c26b528..ab502ce35 100644 --- a/hphp/test/zend/bad/bug30998.php +++ b/hphp/test/zend/bad/bug30998.php @@ -1,13 +1,13 @@ ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/bug30998.php.exp b/hphp/test/zend/bad/bug30998.php.exp index 4f14acee1..3a98a20ad 100644 --- a/hphp/test/zend/bad/bug30998.php.exp +++ b/hphp/test/zend/bad/bug30998.php.exp @@ -1,4 +1,3 @@ fopen(/tmp/blah): failed to open stream: No such file or directory (2) in %s:%d - HipHop Warning: fopen(/tmp/blah): failed to open stream: No such file or directory in hphp/test/zend/bad/bug30998.php on line %d ===DONE=== diff --git a/hphp/test/zend/bad/bug31098.php.exp b/hphp/test/zend/bad/bug31098.php.exp index 775faa0c7..a52b1b09b 100644 --- a/hphp/test/zend/bad/bug31098.php.exp +++ b/hphp/test/zend/bad/bug31098.php.exp @@ -11,13 +11,10 @@ ok ok ok ok - HipHop Notice: Trying to get property of non-object in hphp/test/zend/bad/bug31098.php on line %d ok - HipHop Warning: Illegal string offset 'wrong' in hphp/test/zend/bad/bug31098.php on line %d ok ok - HipHop Warning: Illegal string offset 'wrong' in hphp/test/zend/bad/bug31098.php on line %d ok \ No newline at end of file diff --git a/hphp/test/zend/bad/bug31102.php.exp b/hphp/test/zend/bad/bug31102.php.exp index 3a419b15e..b4a4f35a8 100644 --- a/hphp/test/zend/bad/bug31102.php.exp +++ b/hphp/test/zend/bad/bug31102.php.exp @@ -3,5 +3,4 @@ Caught: Test1::__construct __autoload(Test2,2) Caught: __autoload __autoload(Test3,3) - HipHop Fatal error: Class 'Test3' not found in %sbug31102.php(%d) : eval()'d code on line 1 diff --git a/hphp/test/zend/bad/bug31720.php.exp b/hphp/test/zend/bad/bug31720.php.exp index 1499feab3..efdebda08 100644 --- a/hphp/test/zend/bad/bug31720.php.exp +++ b/hphp/test/zend/bad/bug31720.php.exp @@ -1,4 +1,3 @@ HipHop Notice: Undefined variable: nonesuchvar in hphp/test/zend/bad/bug31720.php on line %d - HipHop Warning: array_walk() expects parameter 2 to be a valid callback, first array member is not a valid class name or object in hphp/test/zend/bad/bug31720.php on line %d ===DONE=== diff --git a/hphp/test/zend/bad/bug32226.php.exp b/hphp/test/zend/bad/bug32226.php.exp deleted file mode 100644 index a0a5d3e0c..000000000 --- a/hphp/test/zend/bad/bug32226.php.exp +++ /dev/null @@ -1,2 +0,0 @@ -Caught -===DONE=== diff --git a/hphp/test/zend/bad/bug32322.php b/hphp/test/zend/bad/bug32322.php index 09cf9239e..a0fe4fa57 100644 --- a/hphp/test/zend/bad/bug32322.php +++ b/hphp/test/zend/bad/bug32322.php @@ -3,8 +3,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; @@ -33,7 +33,7 @@ class test } return $instance2; } - public function __destruct() + public function __destruct() { if ( defined('SCRIPT_END') ) { @@ -42,7 +42,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/hphp/test/zend/bad/bug32322.php.exp b/hphp/test/zend/bad/bug32322.php.exp index a4cf57929..38d8a2924 100644 --- a/hphp/test/zend/bad/bug32322.php.exp +++ b/hphp/test/zend/bad/bug32322.php.exp @@ -1,11 +1,11 @@ Try static instance inside class : -New class Singleton1 created +New class Singleton1 created Using old class Singleton1 Strict Standards: Only variables should be assigned by reference in %sbug32322.php on line 49 Using old class Singleton1 Try static instance inside function : -New class Singleton2 created +New class Singleton2 created Using old class Singleton2 Strict Standards: Only variables should be assigned by reference in %sbug32322.php on line 55 diff --git a/hphp/test/zend/bad/bug32596.php b/hphp/test/zend/bad/bug32596.php index e11d69e82..7f7b2ef1e 100644 --- a/hphp/test/zend/bad/bug32596.php +++ b/hphp/test/zend/bad/bug32596.php @@ -1,7 +1,7 @@ 3 ) - HipHop Notice: Indirect modification of overloaded property A::$whatever has no effect in %sbug32660.php on line 23 - HipHop Fatal error: Cannot assign by reference to overloaded object in %sbug32660.php on line 23 diff --git a/hphp/test/zend/bad/bug33558.php.exp b/hphp/test/zend/bad/bug33558.php.exp index 9766475a4..4f25bafb1 100644 --- a/hphp/test/zend/bad/bug33558.php.exp +++ b/hphp/test/zend/bad/bug33558.php.exp @@ -1 +1,2 @@ ok + diff --git a/hphp/test/zend/bad/bug33710.php.exp b/hphp/test/zend/bad/bug33710.php.exp deleted file mode 100644 index d26c0f908..000000000 --- a/hphp/test/zend/bad/bug33710.php.exp +++ /dev/null @@ -1 +0,0 @@ -===DONE=== diff --git a/hphp/test/zend/bad/bug33802.php.exp b/hphp/test/zend/bad/bug33802.php.exp deleted file mode 100644 index 9766475a4..000000000 --- a/hphp/test/zend/bad/bug33802.php.exp +++ /dev/null @@ -1 +0,0 @@ -ok diff --git a/hphp/test/zend/bad/bug33999.php.exp b/hphp/test/zend/bad/bug33999.php.exp index 4478946b6..3971a5296 100644 --- a/hphp/test/zend/bad/bug33999.php.exp +++ b/hphp/test/zend/bad/bug33999.php.exp @@ -2,9 +2,7 @@ object(Foo)#1 (1) { ["bar"]=> string(3) "bat" } - HipHop Notice: Object of class Foo could not be converted to int in %sbug33999.php on line 9 int(1) - HipHop Notice: Object of class Foo could not be converted to double in %sbug33999.php on line 12 float(1) diff --git a/hphp/test/zend/bad/bug34062.php.exp b/hphp/test/zend/bad/bug34062.php.exp index c849a7b0f..3f5b1b4e4 100644 --- a/hphp/test/zend/bad/bug34062.php.exp +++ b/hphp/test/zend/bad/bug34062.php.exp @@ -1,3 +1,4 @@ ((( here ))) + diff --git a/hphp/test/zend/bad/bug34064.php b/hphp/test/zend/bad/bug34064.php index d69b9a1cb..ae1ef1ba1 100644 --- a/hphp/test/zend/bad/bug34064.php +++ b/hphp/test/zend/bad/bug34064.php @@ -3,7 +3,7 @@ class XmlTest { function test_ref(&$test) { - $test = "ok"; + $test = "ok"; } function test($test) diff --git a/hphp/test/zend/bad/bug34064.php.exp b/hphp/test/zend/bad/bug34064.php.exp index 983d1c6b4..37681ba59 100644 --- a/hphp/test/zend/bad/bug34064.php.exp +++ b/hphp/test/zend/bad/bug34064.php.exp @@ -2,5 +2,5 @@ array(1) { [0]=> string(2) "ok" } - HipHop Fatal error: Cannot use [] for reading in %sbug34064.php on line 18 + diff --git a/hphp/test/zend/bad/bug34199.php.exp b/hphp/test/zend/bad/bug34199.php.exp index 85172b618..d0dcaeca4 100644 --- a/hphp/test/zend/bad/bug34199.php.exp +++ b/hphp/test/zend/bad/bug34199.php.exp @@ -1,3 +1,4 @@ bool(false) ok ok + diff --git a/hphp/test/zend/bad/bug34893.php.exp b/hphp/test/zend/bad/bug34893.php.exp deleted file mode 100644 index 323fae03f..000000000 --- a/hphp/test/zend/bad/bug34893.php.exp +++ /dev/null @@ -1 +0,0 @@ -foobar diff --git a/hphp/test/zend/bad/bug35239.php b/hphp/test/zend/bad/bug35239.php index 2c12786c1..ed0b9dc9c 100644 --- a/hphp/test/zend/bad/bug35239.php +++ b/hphp/test/zend/bad/bug35239.php @@ -1,5 +1,5 @@ x0 = new stdClass; $a->x0->y0 = 'a'; $a->x0->y1 =& $a->x0; diff --git a/hphp/test/zend/bad/bug35655.php b/hphp/test/zend/bad/bug35655.php index e59c37f19..f7a0a6c59 100644 --- a/hphp/test/zend/bad/bug35655.php +++ b/hphp/test/zend/bad/bug35655.php @@ -2,7 +2,7 @@ $code = ' '; diff --git a/hphp/test/zend/bad/bug36303.php.exp b/hphp/test/zend/bad/bug36303.php.exp index 0497bb1cd..bce9d68b8 100644 --- a/hphp/test/zend/bad/bug36303.php.exp +++ b/hphp/test/zend/bad/bug36303.php.exp @@ -1,4 +1,3 @@ HipHop Warning: Attempt to modify property of non-object in %sbug36303.php on line 3 - HipHop Warning: Invalid argument supplied for foreach() in %sbug36303.php on line 3 ok diff --git a/hphp/test/zend/bad/bug36513.php b/hphp/test/zend/bad/bug36513.php index 08151c0fa..135501302 100644 --- a/hphp/test/zend/bad/bug36513.php +++ b/hphp/test/zend/bad/bug36513.php @@ -1,4 +1,4 @@ - diff --git a/hphp/test/zend/bad/bug37707.php.exp b/hphp/test/zend/bad/bug37707.php.exp index 7ca9fbdd1..1315fc928 100644 --- a/hphp/test/zend/bad/bug37707.php.exp +++ b/hphp/test/zend/bad/bug37707.php.exp @@ -1,2 +1,3 @@ clonned NO LEAK + diff --git a/hphp/test/zend/bad/bug37811.php.exp b/hphp/test/zend/bad/bug37811.php.exp index 5910f9507..2d7ce81a7 100644 --- a/hphp/test/zend/bad/bug37811.php.exp +++ b/hphp/test/zend/bad/bug37811.php.exp @@ -1,7 +1,5 @@ string(3) "Foo" - HipHop Warning: Constants may only evaluate to scalar values in %sbug37811.php on line %d - HipHop Notice: Use of undefined constant Baz - assumed 'Baz' in %sbug37811.php on line %d string(3) "Baz" ===DONE=== diff --git a/hphp/test/zend/bad/bug38047.php b/hphp/test/zend/bad/bug38047.php index a4527ba83..d3cae49bd 100644 --- a/hphp/test/zend/bad/bug38047.php +++ b/hphp/test/zend/bad/bug38047.php @@ -17,17 +17,17 @@ function get_error_context() { $backtrace = debug_backtrace(); $n = 1; foreach ($backtrace as $call) { - echo $n++." "; - if (isset($call["file"])) { - echo $call["file"]; - if (isset($call["line"])) { - echo ":".$call["line"]; - } - } - if (isset($call["function"])) { - echo " ".$call["function"]."()"; - } - echo "\n"; + echo $n++." "; + if (isset($call["file"])) { + echo $call["file"]; + if (isset($call["line"])) { + echo ":".$call["line"]; + } + } + if (isset($call["function"])) { + echo " ".$call["function"]."()"; + } + echo "\n"; } echo "\n"; } diff --git a/hphp/test/zend/bad/bug38772.php b/hphp/test/zend/bad/bug38772.php index a83ebd2d5..9b27d0dbf 100644 --- a/hphp/test/zend/bad/bug38772.php +++ b/hphp/test/zend/bad/bug38772.php @@ -1,10 +1,10 @@ foo(); } - + private function foo() { echo __METHOD__ . "\r\n"; } @@ -16,7 +16,7 @@ class B extends A { } } -class C extends A { +class C extends A { protected function foo() { echo __METHOD__ . "\r\n"; } diff --git a/hphp/test/zend/bad/bug39018.php.exp b/hphp/test/zend/bad/bug39018.php.exp index c0296e661..dd220657a 100644 --- a/hphp/test/zend/bad/bug39018.php.exp +++ b/hphp/test/zend/bad/bug39018.php.exp @@ -1,39 +1,21 @@ HipHop Notice: String offset cast occurred in hphp/test/zend/bad/bug39018.php on line %d - HipHop Notice: Uninitialized string offset: 0 in hphp/test/zend/bad/bug39018.php on line %d - HipHop Notice: Uninitialized string offset: 0 in hphp/test/zend/bad/bug39018.php on line %d - HipHop Notice: String offset cast occurred in hphp/test/zend/bad/bug39018.php on line %d - HipHop Notice: Uninitialized string offset: %i in hphp/test/zend/bad/bug39018.php on line %d - HipHop Notice: String offset cast occurred in hphp/test/zend/bad/bug39018.php on line %d - HipHop Notice: Uninitialized string offset: %i in hphp/test/zend/bad/bug39018.php on line %d - HipHop Notice: Uninitialized string offset: 0 in hphp/test/zend/bad/bug39018.php on line %d - HipHop Notice: Uninitialized string offset: 4 in hphp/test/zend/bad/bug39018.php on line %d - HipHop Notice: Uninitialized string offset: 4 in hphp/test/zend/bad/bug39018.php on line %d - HipHop Notice: Uninitialized string offset: 4 in hphp/test/zend/bad/bug39018.php on line %d - HipHop Notice: Uninitialized string offset: 4 in hphp/test/zend/bad/bug39018.php on line %d - HipHop Notice: Uninitialized string offset: 4 in hphp/test/zend/bad/bug39018.php on line %d - HipHop Notice: String offset cast occurred in hphp/test/zend/bad/bug39018.php on line %d - HipHop Notice: Uninitialized string offset: 12 in hphp/test/zend/bad/bug39018.php on line %d - HipHop Notice: String offset cast occurred in hphp/test/zend/bad/bug39018.php on line %d - HipHop Notice: Uninitialized string offset: 12 in hphp/test/zend/bad/bug39018.php on line %d - HipHop Notice: String offset cast occurred in hphp/test/zend/bad/bug39018.php on line %d - HipHop Notice: String offset cast occurred in hphp/test/zend/bad/bug39018.php on line %d b Done diff --git a/hphp/test/zend/bad/bug39127.php b/hphp/test/zend/bad/bug39127.php index 27edf27d2..e3a88ae43 100644 --- a/hphp/test/zend/bad/bug39127.php +++ b/hphp/test/zend/bad/bug39127.php @@ -1,9 +1,9 @@ stream_eof() diff --git a/hphp/test/zend/bad/bug42143.php.exp b/hphp/test/zend/bad/bug42143.php.exp index d26cc2899..36625aedd 100644 --- a/hphp/test/zend/bad/bug42143.php.exp +++ b/hphp/test/zend/bad/bug42143.php.exp @@ -12,3 +12,4 @@ bool(false) bool(true) bool(true) bool(false) + diff --git a/hphp/test/zend/bad/bug42818.php.exp b/hphp/test/zend/bad/bug42818.php.exp index 4645201f1..9ddfc691c 100644 --- a/hphp/test/zend/bad/bug42818.php.exp +++ b/hphp/test/zend/bad/bug42818.php.exp @@ -1 +1,2 @@ HipHop Fatal error: __clone method called on non-object in %sbug42818.php on line 2 + diff --git a/hphp/test/zend/bad/bug42819.php.exp b/hphp/test/zend/bad/bug42819.php.exp index b49ca25dd..1d06905ff 100644 --- a/hphp/test/zend/bad/bug42819.php.exp +++ b/hphp/test/zend/bad/bug42819.php.exp @@ -154,5 +154,4 @@ Array ( [1] => 1 ) - HipHop Fatal error: Undefined constant 'foo\foo\unknown' in %sbug42819.php on line %d \ No newline at end of file diff --git a/hphp/test/zend/bad/bug42820.php.exp b/hphp/test/zend/bad/bug42820.php.exp index a75306170..c5237b6e7 100644 --- a/hphp/test/zend/bad/bug42820.php.exp +++ b/hphp/test/zend/bad/bug42820.php.exp @@ -8,3 +8,4 @@ bool(true) bool(false) bool(false) bool(false) + diff --git a/hphp/test/zend/bad/bug42937.php.exp b/hphp/test/zend/bad/bug42937.php.exp index cd848edf7..aa1837a23 100644 --- a/hphp/test/zend/bad/bug42937.php.exp +++ b/hphp/test/zend/bad/bug42937.php.exp @@ -4,5 +4,4 @@ test2 test3 test4 test5 - HipHop Fatal error: Call to undefined method C::test6() in %sbug42937.php on line 21 diff --git a/hphp/test/zend/bad/bug43200.php.exp b/hphp/test/zend/bad/bug43200.php.exp index 9036d91b3..cb7c0ff0a 100644 --- a/hphp/test/zend/bad/bug43200.php.exp +++ b/hphp/test/zend/bad/bug43200.php.exp @@ -23,3 +23,4 @@ Class [ class x extends c implements a, b ] { } } } + diff --git a/hphp/test/zend/bad/bug43200_2.php.exp b/hphp/test/zend/bad/bug43200_2.php.exp deleted file mode 100644 index 153d19401..000000000 --- a/hphp/test/zend/bad/bug43200_2.php.exp +++ /dev/null @@ -1 +0,0 @@ -works diff --git a/hphp/test/zend/bad/bug43201.php b/hphp/test/zend/bad/bug43201.php index b50b9ea6a..388fb6022 100644 --- a/hphp/test/zend/bad/bug43201.php +++ b/hphp/test/zend/bad/bug43201.php @@ -13,7 +13,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/hphp/test/zend/bad/bug43201.php.exp b/hphp/test/zend/bad/bug43201.php.exp index a4b52c00e..47e64106e 100644 --- a/hphp/test/zend/bad/bug43201.php.exp +++ b/hphp/test/zend/bad/bug43201.php.exp @@ -1,30 +1,16 @@ HipHop Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 13 - HipHop Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 14 - HipHop Notice: Undefined variable: ref in %sbug43201.php on line 14 - HipHop Notice: Undefined variable: undef in %sbug43201.php on line 16 - HipHop Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17 - HipHop Notice: Undefined variable: undef in %sbug43201.php on line 16 - HipHop Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17 - HipHop Notice: Undefined variable: undef in %sbug43201.php on line 16 - HipHop Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17 - HipHop Notice: Undefined variable: undef in %sbug43201.php on line 16 - HipHop Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17 - HipHop Notice: Undefined variable: undef in %sbug43201.php on line 16 - HipHop Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17 - HipHop Notice: Undefined variable: undef in %sbug43201.php on line 16 - HipHop Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17 ok diff --git a/hphp/test/zend/bad/bug43344_1.php.exp b/hphp/test/zend/bad/bug43344_1.php.exp index dbfb86f39..129ce758f 100644 --- a/hphp/test/zend/bad/bug43344_1.php.exp +++ b/hphp/test/zend/bad/bug43344_1.php.exp @@ -1,11 +1,8 @@ HipHop Notice: Use of undefined constant bar - assumed 'bar' in %sbug43344_1.php on line 13 bar - HipHop Notice: Use of undefined constant bar - assumed 'bar' in %sbug43344_1.php on line 3 bar - HipHop Notice: Use of undefined constant bar - assumed 'bar' in %sbug43344_1.php on line 6 bar - HipHop Notice: Use of undefined constant bar - assumed 'bar' in %sbug43344_1.php on line 9 bar diff --git a/hphp/test/zend/bad/bug43450.php b/hphp/test/zend/bad/bug43450.php index 3d9d7dac4..078e74091 100644 --- a/hphp/test/zend/bad/bug43450.php +++ b/hphp/test/zend/bad/bug43450.php @@ -1,7 +1,7 @@ read access: +--> read access: HipHop Notice: Trying to get property of non-object in %sbug44660.php on line 6 ---> direct assignment: +--> direct assignment: HipHop Warning: Attempt to assign property of non-object in %sbug44660.php on line 9 ---> increment: +--> increment: HipHop Warning: Attempt to increment/decrement property of non-object in %sbug44660.php on line 12 --> reference assignment: diff --git a/hphp/test/zend/bad/bug44827.php.exp b/hphp/test/zend/bad/bug44827.php.exp index 88c6ac765..9fdabe031 100644 --- a/hphp/test/zend/bad/bug44827.php.exp +++ b/hphp/test/zend/bad/bug44827.php.exp @@ -1,3 +1,2 @@ HipHop Warning: Class constants cannot be defined or redefined in %sbug44827.php on line %d - HipHop Warning: Class constants cannot be defined or redefined in %sbug44827.php on line %d diff --git a/hphp/test/zend/bad/bug44899.php.exp b/hphp/test/zend/bad/bug44899.php.exp index 97ee88ca9..00ef8b69c 100644 --- a/hphp/test/zend/bad/bug44899.php.exp +++ b/hphp/test/zend/bad/bug44899.php.exp @@ -1,5 +1,4 @@ isset empty - HipHop Notice: Undefined property: myclass::$foo in hphp/test/zend/bad/bug44899.php on line %d empty diff --git a/hphp/test/zend/bad/bug45178.php b/hphp/test/zend/bad/bug45178.php index 6f42c2214..4b6e3cbfa 100644 --- a/hphp/test/zend/bad/bug45178.php +++ b/hphp/test/zend/bad/bug45178.php @@ -1,7 +1,7 @@ error = array($this,$this); + $this->error = array($this,$this); } } $a =& new Foo(); diff --git a/hphp/test/zend/bad/bug45186.php b/hphp/test/zend/bad/bug45186.php index ba29270db..b66d27f50 100644 --- a/hphp/test/zend/bad/bug45186.php +++ b/hphp/test/zend/bad/bug45186.php @@ -17,7 +17,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/hphp/test/zend/bad/bug45186.php.exp b/hphp/test/zend/bad/bug45186.php.exp index 74cb7e76f..de729f2a0 100644 --- a/hphp/test/zend/bad/bug45186.php.exp +++ b/hphp/test/zend/bad/bug45186.php.exp @@ -13,5 +13,4 @@ string(1) "y" ok __callstatic: string(3) "www" - HipHop Warning: call_user_func() expects parameter 1 to be a valid callback, cannot access self:: when no class scope is active in %sbug45186.php on line 31 diff --git a/hphp/test/zend/bad/bug45186_2.php b/hphp/test/zend/bad/bug45186_2.php index f45a31630..1badb7a3b 100644 --- a/hphp/test/zend/bad/bug45186_2.php +++ b/hphp/test/zend/bad/bug45186_2.php @@ -13,7 +13,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/hphp/test/zend/bad/bug45186_2.php.exp b/hphp/test/zend/bad/bug45186_2.php.exp index 9eedd007b..d35141bab 100644 --- a/hphp/test/zend/bad/bug45186_2.php.exp +++ b/hphp/test/zend/bad/bug45186_2.php.exp @@ -11,7 +11,5 @@ string(1) "y" __call: string(1) "y" ok - HipHop Warning: call_user_func() expects parameter 1 to be a valid callback, class 'bar' does not have a method 'www' in hphp/test/zend/bad/bug45186_2.php on line %d - HipHop Warning: call_user_func() expects parameter 1 to be a valid callback, cannot access self:: when no class scope is active in %sbug45186_2.php on line 27 diff --git a/hphp/test/zend/bad/bug45805.php b/hphp/test/zend/bad/bug45805.php index 3ec6265ec..3ff875dac 100644 --- a/hphp/test/zend/bad/bug45805.php +++ b/hphp/test/zend/bad/bug45805.php @@ -28,7 +28,7 @@ class B { set_error_handler( array('PHPUnit_Util_ErrorHandler', 'handleError'), E_ALL | E_STRICT ); - + $o = new B; $o->bar(); ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/bug45910.php.exp b/hphp/test/zend/bad/bug45910.php.exp deleted file mode 100644 index d00491fd7..000000000 --- a/hphp/test/zend/bad/bug45910.php.exp +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/hphp/test/zend/bad/bug45910_2.php.exp b/hphp/test/zend/bad/bug45910_2.php.exp deleted file mode 100644 index d00491fd7..000000000 --- a/hphp/test/zend/bad/bug45910_2.php.exp +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/hphp/test/zend/bad/bug46106.php.exp b/hphp/test/zend/bad/bug46106.php.exp deleted file mode 100644 index c8e8a135c..000000000 --- a/hphp/test/zend/bad/bug46106.php.exp +++ /dev/null @@ -1 +0,0 @@ -DONE diff --git a/hphp/test/zend/bad/bug46304.php.exp b/hphp/test/zend/bad/bug46304.php.exp index 3b9b961dc..3f0b5b77f 100644 --- a/hphp/test/zend/bad/bug46304.php.exp +++ b/hphp/test/zend/bad/bug46304.php.exp @@ -19,5 +19,4 @@ value6 value6 value6 value6 - HipHop Fatal error: Undefined constant 'NS1\ns2\coNSt1' in %sbug46304.php on line %d diff --git a/hphp/test/zend/bad/bug46701.php b/hphp/test/zend/bad/bug46701.php index 03c0ea3d4..f504c96f7 100644 --- a/hphp/test/zend/bad/bug46701.php +++ b/hphp/test/zend/bad/bug46701.php @@ -5,13 +5,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/hphp/test/zend/bad/bug46811.php.exp b/hphp/test/zend/bad/bug46811.php.exp index b198828d9..69e5b2eec 100644 --- a/hphp/test/zend/bad/bug46811.php.exp +++ b/hphp/test/zend/bad/bug46811.php.exp @@ -1,2 +1,3 @@ bool(false) %unicode|string%(1) "&" + diff --git a/hphp/test/zend/bad/bug46813.php b/hphp/test/zend/bad/bug46813.php index 810b2861a..413036dfe 100644 --- a/hphp/test/zend/bad/bug46813.php +++ b/hphp/test/zend/bad/bug46813.php @@ -3,7 +3,7 @@ namespace test; { class inner { - + } } diff --git a/hphp/test/zend/bad/bug47054.php.exp b/hphp/test/zend/bad/bug47054.php.exp index ff54baa1d..b9d2bc92d 100644 --- a/hphp/test/zend/bad/bug47054.php.exp +++ b/hphp/test/zend/bad/bug47054.php.exp @@ -1,9 +1,7 @@ Called class: D Called class: C Called class: C - HipHop Warning: get_called_class() called from outside a class in hphp/test/zend/bad/bug47054.php on line %d Strict Standards: Non-static method D::m() should not be called statically in hphp/test/zend/bad/bug47054.php on line %d - HipHop Fatal error: Using $this when not in object context in hphp/test/zend/bad/bug47054.php on line %d diff --git a/hphp/test/zend/bad/bug47109.php.exp b/hphp/test/zend/bad/bug47109.php.exp index 88cd5a422..35a135dbc 100644 --- a/hphp/test/zend/bad/bug47109.php.exp +++ b/hphp/test/zend/bad/bug47109.php.exp @@ -1,3 +1,3 @@ HipHop Notice: Undefined variable: a in %sbug47109.php on line 2 - HipHop Notice: Trying to get property of non-object in %sbug47109.php on line 2 + diff --git a/hphp/test/zend/bad/bug47343.php b/hphp/test/zend/bad/bug47343.php index e957b79f5..934019c4d 100644 --- a/hphp/test/zend/bad/bug47343.php +++ b/hphp/test/zend/bad/bug47343.php @@ -5,7 +5,7 @@ class A { gc_collect_cycles(); } - + public function getB() { $this->data['foo'] = new B($this); diff --git a/hphp/test/zend/bad/bug47593.php b/hphp/test/zend/bad/bug47593.php index 8beb93465..fadc49461 100644 --- a/hphp/test/zend/bad/bug47593.php +++ b/hphp/test/zend/bad/bug47593.php @@ -9,7 +9,7 @@ class foo { } interface baz { -} +} function bar() { } diff --git a/hphp/test/zend/bad/bug48215_2.php b/hphp/test/zend/bad/bug48215_2.php index 79a961c91..fd8a1d6f4 100644 --- a/hphp/test/zend/bad/bug48215_2.php +++ b/hphp/test/zend/bad/bug48215_2.php @@ -4,7 +4,7 @@ class a { public function a() { echo __METHOD__ . "\n"; } } class b extends a {} -class c extends b { +class c extends b { function C() { b::b(); } diff --git a/hphp/test/zend/bad/bug48228.php b/hphp/test/zend/bad/bug48228.php index d54b17540..e394ad87a 100644 --- a/hphp/test/zend/bad/bug48228.php +++ b/hphp/test/zend/bad/bug48228.php @@ -4,7 +4,7 @@ function do_throw() { throw new Exception(); } -class aa +class aa { function check() { diff --git a/hphp/test/zend/bad/bug48248.php.exp b/hphp/test/zend/bad/bug48248.php.exp index 0ff122f44..9dda8e967 100644 --- a/hphp/test/zend/bad/bug48248.php.exp +++ b/hphp/test/zend/bad/bug48248.php.exp @@ -1,4 +1,3 @@ HipHop Notice: Undefined property: B::$test in hphp/test/zend/bad/bug48248.php on line %d - HipHop Notice: Only variable references should be returned by reference in hphp/test/zend/bad/bug48248.php on line %d NULL diff --git a/hphp/test/zend/bad/bug48409.php.exp b/hphp/test/zend/bad/bug48409.php.exp deleted file mode 100644 index 29b7e0595..000000000 --- a/hphp/test/zend/bad/bug48409.php.exp +++ /dev/null @@ -1 +0,0 @@ -Exception thrown diff --git a/hphp/test/zend/bad/bug48428.php.exp b/hphp/test/zend/bad/bug48428.php.exp deleted file mode 100644 index 5df7507e2..000000000 --- a/hphp/test/zend/bad/bug48428.php.exp +++ /dev/null @@ -1 +0,0 @@ -ERROR diff --git a/hphp/test/zend/bad/bug48533.php b/hphp/test/zend/bad/bug48533.php index 3dab2055c..2fc165ddc 100644 --- a/hphp/test/zend/bad/bug48533.php +++ b/hphp/test/zend/bad/bug48533.php @@ -2,7 +2,7 @@ class foo { private function a() { - var_dump(1); + var_dump(1); } public function b() { var_dump(2); diff --git a/hphp/test/zend/bad/bug48770.php b/hphp/test/zend/bad/bug48770.php index 8e4cb7f79..b388654e8 100644 --- a/hphp/test/zend/bad/bug48770.php +++ b/hphp/test/zend/bad/bug48770.php @@ -1,5 +1,5 @@ methodExists()); var_dump(method_exists($example, 'propertyFooExists')); diff --git a/hphp/test/zend/bad/bug51176.php b/hphp/test/zend/bad/bug51176.php index c7eca20ee..efb23e36a 100644 --- a/hphp/test/zend/bad/bug51176.php +++ b/hphp/test/zend/bad/bug51176.php @@ -7,12 +7,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/hphp/test/zend/bad/bug51394.php.exp b/hphp/test/zend/bad/bug51394.php.exp index ad3059252..3cd185b3c 100644 --- a/hphp/test/zend/bad/bug51394.php.exp +++ b/hphp/test/zend/bad/bug51394.php.exp @@ -3,5 +3,4 @@ Stack trace: #0 %sbug51394.php(9): eh(8, 'Undefined varia...', '%s', 9, Array) #1 {main} thrown in %sbug51394.php on line 4 - HipHop Fatal error: Function name must be a string in %sbug51394.php on line 9 \ No newline at end of file diff --git a/hphp/test/zend/bad/bug51827.php.exp b/hphp/test/zend/bad/bug51827.php.exp index 9bd0495bc..c0cce4502 100644 --- a/hphp/test/zend/bad/bug51827.php.exp +++ b/hphp/test/zend/bad/bug51827.php.exp @@ -1,3 +1,2 @@ int(1) - HipHop Warning: explode() expects at least 2 parameters, 0 given in Unknown on line %d diff --git a/hphp/test/zend/bad/bug52001.php.exp b/hphp/test/zend/bad/bug52001.php.exp index cb3f8d0af..b3689d40b 100644 --- a/hphp/test/zend/bad/bug52001.php.exp +++ b/hphp/test/zend/bad/bug52001.php.exp @@ -1,4 +1,3 @@ HipHop Notice: Undefined variable: var in %sbug52001.php on line 2 - HipHop Notice: Undefined variable: in %sbug52001.php on line 2 int(1) diff --git a/hphp/test/zend/bad/bug52041.php.exp b/hphp/test/zend/bad/bug52041.php.exp index cfee05d02..aa154f10f 100644 --- a/hphp/test/zend/bad/bug52041.php.exp +++ b/hphp/test/zend/bad/bug52041.php.exp @@ -1,50 +1,26 @@ HipHop Notice: Undefined variable: x in %sbug52041.php on line 3 - HipHop Warning: Creating default object from empty value in %sbug52041.php on line 6 - HipHop Notice: Undefined variable: x in %sbug52041.php on line 3 - HipHop Warning: Creating default object from empty value in %sbug52041.php on line 7 - HipHop Notice: Undefined variable: x in %sbug52041.php on line 3 - HipHop Warning: Creating default object from empty value in %sbug52041.php on line 8 - HipHop Notice: Undefined variable: x in %sbug52041.php on line 3 - HipHop Warning: Creating default object from empty value in %sbug52041.php on line 9 - HipHop Notice: Undefined variable: x in %sbug52041.php on line 3 - HipHop Warning: Creating default object from empty value in %sbug52041.php on line 10 - HipHop Notice: Undefined variable: x in %sbug52041.php on line 3 - HipHop Warning: Creating default object from empty value in %sbug52041.php on line 11 - HipHop Notice: Undefined variable: x in %sbug52041.php on line 3 - HipHop Notice: Undefined variable: x in %sbug52041.php on line 3 - HipHop Notice: Undefined variable: x in %sbug52041.php on line 3 - HipHop Notice: Undefined offset: 0 in %sbug52041.php on line 15 - HipHop Notice: Undefined variable: x in %sbug52041.php on line 3 - HipHop Notice: Undefined offset: 0 in %sbug52041.php on line 16 - HipHop Notice: Undefined offset: 0 in %sbug52041.php on line 16 - HipHop Notice: Undefined variable: x in %sbug52041.php on line 3 - HipHop Notice: Undefined offset: 0 in %sbug52041.php on line 17 - HipHop Notice: Undefined variable: x in %sbug52041.php on line 3 - HipHop Notice: Undefined offset: 0 in %sbug52041.php on line 18 - HipHop Notice: Undefined offset: 0 in %sbug52041.php on line 18 - HipHop Notice: Undefined variable: x in %sbug52041.php on line 3 NULL diff --git a/hphp/test/zend/bad/bug52160.php.exp b/hphp/test/zend/bad/bug52160.php.exp index bdcba39c0..d205ae798 100644 --- a/hphp/test/zend/bad/bug52160.php.exp +++ b/hphp/test/zend/bad/bug52160.php.exp @@ -1,3 +1,2 @@ Strict Standards: Redefining already defined constructor for class foo in hphp/test/zend/bad/bug52160.php on line %d - HipHop Fatal error: Constructor baz::baz() cannot be static in hphp/test/zend/bad/bug52160.php on line %d diff --git a/hphp/test/zend/bad/bug52361.php.exp b/hphp/test/zend/bad/bug52361.php.exp index 96e029ca3..1c48f4a76 100644 --- a/hphp/test/zend/bad/bug52361.php.exp +++ b/hphp/test/zend/bad/bug52361.php.exp @@ -7,3 +7,4 @@ Stack trace: Stack trace: #0 %sbug52361.php(16): bbb() #1 {main} + diff --git a/hphp/test/zend/bad/bug52614.php b/hphp/test/zend/bad/bug52614.php index 19fce8d78..568a4609e 100644 --- a/hphp/test/zend/bad/bug52614.php +++ b/hphp/test/zend/bad/bug52614.php @@ -5,7 +5,7 @@ class foo { public $a3; public $o1; public $o2; - + public function f1() { return $this->a1; } diff --git a/hphp/test/zend/bad/bug52614.php.exp b/hphp/test/zend/bad/bug52614.php.exp index d733e1013..2cac4a705 100644 --- a/hphp/test/zend/bad/bug52614.php.exp +++ b/hphp/test/zend/bad/bug52614.php.exp @@ -3,7 +3,6 @@ array(0) { } array(0) { } - HipHop Warning: Creating default object from empty value in %sbug52614.php on line 52 NULL object(stdClass)#%d (1) { diff --git a/hphp/test/zend/bad/bug53971.php.exp b/hphp/test/zend/bad/bug53971.php.exp index 5c0c0681d..d5ca18672 100644 --- a/hphp/test/zend/bad/bug53971.php.exp +++ b/hphp/test/zend/bad/bug53971.php.exp @@ -1 +1,3 @@ bool(false) + + diff --git a/hphp/test/zend/bad/bug54262.php.exp b/hphp/test/zend/bad/bug54262.php.exp index 9703432d7..88004258d 100644 --- a/hphp/test/zend/bad/bug54262.php.exp +++ b/hphp/test/zend/bad/bug54262.php.exp @@ -1,6 +1,4 @@ bool(false) - HipHop Warning: Attempt to modify property of non-object in %sbug54262.php on line 4 - HipHop Warning: Cannot use a scalar value as an array in %sbug54262.php on line 5 ok diff --git a/hphp/test/zend/bad/bug54265.php.exp b/hphp/test/zend/bad/bug54265.php.exp index a224b1c0e..8d5e69998 100644 --- a/hphp/test/zend/bad/bug54265.php.exp +++ b/hphp/test/zend/bad/bug54265.php.exp @@ -1,2 +1,3 @@ EROOR: Creating default object from empty value ok + diff --git a/hphp/test/zend/bad/bug54441.php b/hphp/test/zend/bad/bug54441.php index 60bcef2de..dcb9a17c0 100644 --- a/hphp/test/zend/bad/bug54441.php +++ b/hphp/test/zend/bad/bug54441.php @@ -6,7 +6,7 @@ trait Foo { class Boo { use Foo { - bar as dontKnow; + bar as dontKnow; dontKnow as protected; } } diff --git a/hphp/test/zend/bad/bug54624.php b/hphp/test/zend/bad/bug54624.php index e1db2af54..5c1c764c2 100644 --- a/hphp/test/zend/bad/bug54624.php +++ b/hphp/test/zend/bad/bug54624.php @@ -8,7 +8,7 @@ class A class_alias('A', 'AliasA'); -eval(' +eval(' class B extends A { function foo(AliasA $param) { diff --git a/hphp/test/zend/bad/bug55007.php b/hphp/test/zend/bad/bug55007.php index 978a8a272..04953b6c7 100644 --- a/hphp/test/zend/bad/bug55007.php +++ b/hphp/test/zend/bad/bug55007.php @@ -11,7 +11,7 @@ function shutdown() { register_shutdown_function('shutdown'); - + new CompileErrorClass(); ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/bug55156.php b/hphp/test/zend/bad/bug55156.php index 08309d7f8..6a17dc6b8 100644 --- a/hphp/test/zend/bad/bug55156.php +++ b/hphp/test/zend/bad/bug55156.php @@ -3,21 +3,21 @@ /** 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()); } - + ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/bug55214.php b/hphp/test/zend/bad/bug55214.php index 2f4c2fbef..fa00dfaa0 100644 --- a/hphp/test/zend/bad/bug55214.php +++ b/hphp/test/zend/bad/bug55214.php @@ -7,7 +7,7 @@ trait ATrait { public static function get_class_name() { return __CLASS__; } - + public function get_class_name_obj() { return __CLASS__; } @@ -15,7 +15,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/hphp/test/zend/bad/bug55247.php b/hphp/test/zend/bad/bug55247.php index 554afd379..23cdd137e 100644 --- a/hphp/test/zend/bad/bug55247.php +++ b/hphp/test/zend/bad/bug55247.php @@ -4,7 +4,7 @@ class Test{ { echo $method . PHP_EOL; } - public function __call($method, $arguments) + public function __call($method, $arguments) { echo $method . PHP_EOL; } diff --git a/hphp/test/zend/bad/bug55355.php.exp b/hphp/test/zend/bad/bug55355.php.exp deleted file mode 100644 index c8e8a135c..000000000 --- a/hphp/test/zend/bad/bug55355.php.exp +++ /dev/null @@ -1 +0,0 @@ -DONE diff --git a/hphp/test/zend/bad/bug55424.php.exp b/hphp/test/zend/bad/bug55424.php.exp deleted file mode 100644 index c8e8a135c..000000000 --- a/hphp/test/zend/bad/bug55424.php.exp +++ /dev/null @@ -1 +0,0 @@ -DONE diff --git a/hphp/test/zend/bad/bug55445.php.exp b/hphp/test/zend/bad/bug55445.php.exp deleted file mode 100644 index d87b0847d..000000000 --- a/hphp/test/zend/bad/bug55445.php.exp +++ /dev/null @@ -1 +0,0 @@ -

Welcome chris

diff --git a/hphp/test/zend/bad/bug55554b.php b/hphp/test/zend/bad/bug55554b.php index 116f09825..49eb6b7fb 100644 --- a/hphp/test/zend/bad/bug55554b.php +++ b/hphp/test/zend/bad/bug55554b.php @@ -13,7 +13,7 @@ class OverridingIsSilent1 { use TConstructor { foo as __construct; } - + public function __construct() { echo "OverridingIsSilent1 __construct\n"; } @@ -25,7 +25,7 @@ class OverridingIsSilent2 { use TConstructor { foo as OverridingIsSilent2; } - + public function OverridingIsSilent2() { echo "OverridingIsSilent2 OverridingIsSilent2\n"; } diff --git a/hphp/test/zend/bad/bug55554b.php.exp b/hphp/test/zend/bad/bug55554b.php.exp index baec9c5f2..a4ed960a6 100644 --- a/hphp/test/zend/bad/bug55554b.php.exp +++ b/hphp/test/zend/bad/bug55554b.php.exp @@ -1,4 +1,4 @@ OverridingIsSilent1 __construct OverridingIsSilent2 OverridingIsSilent2 - HipHop Fatal error: ReportCollision has colliding constructor definitions coming from traits in hphp/test/zend/bad/bug55554b.php on line %d + diff --git a/hphp/test/zend/bad/bug55554d.php.exp b/hphp/test/zend/bad/bug55554d.php.exp index 05077bb6b..b00545d95 100644 --- a/hphp/test/zend/bad/bug55554d.php.exp +++ b/hphp/test/zend/bad/bug55554d.php.exp @@ -1 +1,2 @@ HipHop Fatal error: ReportCollision has colliding constructor definitions coming from traits in hphp/test/zend/bad/bug55554d.php on line %d + diff --git a/hphp/test/zend/bad/bug55554f.php b/hphp/test/zend/bad/bug55554f.php index d4eca3e60..af3ea06b8 100644 --- a/hphp/test/zend/bad/bug55554f.php +++ b/hphp/test/zend/bad/bug55554f.php @@ -11,7 +11,7 @@ trait TNew { class ReportCollision { use TNew; - + public function ReportCollision() { echo "ReportCollision executed\n"; } diff --git a/hphp/test/zend/bad/bug55554g.php b/hphp/test/zend/bad/bug55554g.php index 5bb36e818..2843dcc1b 100644 --- a/hphp/test/zend/bad/bug55554g.php +++ b/hphp/test/zend/bad/bug55554g.php @@ -11,7 +11,7 @@ trait TLegacy { class ReportCollision { use TLegacy; - + public function __construct() { echo "ReportCollision executed\n"; } diff --git a/hphp/test/zend/bad/bug60536_001.php.exp b/hphp/test/zend/bad/bug60536_001.php.exp deleted file mode 100644 index c8e8a135c..000000000 --- a/hphp/test/zend/bad/bug60536_001.php.exp +++ /dev/null @@ -1 +0,0 @@ -DONE diff --git a/hphp/test/zend/bad/bug60536_002.php b/hphp/test/zend/bad/bug60536_002.php index 8657a573f..096918e17 100644 --- a/hphp/test/zend/bad/bug60536_002.php +++ b/hphp/test/zend/bad/bug60536_002.php @@ -2,7 +2,7 @@ error_reporting(E_ALL | E_STRICT); class Base { - private $hello; + private $hello; } trait THello1 { diff --git a/hphp/test/zend/bad/bug60536_002.php.exp b/hphp/test/zend/bad/bug60536_002.php.exp index b45909239..7b6265668 100644 --- a/hphp/test/zend/bad/bug60536_002.php.exp +++ b/hphp/test/zend/bad/bug60536_002.php.exp @@ -2,5 +2,4 @@ PRE-CLASS-GUARD Strict Standards: Notice and THello1 define the same property ($hello) in the composition of Notice. This might be incompatible, to improve maintainability consider using accessor methods in traits instead. Class was composed in hphp/test/zend/bad/bug60536_002.php on line %d POST-CLASS-GUARD - HipHop Fatal error: TraitsTest and THello1 define the same property ($hello) in the composition of TraitsTest. However, the definition differs and is considered incompatible. Class was composed in hphp/test/zend/bad/bug60536_002.php on line %d diff --git a/hphp/test/zend/bad/bug60536_004.php b/hphp/test/zend/bad/bug60536_004.php index e2a0386b5..352d9f1b8 100644 --- a/hphp/test/zend/bad/bug60536_004.php +++ b/hphp/test/zend/bad/bug60536_004.php @@ -2,7 +2,7 @@ error_reporting(E_ALL | E_STRICT); class Base { - private $hello; + private $hello; } trait THello1 { diff --git a/hphp/test/zend/bad/bug60536_005.php b/hphp/test/zend/bad/bug60536_005.php index aea880e1c..2980321ab 100644 --- a/hphp/test/zend/bad/bug60536_005.php +++ b/hphp/test/zend/bad/bug60536_005.php @@ -2,7 +2,7 @@ error_reporting(E_ALL | E_STRICT); class Base { - protected $hello; + protected $hello; } trait THello1 { diff --git a/hphp/test/zend/bad/bug60573.php.exp b/hphp/test/zend/bad/bug60573.php.exp index 239a8225e..1860f32b2 100644 --- a/hphp/test/zend/bad/bug60573.php.exp +++ b/hphp/test/zend/bad/bug60573.php.exp @@ -1,5 +1,4 @@ Strict Standards: Declaration of Bar4::setSelf() should be compatible with Foo4::setSelf(Foo4 $s) in %sbug60573.php on line %d Strict Standards: Declaration of Bar5::setSelf() should be compatible with Foo5::setSelf(Base $s) in %sbug60573.php on line %d - HipHop Fatal error: Declaration of Bar6::setSelf() must be compatible with Foo6::setSelf(Base $s) in %sbug60573.php on line %d diff --git a/hphp/test/zend/bad/bug60717.php.exp b/hphp/test/zend/bad/bug60717.php.exp deleted file mode 100644 index a965a70ed..000000000 --- a/hphp/test/zend/bad/bug60717.php.exp +++ /dev/null @@ -1 +0,0 @@ -Done diff --git a/hphp/test/zend/bad/bug60771.php.exp b/hphp/test/zend/bad/bug60771.php.exp index 8f3c0a07f..3d5d71e8c 100644 --- a/hphp/test/zend/bad/bug60771.php.exp +++ b/hphp/test/zend/bad/bug60771.php.exp @@ -1 +1 @@ -passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, +passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, diff --git a/hphp/test/zend/bad/bug60909_1.php.exp b/hphp/test/zend/bad/bug60909_1.php.exp index ed90f8941..a5b0d491d 100644 --- a/hphp/test/zend/bad/bug60909_1.php.exp +++ b/hphp/test/zend/bad/bug60909_1.php.exp @@ -5,7 +5,6 @@ Stack trace: #1 %sbug60909_1.php(8): require() #2 {main} thrown in %sbug60909_1.php on line 5 - HipHop Fatal error: main(): Failed opening required 'notfound.php' (include_path='%s') in %sbug60909_1.php on line 8 diff --git a/hphp/test/zend/bad/bug61011.php b/hphp/test/zend/bad/bug61011.php index aaa9f8a36..58ec526da 100644 --- a/hphp/test/zend/bad/bug61011.php +++ b/hphp/test/zend/bad/bug61011.php @@ -2,7 +2,7 @@ function __autoload($name) { throw new Exception($name); } -try { +try { echo AAA::$a; //zend_fetch_var_address_helper } catch (Exception $e) { try { @@ -18,7 +18,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/hphp/test/zend/bad/bug61761.php.exp b/hphp/test/zend/bad/bug61761.php.exp deleted file mode 100644 index bdc0e28d1..000000000 --- a/hphp/test/zend/bad/bug61761.php.exp +++ /dev/null @@ -1 +0,0 @@ -==DONE== diff --git a/hphp/test/zend/bad/bug61767.php.exp b/hphp/test/zend/bad/bug61767.php.exp index ca085d981..6d432187c 100644 --- a/hphp/test/zend/bad/bug61767.php.exp +++ b/hphp/test/zend/bad/bug61767.php.exp @@ -1,11 +1,9 @@ Error handler called (Undefined variable: undefined) - HipHop Warning: Uncaught exception 'ErrorException' with message 'Undefined variable: undefined' in %sbug61767.php:13 Stack trace: #0 %sbug61767.php(13): {closure}(8, 'Undefined varia...', '%s', 13, Array) #1 {main} thrown in %sbug61767.php on line 13 - HipHop Fatal error: Call to a member function foo() on a non-object in %sbug61767.php on line 13 Shutting down Array diff --git a/hphp/test/zend/bad/bug62358.php b/hphp/test/zend/bad/bug62358.php index 6a87ef719..8c5bdc6f5 100644 --- a/hphp/test/zend/bad/bug62358.php +++ b/hphp/test/zend/bad/bug62358.php @@ -1,4 +1,4 @@ - \ No newline at end of file diff --git a/hphp/test/zend/bad/bug62763.php b/hphp/test/zend/bad/bug62763.php deleted file mode 100644 index f26f84a42..000000000 --- a/hphp/test/zend/bad/bug62763.php +++ /dev/null @@ -1,18 +0,0 @@ - \ No newline at end of file diff --git a/hphp/test/zend/bad/bug62763.php.exp b/hphp/test/zend/bad/bug62763.php.exp deleted file mode 100644 index a3e4fd9af..000000000 --- a/hphp/test/zend/bad/bug62763.php.exp +++ /dev/null @@ -1 +0,0 @@ -test1::shutdowntest2::__destruct diff --git a/hphp/test/zend/bad/bug62892.php b/hphp/test/zend/bad/bug62892.php index 638a0b013..74dd738bf 100644 --- a/hphp/test/zend/bad/bug62892.php +++ b/hphp/test/zend/bad/bug62892.php @@ -1,5 +1,5 @@ ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/call_static_006.php.exp b/hphp/test/zend/bad/call_static_006.php.exp index 31c41d40c..37e70cd6b 100644 --- a/hphp/test/zend/bad/call_static_006.php.exp +++ b/hphp/test/zend/bad/call_static_006.php.exp @@ -3,5 +3,4 @@ ok Strict Standards: Non-static method foo::aa() should not be called statically in hphp/test/zend/bad/call_static_006.php on line %d ok - HipHop Fatal error: Cannot call constructor in hphp/test/zend/bad/call_static_006.php on line %d diff --git a/hphp/test/zend/bad/call_user_func_001.php b/hphp/test/zend/bad/call_user_func_001.php index 1ab50e386..e35cda642 100644 --- a/hphp/test/zend/bad/call_user_func_001.php +++ b/hphp/test/zend/bad/call_user_func_001.php @@ -4,7 +4,7 @@ namespace testing { function foobar($str) { var_dump($str); } - + abstract class bar { protected function prot($str) { print "Shouldn't be called!\n"; @@ -15,9 +15,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/hphp/test/zend/bad/call_user_func_001.php.exp b/hphp/test/zend/bad/call_user_func_001.php.exp index fe20701d3..c1b01bb07 100644 --- a/hphp/test/zend/bad/call_user_func_001.php.exp +++ b/hphp/test/zend/bad/call_user_func_001.php.exp @@ -1,5 +1,3 @@ %string|unicode%(6) "foobar" - HipHop Warning: call_user_func() expects parameter 1 to be a valid callback, cannot access private method testing\foo::priv() in hphp/test/zend/bad/call_user_func_001.php on line %d - HipHop Warning: call_user_func() expects parameter 1 to be a valid callback, cannot access protected method testing\foo::prot() in hphp/test/zend/bad/call_user_func_001.php on line %d diff --git a/hphp/test/zend/bad/call_user_func_002.php.exp b/hphp/test/zend/bad/call_user_func_002.php.exp index a4e141c86..aa50deb84 100644 --- a/hphp/test/zend/bad/call_user_func_002.php.exp +++ b/hphp/test/zend/bad/call_user_func_002.php.exp @@ -1,13 +1,7 @@ %unicode|string%(3) "foo" - HipHop Warning: call_user_func() expects parameter 1 to be a valid callback, class 'foo' not found in hphp/test/zend/bad/call_user_func_002.php on line %d - HipHop Warning: call_user_func() expects parameter 1 to be a valid callback, class '' not found in hphp/test/zend/bad/call_user_func_002.php on line %d - HipHop Notice: Undefined variable: foo in hphp/test/zend/bad/call_user_func_002.php on line %d - HipHop Warning: call_user_func() expects parameter 1 to be a valid callback, first array member is not a valid class name or object in hphp/test/zend/bad/call_user_func_002.php on line %d - HipHop Notice: Undefined variable: foo in hphp/test/zend/bad/call_user_func_002.php on line %d - HipHop Warning: call_user_func() expects parameter 1 to be a valid callback, first array member is not a valid class name or object in hphp/test/zend/bad/call_user_func_002.php on line %d diff --git a/hphp/test/zend/bad/call_user_func_003.php b/hphp/test/zend/bad/call_user_func_003.php index 22577c4b0..977dc5ffd 100644 --- a/hphp/test/zend/bad/call_user_func_003.php +++ b/hphp/test/zend/bad/call_user_func_003.php @@ -2,14 +2,14 @@ $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/hphp/test/zend/bad/call_user_func_004.php.exp b/hphp/test/zend/bad/call_user_func_004.php.exp index c20b00db7..a98dea686 100644 --- a/hphp/test/zend/bad/call_user_func_004.php.exp +++ b/hphp/test/zend/bad/call_user_func_004.php.exp @@ -1,3 +1,2 @@ Strict Standards: call_user_func() expects parameter 1 to be a valid callback, non-static method foo::teste() should not be called statically in hphp/test/zend/bad/call_user_func_004.php on line %d - HipHop Fatal error: Using $this when not in object context in hphp/test/zend/bad/call_user_func_004.php on line %d diff --git a/hphp/test/zend/bad/call_user_func_005.php b/hphp/test/zend/bad/call_user_func_005.php index 96929fbdc..7eeea4507 100644 --- a/hphp/test/zend/bad/call_user_func_005.php +++ b/hphp/test/zend/bad/call_user_func_005.php @@ -5,7 +5,7 @@ class foo { var_dump($x,$y); return 1; } - + public function teste() { return foo::x(function &($a=1,$b) { }); } diff --git a/hphp/test/zend/bad/callable_type_hint_001.php.exp b/hphp/test/zend/bad/callable_type_hint_001.php.exp index 7f701d653..66703c18d 100644 --- a/hphp/test/zend/bad/callable_type_hint_001.php.exp +++ b/hphp/test/zend/bad/callable_type_hint_001.php.exp @@ -16,3 +16,4 @@ array(2) { } object(Closure)#%d (0) { } + diff --git a/hphp/test/zend/bad/callable_type_hint_002.php.exp b/hphp/test/zend/bad/callable_type_hint_002.php.exp index 14c72c273..c8b083291 100644 --- a/hphp/test/zend/bad/callable_type_hint_002.php.exp +++ b/hphp/test/zend/bad/callable_type_hint_002.php.exp @@ -1,3 +1,4 @@ bool(true) bool(true) bool(true) + diff --git a/hphp/test/zend/bad/callable_type_hint_003.php.exp b/hphp/test/zend/bad/callable_type_hint_003.php.exp index 40524ac9c..02b6f2317 100644 --- a/hphp/test/zend/bad/callable_type_hint_003.php.exp +++ b/hphp/test/zend/bad/callable_type_hint_003.php.exp @@ -2,3 +2,4 @@ string(6) "strpos" int(123) string(6) "strpos" string(6) "substr" + diff --git a/hphp/test/zend/bad/cast_to_double.php.exp b/hphp/test/zend/bad/cast_to_double.php.exp index 03bfb80a9..e557e787e 100644 --- a/hphp/test/zend/bad/cast_to_double.php.exp +++ b/hphp/test/zend/bad/cast_to_double.php.exp @@ -10,7 +10,6 @@ float(0) float(1) float(0) float(%d) - HipHop Notice: Object of class test could not be converted to double in hphp/test/zend/bad/cast_to_double.php on line %d float(1) Done diff --git a/hphp/test/zend/bad/cast_to_int.php.exp b/hphp/test/zend/bad/cast_to_int.php.exp index cb6f07d1f..9b3c65afe 100644 --- a/hphp/test/zend/bad/cast_to_int.php.exp +++ b/hphp/test/zend/bad/cast_to_int.php.exp @@ -10,7 +10,6 @@ int(0) int(1) int(0) int(%d) - HipHop Notice: Object of class test could not be converted to int in hphp/test/zend/bad/cast_to_int.php on line %d int(1) Done diff --git a/hphp/test/zend/bad/cast_to_string.php.exp b/hphp/test/zend/bad/cast_to_string.php.exp index 2c7cf0307..c778db105 100644 Binary files a/hphp/test/zend/bad/cast_to_string.php.exp and b/hphp/test/zend/bad/cast_to_string.php.exp differ diff --git a/hphp/test/zend/bad/catch_002.php.exp b/hphp/test/zend/bad/catch_002.php.exp deleted file mode 100644 index a0a5d3e0c..000000000 --- a/hphp/test/zend/bad/catch_002.php.exp +++ /dev/null @@ -1,2 +0,0 @@ -Caught -===DONE=== diff --git a/hphp/test/zend/bad/catch_003.php.exp b/hphp/test/zend/bad/catch_003.php.exp deleted file mode 100644 index a0a5d3e0c..000000000 --- a/hphp/test/zend/bad/catch_003.php.exp +++ /dev/null @@ -1,2 +0,0 @@ -Caught -===DONE=== diff --git a/hphp/test/zend/bad/catch_004.php.exp b/hphp/test/zend/bad/catch_004.php.exp deleted file mode 100644 index a0a5d3e0c..000000000 --- a/hphp/test/zend/bad/catch_004.php.exp +++ /dev/null @@ -1,2 +0,0 @@ -Caught -===DONE=== diff --git a/hphp/test/zend/bad/class_alias_003.php b/hphp/test/zend/bad/class_alias_003.php index 94040200c..04010352b 100644 --- a/hphp/test/zend/bad/class_alias_003.php +++ b/hphp/test/zend/bad/class_alias_003.php @@ -3,7 +3,7 @@ class bar { } -class foo { +class foo { public function test() { class_alias('bar', 'static'); return new static; diff --git a/hphp/test/zend/bad/class_alias_005.php b/hphp/test/zend/bad/class_alias_005.php index 744f3e08f..2772b773b 100644 --- a/hphp/test/zend/bad/class_alias_005.php +++ b/hphp/test/zend/bad/class_alias_005.php @@ -1,6 +1,6 @@ x."\n"; }; } - + function getError() { return static function() { echo $this->x."\n"; }; } - + function printX() { echo $this->x."\n"; } diff --git a/hphp/test/zend/bad/closure_005.php.exp b/hphp/test/zend/bad/closure_005.php.exp index 136c56877..d869e7f5d 100644 --- a/hphp/test/zend/bad/closure_005.php.exp +++ b/hphp/test/zend/bad/closure_005.php.exp @@ -5,5 +5,4 @@ 7 7 Destroyed - HipHop Fatal error: Using $this when not in object context in %sclosure_005.php on line 28 diff --git a/hphp/test/zend/bad/closure_012.php.exp b/hphp/test/zend/bad/closure_012.php.exp index ab57a4e31..0597b87ab 100644 --- a/hphp/test/zend/bad/closure_012.php.exp +++ b/hphp/test/zend/bad/closure_012.php.exp @@ -1,5 +1,5 @@ HipHop Notice: Undefined variable: i in %sclosure_012.php on line 2 - HipHop Notice: Undefined variable: i in %sclosure_012.php on line 7 NULL int(2) + diff --git a/hphp/test/zend/bad/closure_020.php b/hphp/test/zend/bad/closure_020.php index c5535e533..5f601e61c 100644 --- a/hphp/test/zend/bad/closure_020.php +++ b/hphp/test/zend/bad/closure_020.php @@ -2,14 +2,14 @@ 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/hphp/test/zend/bad/closure_020.php.exp b/hphp/test/zend/bad/closure_020.php.exp index cbebea42d..f71d49127 100644 --- a/hphp/test/zend/bad/closure_020.php.exp +++ b/hphp/test/zend/bad/closure_020.php.exp @@ -14,5 +14,4 @@ object(foo)#%d (2) { } bool(true) bool(true) - HipHop Fatal error: Cannot access private property foo::$test in hphp/test/zend/bad/closure_020.php on line %d diff --git a/hphp/test/zend/bad/closure_022.php.exp b/hphp/test/zend/bad/closure_022.php.exp index 1916eba33..841c3eee3 100644 --- a/hphp/test/zend/bad/closure_022.php.exp +++ b/hphp/test/zend/bad/closure_022.php.exp @@ -1 +1,2 @@ Catchable fatal error: Closure object cannot have properties in %sclosure_022.php on line 5 + diff --git a/hphp/test/zend/bad/closure_023.php.exp b/hphp/test/zend/bad/closure_023.php.exp index a965a70ed..32fe2fc66 100644 --- a/hphp/test/zend/bad/closure_023.php.exp +++ b/hphp/test/zend/bad/closure_023.php.exp @@ -1 +1,2 @@ Done + diff --git a/hphp/test/zend/bad/closure_026.php b/hphp/test/zend/bad/closure_026.php index 2f2c65b27..9f2fd62ff 100644 --- a/hphp/test/zend/bad/closure_026.php +++ b/hphp/test/zend/bad/closure_026.php @@ -3,13 +3,13 @@ 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/hphp/test/zend/bad/closure_027.php.exp b/hphp/test/zend/bad/closure_027.php.exp index e019cda85..d50291359 100644 --- a/hphp/test/zend/bad/closure_027.php.exp +++ b/hphp/test/zend/bad/closure_027.php.exp @@ -1,9 +1,7 @@ object(stdClass)#%d (0) { } NULL - HipHop Notice: Undefined variable: y in hphp/test/zend/bad/closure_027.php on line %d - HipHop Warning: Missing argument 1 for {closure}(), called in hphp/test/zend/bad/closure_027.php on line %d and defined in hphp/test/zend/bad/closure_027.php on line %d NULL diff --git a/hphp/test/zend/bad/closure_031.php.exp b/hphp/test/zend/bad/closure_031.php.exp index 73e7c7c09..d6b14edc2 100644 --- a/hphp/test/zend/bad/closure_031.php.exp +++ b/hphp/test/zend/bad/closure_031.php.exp @@ -1,2 +1,3 @@ Error: Closure object cannot have properties NULL + diff --git a/hphp/test/zend/bad/closure_032.php.exp b/hphp/test/zend/bad/closure_032.php.exp index dd861cdd9..2ae007772 100644 --- a/hphp/test/zend/bad/closure_032.php.exp +++ b/hphp/test/zend/bad/closure_032.php.exp @@ -51,3 +51,4 @@ Array ) #0 {closure}(23) called at [%s:%d] #1 test(Closure Object ()) called at [%s:%d] + diff --git a/hphp/test/zend/bad/closure_033.php.exp b/hphp/test/zend/bad/closure_033.php.exp index 9b4cd98ab..2ee4c8063 100644 --- a/hphp/test/zend/bad/closure_033.php.exp +++ b/hphp/test/zend/bad/closure_033.php.exp @@ -1,3 +1,2 @@ Test::{closure}() - HipHop Fatal error: Call to private method Test::func() from context '' in %sclosure_033.php on line %d diff --git a/hphp/test/zend/bad/closure_035.php b/hphp/test/zend/bad/closure_035.php index b9edc3de1..77d28453f 100644 --- a/hphp/test/zend/bad/closure_035.php +++ b/hphp/test/zend/bad/closure_035.php @@ -4,7 +4,7 @@ $x = function () use (&$x) { $h = function () use ($x) { var_dump($x); return 1; - }; + }; return $h(); }; diff --git a/hphp/test/zend/bad/closure_036.php b/hphp/test/zend/bad/closure_036.php index 75c9e718a..a1a96a4c9 100644 --- a/hphp/test/zend/bad/closure_036.php +++ b/hphp/test/zend/bad/closure_036.php @@ -2,11 +2,11 @@ class A { private $x; - + public function __construct($v) { $this->x = $v; } - + public function getIncrementor() { return function() { return ++$this->x; }; } diff --git a/hphp/test/zend/bad/closure_038.php b/hphp/test/zend/bad/closure_038.php index 63ef378de..bac042f1c 100644 --- a/hphp/test/zend/bad/closure_038.php +++ b/hphp/test/zend/bad/closure_038.php @@ -2,11 +2,11 @@ class A { private $x; - + public function __construct($v) { $this->x = $v; } - + public function getIncrementor() { return function() { return ++$this->x; }; } diff --git a/hphp/test/zend/bad/closure_038.php.exp b/hphp/test/zend/bad/closure_038.php.exp index 2ef04c46f..8d8aea67d 100644 --- a/hphp/test/zend/bad/closure_038.php.exp +++ b/hphp/test/zend/bad/closure_038.php.exp @@ -5,5 +5,4 @@ int(22) Testing with scope as string int(23) int(24) - HipHop Fatal error: Cannot access private property B::$x in hphp/test/zend/bad/closure_038.php on line %d diff --git a/hphp/test/zend/bad/closure_039.php b/hphp/test/zend/bad/closure_039.php index deddc4c55..aea72a26b 100644 --- a/hphp/test/zend/bad/closure_039.php +++ b/hphp/test/zend/bad/closure_039.php @@ -2,11 +2,11 @@ class A { private $x; - + public function __construct($v) { $this->x = $v; } - + public function getIncrementor() { return function() { return ++$this->x; }; } diff --git a/hphp/test/zend/bad/closure_039.php.exp b/hphp/test/zend/bad/closure_039.php.exp index 793327edb..5649d2bf8 100644 --- a/hphp/test/zend/bad/closure_039.php.exp +++ b/hphp/test/zend/bad/closure_039.php.exp @@ -5,5 +5,4 @@ int(22) Testing with scope as string int(23) int(24) - HipHop Fatal error: Cannot access private property B::$x in hphp/test/zend/bad/closure_039.php on line %d diff --git a/hphp/test/zend/bad/closure_040.php b/hphp/test/zend/bad/closure_040.php index bb9a9106a..c5e5e504a 100644 --- a/hphp/test/zend/bad/closure_040.php +++ b/hphp/test/zend/bad/closure_040.php @@ -3,11 +3,11 @@ 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/hphp/test/zend/bad/closure_040.php.exp b/hphp/test/zend/bad/closure_040.php.exp index b253a177a..cd6e05a61 100644 --- a/hphp/test/zend/bad/closure_040.php.exp +++ b/hphp/test/zend/bad/closure_040.php.exp @@ -1,11 +1,6 @@ HipHop Notice: Array to string conversion in hphp/test/zend/bad/closure_040.php on line %d - HipHop Warning: Class 'Array' not found in hphp/test/zend/bad/closure_040.php on line %d - HipHop Warning: Closure::bindTo() expects parameter 1 to be object, array given in hphp/test/zend/bad/closure_040.php on line 25 - HipHop Warning: Closure::bindTo() expects at most 2 parameters, 3 given in hphp/test/zend/bad/closure_040.php on line %d - HipHop Warning: Closure::bindTo() expects at least 1 parameter, 0 given in hphp/test/zend/bad/closure_040.php on line %d - HipHop Warning: Cannot bind an instance to a static closure in hphp/test/zend/bad/closure_040.php on line %d diff --git a/hphp/test/zend/bad/closure_041.php.exp b/hphp/test/zend/bad/closure_041.php.exp index 282cfab51..1583211c5 100644 --- a/hphp/test/zend/bad/closure_041.php.exp +++ b/hphp/test/zend/bad/closure_041.php.exp @@ -16,16 +16,13 @@ scoped to A: bool(true) bound: no scoped to A: bool(true) bound: no - HipHop Warning: Cannot bind an instance to a static closure in hphp/test/zend/bad/closure_041.php on line %d After binding, with same-class instance for the bound ones - HipHop Warning: Cannot bind an instance to a static closure in hphp/test/zend/bad/closure_041.php on line %d scoped to A: bool(false) bound: no scoped to A: bool(false) bound: A (should be scoped to dummy class) - HipHop Warning: Cannot bind an instance to a static closure in hphp/test/zend/bad/closure_041.php on line %d scoped to A: bool(true) bound: no diff --git a/hphp/test/zend/bad/closure_043.php.exp b/hphp/test/zend/bad/closure_043.php.exp index 2e000f3b3..54b69fca8 100644 --- a/hphp/test/zend/bad/closure_043.php.exp +++ b/hphp/test/zend/bad/closure_043.php.exp @@ -13,12 +13,10 @@ bool(false) bool(false) After binding, null scope, with instance - HipHop Warning: Cannot bind an instance to a static closure in hphp/test/zend/bad/closure_043.php on line %d bool(false) bool(false) - HipHop Warning: Cannot bind an instance to a static closure in hphp/test/zend/bad/closure_043.php on line %d bool(false) bool(false) @@ -31,12 +29,10 @@ bool(true) bool(false) After binding, with scope, with instance - HipHop Warning: Cannot bind an instance to a static closure in hphp/test/zend/bad/closure_043.php on line %d bool(true) bool(false) - HipHop Warning: Cannot bind an instance to a static closure in hphp/test/zend/bad/closure_043.php on line %d bool(true) bool(false) diff --git a/hphp/test/zend/bad/closure_046.php.exp b/hphp/test/zend/bad/closure_046.php.exp index 20017736e..d355906e5 100644 --- a/hphp/test/zend/bad/closure_046.php.exp +++ b/hphp/test/zend/bad/closure_046.php.exp @@ -12,7 +12,6 @@ bool(false) bool(true) bool(false) - HipHop Warning: Cannot bind an instance to a static closure in hphp/test/zend/bad/closure_046.php on line %d After binding, with same-class instance for the bound one bool(false) diff --git a/hphp/test/zend/bad/compare_001.php b/hphp/test/zend/bad/compare_001.php index dd5e7d145..cf8a5788c 100644 --- a/hphp/test/zend/bad/compare_001.php +++ b/hphp/test/zend/bad/compare_001.php @@ -39,7 +39,7 @@ foreach($a as $var) { my_dump($a[$i]); echo "\n"; } -} +} echo "Done\n"; ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/compare_001_64bit.php b/hphp/test/zend/bad/compare_001_64bit.php index dd5e7d145..cf8a5788c 100644 --- a/hphp/test/zend/bad/compare_001_64bit.php +++ b/hphp/test/zend/bad/compare_001_64bit.php @@ -39,7 +39,7 @@ foreach($a as $var) { my_dump($a[$i]); echo "\n"; } -} +} echo "Done\n"; ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/compare_002.php b/hphp/test/zend/bad/compare_002.php index b28d5e420..49566969f 100644 --- a/hphp/test/zend/bad/compare_002.php +++ b/hphp/test/zend/bad/compare_002.php @@ -39,7 +39,7 @@ foreach($a as $var) { my_dump($a[$i]); echo "\n"; } -} +} echo "Done\n"; ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/compare_002_64bit.php b/hphp/test/zend/bad/compare_002_64bit.php index b28d5e420..49566969f 100644 --- a/hphp/test/zend/bad/compare_002_64bit.php +++ b/hphp/test/zend/bad/compare_002_64bit.php @@ -39,7 +39,7 @@ foreach($a as $var) { my_dump($a[$i]); echo "\n"; } -} +} echo "Done\n"; ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/compare_003.php b/hphp/test/zend/bad/compare_003.php index 98b77d376..60b94f58a 100644 --- a/hphp/test/zend/bad/compare_003.php +++ b/hphp/test/zend/bad/compare_003.php @@ -39,7 +39,7 @@ foreach($a as $var) { my_dump($a[$i]); echo "\n"; } -} +} echo "Done\n"; ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/compare_003_64bit.php b/hphp/test/zend/bad/compare_003_64bit.php index 98b77d376..60b94f58a 100644 --- a/hphp/test/zend/bad/compare_003_64bit.php +++ b/hphp/test/zend/bad/compare_003_64bit.php @@ -39,7 +39,7 @@ foreach($a as $var) { my_dump($a[$i]); echo "\n"; } -} +} echo "Done\n"; ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/compare_004.php b/hphp/test/zend/bad/compare_004.php index d12cdb3ff..93d63296b 100644 --- a/hphp/test/zend/bad/compare_004.php +++ b/hphp/test/zend/bad/compare_004.php @@ -39,7 +39,7 @@ foreach($a as $var) { my_dump($a[$i]); echo "\n"; } -} +} echo "Done\n"; ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/compare_004_64bit.php b/hphp/test/zend/bad/compare_004_64bit.php index d12cdb3ff..93d63296b 100644 --- a/hphp/test/zend/bad/compare_004_64bit.php +++ b/hphp/test/zend/bad/compare_004_64bit.php @@ -39,7 +39,7 @@ foreach($a as $var) { my_dump($a[$i]); echo "\n"; } -} +} echo "Done\n"; ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/compare_005.php b/hphp/test/zend/bad/compare_005.php index b781f66cd..126389ff6 100644 --- a/hphp/test/zend/bad/compare_005.php +++ b/hphp/test/zend/bad/compare_005.php @@ -39,7 +39,7 @@ foreach($a as $var) { my_dump($a[$i]); echo "\n"; } -} +} echo "Done\n"; ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/compare_005_64bit.php b/hphp/test/zend/bad/compare_005_64bit.php index b781f66cd..126389ff6 100644 --- a/hphp/test/zend/bad/compare_005_64bit.php +++ b/hphp/test/zend/bad/compare_005_64bit.php @@ -39,7 +39,7 @@ foreach($a as $var) { my_dump($a[$i]); echo "\n"; } -} +} echo "Done\n"; ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/compare_006.php b/hphp/test/zend/bad/compare_006.php index aba5f896d..5648971ff 100644 --- a/hphp/test/zend/bad/compare_006.php +++ b/hphp/test/zend/bad/compare_006.php @@ -39,7 +39,7 @@ foreach($a as $var) { my_dump($a[$i]); echo "\n"; } -} +} echo "Done\n"; ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/compare_006_64bit.php b/hphp/test/zend/bad/compare_006_64bit.php index aba5f896d..5648971ff 100644 --- a/hphp/test/zend/bad/compare_006_64bit.php +++ b/hphp/test/zend/bad/compare_006_64bit.php @@ -39,7 +39,7 @@ foreach($a as $var) { my_dump($a[$i]); echo "\n"; } -} +} echo "Done\n"; ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/concat_001.php.exp b/hphp/test/zend/bad/concat_001.php.exp index 281898d84..f9bbe47ef 100644 --- a/hphp/test/zend/bad/concat_001.php.exp +++ b/hphp/test/zend/bad/concat_001.php.exp @@ -1,20 +1,14 @@ HipHop Notice: Array to string conversion in %sconcat_001.php on line %d string(24) "Arraythis is test object" - HipHop Notice: Array to string conversion in %sconcat_001.php on line %d string(16) "Arraysome string" - HipHop Notice: Array to string conversion in %sconcat_001.php on line %d string(8) "Array222" - HipHop Notice: Array to string conversion in %sconcat_001.php on line %d string(13) "Array2323.444" - HipHop Notice: Array to string conversion in %sconcat_001.php on line %d - HipHop Notice: Array to string conversion in %sconcat_001.php on line %d string(10) "ArrayArray" - HipHop Notice: Array to string conversion in %sconcat_001.php on line %d string(24) "this is test objectArray" string(30) "this is test objectsome string" @@ -22,20 +16,17 @@ string(22) "this is test object222" string(27) "this is test object2323.444" string(38) "this is test objectthis is test object" string(30) "some stringthis is test object" - HipHop Notice: Array to string conversion in %sconcat_001.php on line %d string(16) "some stringArray" string(14) "some string222" string(19) "some string2323.444" string(22) "some stringsome string" - HipHop Notice: Array to string conversion in %sconcat_001.php on line %d string(8) "222Array" string(22) "222this is test object" string(14) "222some string" string(11) "2222323.444" string(6) "222222" - HipHop Notice: Array to string conversion in %sconcat_001.php on line %d string(13) "2323.444Array" string(27) "2323.444this is test object" diff --git a/hphp/test/zend/bad/constants_002.php.exp b/hphp/test/zend/bad/constants_002.php.exp index 421defe14..dc4323f70 100644 --- a/hphp/test/zend/bad/constants_002.php.exp +++ b/hphp/test/zend/bad/constants_002.php.exp @@ -1,5 +1,4 @@ HipHop Warning: Constants may only evaluate to scalar values in hphp/test/zend/bad/constants_002.php on line %d - HipHop Notice: Use of undefined constant foo - assumed 'foo' in hphp/test/zend/bad/constants_002.php on line %d string(%d) "foo" resource(%d) of type (stream) diff --git a/hphp/test/zend/bad/constants_009.php b/hphp/test/zend/bad/constants_009.php index c3b0ec4aa..a522e1aac 100644 --- a/hphp/test/zend/bad/constants_009.php +++ b/hphp/test/zend/bad/constants_009.php @@ -4,7 +4,7 @@ namespace foo\x; const x = 2; -class x { +class x { const x = 1; } diff --git a/hphp/test/zend/bad/constructor_args.php.exp b/hphp/test/zend/bad/constructor_args.php.exp deleted file mode 100644 index 68d4b10e1..000000000 --- a/hphp/test/zend/bad/constructor_args.php.exp +++ /dev/null @@ -1 +0,0 @@ -ok! diff --git a/hphp/test/zend/bad/debug_backtrace_options.php b/hphp/test/zend/bad/debug_backtrace_options.php index ca7ae6908..a9bffb55c 100644 --- a/hphp/test/zend/bad/debug_backtrace_options.php +++ b/hphp/test/zend/bad/debug_backtrace_options.php @@ -26,8 +26,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/hphp/test/zend/bad/debug_backtrace_options.php.exp b/hphp/test/zend/bad/debug_backtrace_options.php.exp index 2555de65c..4f86f549e 100644 --- a/hphp/test/zend/bad/debug_backtrace_options.php.exp +++ b/hphp/test/zend/bad/debug_backtrace_options.php.exp @@ -159,7 +159,7 @@ Array [function] => backtrace_print [args] => Array ( - [0] => + [0] => ) ) diff --git a/hphp/test/zend/bad/declare_001.php.exp b/hphp/test/zend/bad/declare_001.php.exp index 95fdc8b35..dd6edd68d 100644 --- a/hphp/test/zend/bad/declare_001.php.exp +++ b/hphp/test/zend/bad/declare_001.php.exp @@ -1,7 +1,4 @@ HipHop Warning: Unsupported encoding [1] in %sdeclare_001.php on line %d - HipHop Warning: Unsupported encoding [1.1231312321313E+20] in %sdeclare_001.php on line %d - HipHop Warning: Unsupported encoding [] in %sdeclare_001.php on line %d - HipHop Fatal error: Cannot use constants as encoding in %sdeclare_001.php on line %d diff --git a/hphp/test/zend/bad/declare_002.php.exp b/hphp/test/zend/bad/declare_002.php.exp index 63e3bb310..d46bd1735 100644 --- a/hphp/test/zend/bad/declare_002.php.exp +++ b/hphp/test/zend/bad/declare_002.php.exp @@ -1,7 +1,4 @@ HipHop Warning: Unsupported encoding [%d] in %sdeclare_002.php on line 3 - HipHop Warning: Unsupported encoding [%f] in %sdeclare_002.php on line 4 - HipHop Warning: Unsupported encoding [] in %sdeclare_002.php on line 5 - HipHop Fatal error: Cannot use constants as encoding in %sdeclare_002.php on line 7 diff --git a/hphp/test/zend/bad/declare_003.php.exp b/hphp/test/zend/bad/declare_003.php.exp index 7631b9486..9b68b851d 100644 --- a/hphp/test/zend/bad/declare_003.php.exp +++ b/hphp/test/zend/bad/declare_003.php.exp @@ -1,7 +1,4 @@ HipHop Warning: Unsupported encoding [1] in %sdeclare_003.php on line %d - HipHop Warning: Unsupported encoding [11111111111111] in %sdeclare_003.php on line %d - HipHop Warning: Unsupported encoding [] in %sdeclare_003.php on line %d - HipHop Fatal error: Cannot use constants as encoding in %sdeclare_003.php on line %d diff --git a/hphp/test/zend/bad/declare_004.php.exp b/hphp/test/zend/bad/declare_004.php.exp index 13ffee83a..b7a0fe4ac 100644 --- a/hphp/test/zend/bad/declare_004.php.exp +++ b/hphp/test/zend/bad/declare_004.php.exp @@ -1,7 +1,4 @@ HipHop Warning: Unsupported encoding [%d] in %sdeclare_004.php on line 3 - HipHop Warning: Unsupported encoding [%f] in %sdeclare_004.php on line 4 - HipHop Warning: Unsupported encoding [] in %sdeclare_004.php on line 5 - HipHop Fatal error: Cannot use constants as encoding in %sdeclare_004.php on line 6 diff --git a/hphp/test/zend/bad/dereference_001.php b/hphp/test/zend/bad/dereference_001.php index 89fe234a3..7d41e53f8 100644 --- a/hphp/test/zend/bad/dereference_001.php +++ b/hphp/test/zend/bad/dereference_001.php @@ -9,11 +9,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/hphp/test/zend/bad/dereference_001.php.exp b/hphp/test/zend/bad/dereference_001.php.exp index 12e9894ef..e264978de 100644 --- a/hphp/test/zend/bad/dereference_001.php.exp +++ b/hphp/test/zend/bad/dereference_001.php.exp @@ -1,5 +1,4 @@ int(5) - HipHop Notice: Undefined offset: 0 in hphp/test/zend/bad/dereference_001.php on line %d NULL int(1) diff --git a/hphp/test/zend/bad/dereference_002.php.exp b/hphp/test/zend/bad/dereference_002.php.exp index c1cb39bba..b03002a0c 100644 --- a/hphp/test/zend/bad/dereference_002.php.exp +++ b/hphp/test/zend/bad/dereference_002.php.exp @@ -33,10 +33,7 @@ array(2) { } int(1) NULL - HipHop Notice: Undefined offset: 4 in hphp/test/zend/bad/dereference_002.php on line %d NULL - HipHop Notice: Undefined offset: 3 in hphp/test/zend/bad/dereference_002.php on line %d - HipHop Fatal error: Call to a member function bar() on a non-object in hphp/test/zend/bad/dereference_002.php on line %d diff --git a/hphp/test/zend/bad/dereference_007.php b/hphp/test/zend/bad/dereference_007.php index 4fe655d0c..ad0d51ae2 100644 --- a/hphp/test/zend/bad/dereference_007.php +++ b/hphp/test/zend/bad/dereference_007.php @@ -4,17 +4,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/hphp/test/zend/bad/dereference_010.php.exp b/hphp/test/zend/bad/dereference_010.php.exp index 6eee32b63..7bdae7525 100644 --- a/hphp/test/zend/bad/dereference_010.php.exp +++ b/hphp/test/zend/bad/dereference_010.php.exp @@ -1,4 +1,3 @@ NULL NULL - HipHop Fatal error: Cannot use object of type stdClass as array in hphp/test/zend/bad/dereference_010.php on line %d diff --git a/hphp/test/zend/bad/dereference_011.php b/hphp/test/zend/bad/dereference_011.php index 35012bed8..18daf7d76 100644 --- a/hphp/test/zend/bad/dereference_011.php +++ b/hphp/test/zend/bad/dereference_011.php @@ -4,7 +4,7 @@ error_reporting(E_ALL); class foo { public $arr; - + public function &a() { return $this->arr; } diff --git a/hphp/test/zend/bad/dereference_012.php b/hphp/test/zend/bad/dereference_012.php index aae17b72e..0b2f42c81 100644 --- a/hphp/test/zend/bad/dereference_012.php +++ b/hphp/test/zend/bad/dereference_012.php @@ -2,12 +2,12 @@ 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/hphp/test/zend/bad/dereference_013.php b/hphp/test/zend/bad/dereference_013.php index a57af08e2..3bb9e58a2 100644 --- a/hphp/test/zend/bad/dereference_013.php +++ b/hphp/test/zend/bad/dereference_013.php @@ -4,7 +4,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/hphp/test/zend/bad/dereference_013.php.exp b/hphp/test/zend/bad/dereference_013.php.exp index 3d107a8a9..96472404b 100644 --- a/hphp/test/zend/bad/dereference_013.php.exp +++ b/hphp/test/zend/bad/dereference_013.php.exp @@ -3,6 +3,5 @@ array(1) { [0]=> int(1) } - HipHop Notice: Undefined offset: %d in hphp/test/zend/bad/dereference_013.php on line %d NULL diff --git a/hphp/test/zend/bad/dereference_014.php b/hphp/test/zend/bad/dereference_014.php index 5c16e3e0f..a345a549f 100644 --- a/hphp/test/zend/bad/dereference_014.php +++ b/hphp/test/zend/bad/dereference_014.php @@ -5,11 +5,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/hphp/test/zend/bad/dereference_014.php.exp b/hphp/test/zend/bad/dereference_014.php.exp index 5279cad22..40608c225 100644 --- a/hphp/test/zend/bad/dereference_014.php.exp +++ b/hphp/test/zend/bad/dereference_014.php.exp @@ -1,5 +1,4 @@ HipHop Notice: Trying to get property of non-object in hphp/test/zend/bad/dereference_014.php on line %d NULL - HipHop Notice: Trying to get property of non-object in hphp/test/zend/bad/dereference_014.php on line %d NULL diff --git a/hphp/test/zend/bad/dynamic_call_001.php b/hphp/test/zend/bad/dynamic_call_001.php index e447d7d61..bbc302150 100644 --- a/hphp/test/zend/bad/dynamic_call_001.php +++ b/hphp/test/zend/bad/dynamic_call_001.php @@ -1,8 +1,8 @@ - \ No newline at end of file diff --git a/hphp/test/zend/bad/errmsg_003.php.exp b/hphp/test/zend/bad/errmsg_003.php.exp deleted file mode 100644 index 58f5d32f7..000000000 --- a/hphp/test/zend/bad/errmsg_003.php.exp +++ /dev/null @@ -1 +0,0 @@ -HipHop Fatal error: Cannot re-assign $this in hphp/test/zend/bad/errmsg_003.php on line %d diff --git a/hphp/test/zend/bad/errmsg_018.php.exp b/hphp/test/zend/bad/errmsg_018.php.exp index f6c283fb1..672c2819d 100644 --- a/hphp/test/zend/bad/errmsg_018.php.exp +++ b/hphp/test/zend/bad/errmsg_018.php.exp @@ -1,3 +1,2 @@ Strict Standards: Static function test::foo() should not be abstract in hphp/test/zend/bad/errmsg_018.php on line %d - HipHop Fatal error: Class test contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (test::foo) in hphp/test/zend/bad/errmsg_018.php on line %d diff --git a/hphp/test/zend/bad/errmsg_023.php b/hphp/test/zend/bad/errmsg_023.php index 9b91904b5..face316f4 100644 --- a/hphp/test/zend/bad/errmsg_023.php +++ b/hphp/test/zend/bad/errmsg_023.php @@ -4,7 +4,7 @@ class test1 { protected $var; } -class test extends test1 { +class test extends test1 { private $var; } diff --git a/hphp/test/zend/bad/error_001.php b/hphp/test/zend/bad/error_001.php index ccd9cdd3f..e49e6835e 100644 --- a/hphp/test/zend/bad/error_001.php +++ b/hphp/test/zend/bad/error_001.php @@ -1,6 +1,6 @@ a, $this->b, $this->c); - } + } } new C; diff --git a/hphp/test/zend/bad/get_class_vars_002.php.exp b/hphp/test/zend/bad/get_class_vars_002.php.exp index 2164773e2..862559eaf 100644 --- a/hphp/test/zend/bad/get_class_vars_002.php.exp +++ b/hphp/test/zend/bad/get_class_vars_002.php.exp @@ -10,9 +10,7 @@ array(3) { ["cc"]=> int(6) } - HipHop Notice: Undefined property: C::$b in hphp/test/zend/bad/get_class_vars_002.php on line %d - HipHop Notice: Undefined property: C::$c in hphp/test/zend/bad/get_class_vars_002.php on line %d int(1) NULL diff --git a/hphp/test/zend/bad/get_class_vars_003.php b/hphp/test/zend/bad/get_class_vars_003.php index 98d37c633..1dc1084e1 100644 --- a/hphp/test/zend/bad/get_class_vars_003.php +++ b/hphp/test/zend/bad/get_class_vars_003.php @@ -10,7 +10,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')); } @@ -23,7 +23,7 @@ class C extends B { public function __construct() { parent::__construct(); - } + } } new C; diff --git a/hphp/test/zend/bad/get_class_vars_005.php b/hphp/test/zend/bad/get_class_vars_005.php index 1384339cf..3ca616318 100644 --- a/hphp/test/zend/bad/get_class_vars_005.php +++ b/hphp/test/zend/bad/get_class_vars_005.php @@ -10,7 +10,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/hphp/test/zend/bad/get_defined_functions_basic.php b/hphp/test/zend/bad/get_defined_functions_basic.php index b60cafad7..1b78b78e5 100644 --- a/hphp/test/zend/bad/get_defined_functions_basic.php +++ b/hphp/test/zend/bad/get_defined_functions_basic.php @@ -25,19 +25,19 @@ if (!is_array($func)) { if (!is_array($func["internal"])) { - echo "TEST FAILED: no element in result array with key 'internal'\n"; -} + echo "TEST FAILED: no element in result array with key 'internal'\n"; +} $internal = $func["internal"]; //check for a few core functions if (!in_array("cos", $internal) || !in_array("strlen", $internal)) { - echo "TEST FAILED: missing elements from 'internal' array\n"; - var_dump($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"; + echo "TEST FAILED: no element in result array with key 'user'\n"; } $user = $func["user"]; @@ -46,7 +46,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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/get_defined_functions_error.php b/hphp/test/zend/bad/get_defined_functions_error.php index ba959ffcd..64fd37cbf 100644 --- a/hphp/test/zend/bad/get_defined_functions_error.php +++ b/hphp/test/zend/bad/get_defined_functions_error.php @@ -13,5 +13,5 @@ echo "\n-- Testing get_defined_functions() function with more than expected no. $extra_arg = 10; var_dump( get_defined_functions($extra_arg) ); -?> +?> ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/get_defined_functions_error.php.exp b/hphp/test/zend/bad/get_defined_functions_error.php.exp index 2ffc6e82d..6ee0a40fa 100644 --- a/hphp/test/zend/bad/get_defined_functions_error.php.exp +++ b/hphp/test/zend/bad/get_defined_functions_error.php.exp @@ -1,8 +1,7 @@ *** Testing get_defined_functions() : error conditions *** -- Testing get_defined_functions() function with more than expected no. of arguments -- - HipHop Warning: get_defined_functions() expects exactly 0 parameters, 1 given in hphp/test/zend/bad/get_defined_functions_error.php on line %d NULL - + ===Done=== diff --git a/hphp/test/zend/bad/get_defined_vars.php b/hphp/test/zend/bad/get_defined_vars.php index cbb5237fd..102e4b54b 100644 --- a/hphp/test/zend/bad/get_defined_vars.php +++ b/hphp/test/zend/bad/get_defined_vars.php @@ -31,7 +31,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"] ); @@ -60,4 +60,4 @@ func2(); func1(); echo "\nDone"; -?> \ No newline at end of file +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/globals_001.php.exp b/hphp/test/zend/bad/globals_001.php.exp index 3259368e3..cea561ffd 100644 --- a/hphp/test/zend/bad/globals_001.php.exp +++ b/hphp/test/zend/bad/globals_001.php.exp @@ -3,10 +3,8 @@ bool(false) string(5) "array" int(%d) string(%d) "%s" - HipHop Notice: Undefined index: PHP_SELF in hphp/test/zend/bad/globals_001.php on line %d NULL - HipHop Notice: Undefined variable: _SERVER in hphp/test/zend/bad/globals_001.php on line %d NULL Done diff --git a/hphp/test/zend/bad/globals_002.php.exp b/hphp/test/zend/bad/globals_002.php.exp index 645006780..4ebeeb2ab 100644 --- a/hphp/test/zend/bad/globals_002.php.exp +++ b/hphp/test/zend/bad/globals_002.php.exp @@ -3,10 +3,8 @@ bool(false) string(5) "array" int(%d) string(%d) "%s" - HipHop Notice: Undefined index: PHP_SELF in hphp/test/zend/bad/globals_002.php on line %d NULL - HipHop Notice: Undefined variable: _SERVER in hphp/test/zend/bad/globals_002.php on line %d NULL Done diff --git a/hphp/test/zend/bad/globals_003.php.exp b/hphp/test/zend/bad/globals_003.php.exp index fa306b8ac..417f5e5be 100644 --- a/hphp/test/zend/bad/globals_003.php.exp +++ b/hphp/test/zend/bad/globals_003.php.exp @@ -3,10 +3,8 @@ bool(false) string(5) "array" int(%d) string(%d) "%s" - HipHop Notice: Undefined index: PHP_SELF in hphp/test/zend/bad/globals_003.php on line %d NULL - HipHop Notice: Undefined variable: _SERVER in hphp/test/zend/bad/globals_003.php on line %d NULL Done diff --git a/hphp/test/zend/bad/globals_004.php.exp b/hphp/test/zend/bad/globals_004.php.exp index 26e3fdb6f..0b35ddd92 100644 --- a/hphp/test/zend/bad/globals_004.php.exp +++ b/hphp/test/zend/bad/globals_004.php.exp @@ -3,10 +3,8 @@ bool(false) string(5) "array" int(%d) string(%d) "%s" - HipHop Notice: Undefined index: PHP_SELF in hphp/test/zend/bad/globals_004.php on line %d NULL - HipHop Notice: Undefined variable: _SERVER in hphp/test/zend/bad/globals_004.php on line %d NULL Done diff --git a/hphp/test/zend/bad/heredoc_009.php b/hphp/test/zend/bad/heredoc_009.php index 01276048b..6bb3d94b2 100644 --- a/hphp/test/zend/bad/heredoc_009.php +++ b/hphp/test/zend/bad/heredoc_009.php @@ -5,7 +5,7 @@ require_once 'nowdoc.inc'; print << \ No newline at end of file diff --git a/hphp/test/zend/bad/interface_exists_001.php.exp b/hphp/test/zend/bad/interface_exists_001.php.exp index 5d3fb9ac0..2eacda58e 100644 --- a/hphp/test/zend/bad/interface_exists_001.php.exp +++ b/hphp/test/zend/bad/interface_exists_001.php.exp @@ -1,6 +1,5 @@ bool(true) bool(false) bool(false) - HipHop Warning: interface_exists() expects parameter 1 to be string, object given in hphp/test/zend/bad/interface_exists_001.php on line %d NULL diff --git a/hphp/test/zend/bad/isset_003.php.exp b/hphp/test/zend/bad/isset_003.php.exp index 0d17b98f2..caa5361e5 100644 --- a/hphp/test/zend/bad/isset_003.php.exp +++ b/hphp/test/zend/bad/isset_003.php.exp @@ -2,11 +2,8 @@ bool(true) bool(true) bool(false) bool(false) - HipHop Notice: Undefined variable: c in hphp/test/zend/bad/isset_003.php on line %d - HipHop Notice: Undefined variable: d in hphp/test/zend/bad/isset_003.php on line %d - HipHop Notice: Trying to get property of non-object in hphp/test/zend/bad/isset_003.php on line %d bool(false) bool(true) diff --git a/hphp/test/zend/bad/isset_003_2_4.php.exp b/hphp/test/zend/bad/isset_003_2_4.php.exp index b7846ae1e..15bda9652 100644 --- a/hphp/test/zend/bad/isset_003_2_4.php.exp +++ b/hphp/test/zend/bad/isset_003_2_4.php.exp @@ -2,11 +2,8 @@ bool(true) bool(true) bool(false) bool(false) - HipHop Notice: Undefined variable: c in hphp/test/zend/bad/isset_003_2_4.php on line %d - HipHop Notice: Undefined variable: d in hphp/test/zend/bad/isset_003_2_4.php on line %d - HipHop Notice: Trying to get property of non-object in hphp/test/zend/bad/isset_003_2_4.php on line %d bool(false) bool(true) diff --git a/hphp/test/zend/bad/jump13.php b/hphp/test/zend/bad/jump13.php index 1bae09105..15e4f848c 100644 --- a/hphp/test/zend/bad/jump13.php +++ b/hphp/test/zend/bad/jump13.php @@ -10,11 +10,11 @@ try { } catch(Exception $e) { c: print 3; - goto d; - } + goto d; + } } catch(Exception $e) { d: print 4; - goto e; + goto e; } ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/language001.php.exp b/hphp/test/zend/bad/language001.php.exp deleted file mode 100644 index e965047ad..000000000 --- a/hphp/test/zend/bad/language001.php.exp +++ /dev/null @@ -1 +0,0 @@ -Hello diff --git a/hphp/test/zend/bad/list_005.php.exp b/hphp/test/zend/bad/list_005.php.exp index c1e689d86..c5e56dc0a 100644 --- a/hphp/test/zend/bad/list_005.php.exp +++ b/hphp/test/zend/bad/list_005.php.exp @@ -6,5 +6,4 @@ NULL NULL NULL ---- - HipHop Fatal error: Cannot use object of type stdClass as array in hphp/test/zend/bad/list_005.php on line %d diff --git a/hphp/test/zend/bad/list_006.php.exp b/hphp/test/zend/bad/list_006.php.exp index 681eda1dd..c00c56bd9 100644 --- a/hphp/test/zend/bad/list_006.php.exp +++ b/hphp/test/zend/bad/list_006.php.exp @@ -1,5 +1,3 @@ HipHop Notice: Undefined offset: 1 in hphp/test/zend/bad/list_006.php on line %d - HipHop Notice: Undefined offset: 1 in hphp/test/zend/bad/list_006.php on line %d - HipHop Notice: Undefined offset: 0 in hphp/test/zend/bad/list_006.php on line %d diff --git a/hphp/test/zend/bad/lsb_006.php.exp b/hphp/test/zend/bad/lsb_006.php.exp index f63083a3d..20fce00d1 100644 --- a/hphp/test/zend/bad/lsb_006.php.exp +++ b/hphp/test/zend/bad/lsb_006.php.exp @@ -1 +1,2 @@ Parse error: %s error,%sexpecting %s in hphp/test/zend/bad/lsb_006.php on line %d + diff --git a/hphp/test/zend/bad/lsb_007.php.exp b/hphp/test/zend/bad/lsb_007.php.exp index b07eb47d7..f71420025 100644 --- a/hphp/test/zend/bad/lsb_007.php.exp +++ b/hphp/test/zend/bad/lsb_007.php.exp @@ -1 +1,2 @@ Parse error: %s error,%sexpecting %s in hphp/test/zend/bad/lsb_007.php on line %d + diff --git a/hphp/test/zend/bad/lsb_008.php.exp b/hphp/test/zend/bad/lsb_008.php.exp index 1666de645..0f37c99d0 100644 --- a/hphp/test/zend/bad/lsb_008.php.exp +++ b/hphp/test/zend/bad/lsb_008.php.exp @@ -1 +1,2 @@ Parse error: %s error,%sexpecting %s in hphp/test/zend/bad/lsb_008.php on line %d + diff --git a/hphp/test/zend/bad/lsb_009.php.exp b/hphp/test/zend/bad/lsb_009.php.exp index 8b06b209d..063997525 100644 --- a/hphp/test/zend/bad/lsb_009.php.exp +++ b/hphp/test/zend/bad/lsb_009.php.exp @@ -1 +1,2 @@ Parse error: %s error,%sexpecting %s in hphp/test/zend/bad/lsb_009.php on line %d + diff --git a/hphp/test/zend/bad/lsb_011.php.exp b/hphp/test/zend/bad/lsb_011.php.exp deleted file mode 100644 index 9766475a4..000000000 --- a/hphp/test/zend/bad/lsb_011.php.exp +++ /dev/null @@ -1 +0,0 @@ -ok diff --git a/hphp/test/zend/bad/lsb_012.php.exp b/hphp/test/zend/bad/lsb_012.php.exp deleted file mode 100644 index 9766475a4..000000000 --- a/hphp/test/zend/bad/lsb_012.php.exp +++ /dev/null @@ -1 +0,0 @@ -ok diff --git a/hphp/test/zend/bad/lsb_017.php.exp b/hphp/test/zend/bad/lsb_017.php.exp deleted file mode 100644 index f4359665f..000000000 --- a/hphp/test/zend/bad/lsb_017.php.exp +++ /dev/null @@ -1,5 +0,0 @@ -D -C -B -A -==DONE== diff --git a/hphp/test/zend/bad/magic_by_ref_001.php.exp b/hphp/test/zend/bad/magic_by_ref_001.php.exp deleted file mode 100644 index 67ee7435a..000000000 --- a/hphp/test/zend/bad/magic_by_ref_001.php.exp +++ /dev/null @@ -1 +0,0 @@ -HipHop Fatal error: Method test::__set() cannot take arguments by reference in hphp/test/zend/bad/magic_by_ref_001.php on line %d diff --git a/hphp/test/zend/bad/magic_by_ref_002.php.exp b/hphp/test/zend/bad/magic_by_ref_002.php.exp deleted file mode 100644 index 0cab762c1..000000000 --- a/hphp/test/zend/bad/magic_by_ref_002.php.exp +++ /dev/null @@ -1 +0,0 @@ -HipHop Fatal error: Method test::__set() cannot take arguments by reference in hphp/test/zend/bad/magic_by_ref_002.php on line %d diff --git a/hphp/test/zend/bad/magic_by_ref_003.php.exp b/hphp/test/zend/bad/magic_by_ref_003.php.exp deleted file mode 100644 index 7327a1c47..000000000 --- a/hphp/test/zend/bad/magic_by_ref_003.php.exp +++ /dev/null @@ -1 +0,0 @@ -HipHop Fatal error: Method test::__get() cannot take arguments by reference in hphp/test/zend/bad/magic_by_ref_003.php on line %d diff --git a/hphp/test/zend/bad/magic_by_ref_004.php.exp b/hphp/test/zend/bad/magic_by_ref_004.php.exp deleted file mode 100644 index 3af00a7c6..000000000 --- a/hphp/test/zend/bad/magic_by_ref_004.php.exp +++ /dev/null @@ -1 +0,0 @@ -HipHop Fatal error: Method test::__unset() cannot take arguments by reference in hphp/test/zend/bad/magic_by_ref_004.php on line %d diff --git a/hphp/test/zend/bad/magic_by_ref_005.php.exp b/hphp/test/zend/bad/magic_by_ref_005.php.exp deleted file mode 100644 index 98087d724..000000000 --- a/hphp/test/zend/bad/magic_by_ref_005.php.exp +++ /dev/null @@ -1 +0,0 @@ -HipHop Fatal error: Method test::__isset() cannot take arguments by reference in hphp/test/zend/bad/magic_by_ref_005.php on line %d diff --git a/hphp/test/zend/bad/magic_by_ref_006.php.exp b/hphp/test/zend/bad/magic_by_ref_006.php.exp deleted file mode 100644 index 7cadab148..000000000 --- a/hphp/test/zend/bad/magic_by_ref_006.php.exp +++ /dev/null @@ -1 +0,0 @@ -HipHop Fatal error: Method test::__call() cannot take arguments by reference in hphp/test/zend/bad/magic_by_ref_006.php on line %d diff --git a/hphp/test/zend/bad/magic_by_ref_007.php.exp b/hphp/test/zend/bad/magic_by_ref_007.php.exp deleted file mode 100644 index 4ee885345..000000000 --- a/hphp/test/zend/bad/magic_by_ref_007.php.exp +++ /dev/null @@ -1 +0,0 @@ -HipHop Fatal error: Method test::__call() cannot take arguments by reference in hphp/test/zend/bad/magic_by_ref_007.php on line %d diff --git a/hphp/test/zend/bad/magic_methods_002.php b/hphp/test/zend/bad/magic_methods_002.php index 61aab0134..18b9e7dda 100644 --- a/hphp/test/zend/bad/magic_methods_002.php +++ b/hphp/test/zend/bad/magic_methods_002.php @@ -1,6 +1,6 @@ d}. diff --git a/hphp/test/zend/bad/nowdoc_009.php b/hphp/test/zend/bad/nowdoc_009.php index d8b9bc03d..42d1c9e6d 100644 --- a/hphp/test/zend/bad/nowdoc_009.php +++ b/hphp/test/zend/bad/nowdoc_009.php @@ -5,7 +5,7 @@ require_once 'nowdoc.inc'; print <<<'ENDOFNOWDOC' ENDOFNOWDOC ; ENDOFNOWDOC; -ENDOFNOWDOC +ENDOFNOWDOC ENDOFNOWDOC $ENDOFNOWDOC; @@ -14,7 +14,7 @@ ENDOFNOWDOC; $x = <<<'ENDOFNOWDOC' ENDOFNOWDOC ; ENDOFNOWDOC; -ENDOFNOWDOC +ENDOFNOWDOC ENDOFNOWDOC $ENDOFNOWDOC; diff --git a/hphp/test/zend/bad/nowdoc_009.php.exp b/hphp/test/zend/bad/nowdoc_009.php.exp index bad836720..6289e29b0 100644 --- a/hphp/test/zend/bad/nowdoc_009.php.exp +++ b/hphp/test/zend/bad/nowdoc_009.php.exp @@ -1,10 +1,11 @@ ENDOFNOWDOC ; ENDOFNOWDOC; -ENDOFNOWDOC +ENDOFNOWDOC ENDOFNOWDOC $ENDOFNOWDOC; ENDOFNOWDOC ; ENDOFNOWDOC; -ENDOFNOWDOC +ENDOFNOWDOC ENDOFNOWDOC $ENDOFNOWDOC; + diff --git a/hphp/test/zend/bad/nowdoc_010.php.exp b/hphp/test/zend/bad/nowdoc_010.php.exp index c4e8ca787..8ef94efc3 100644 --- a/hphp/test/zend/bad/nowdoc_010.php.exp +++ b/hphp/test/zend/bad/nowdoc_010.php.exp @@ -4,3 +4,4 @@ ENDOFNOWDOC{$fooledYou} {$fooledYou}ENDOFNOWDOC{$fooledYou} ENDOFNOWDOC{$fooledYou} {$fooledYou}ENDOFNOWDOC + diff --git a/hphp/test/zend/bad/nowdoc_011.php b/hphp/test/zend/bad/nowdoc_011.php index e1cbc1a32..f641260dd 100644 --- a/hphp/test/zend/bad/nowdoc_011.php +++ b/hphp/test/zend/bad/nowdoc_011.php @@ -3,7 +3,7 @@ require_once 'nowdoc.inc'; class e { - + const E = <<<'THISMUSTNOTERROR' If you DON'T see this, something's wrong. THISMUSTNOTERROR; diff --git a/hphp/test/zend/bad/nowdoc_013.php b/hphp/test/zend/bad/nowdoc_013.php index 41676e04b..bea2c92a5 100644 --- a/hphp/test/zend/bad/nowdoc_013.php +++ b/hphp/test/zend/bad/nowdoc_013.php @@ -2,7 +2,7 @@ $code = <<<'EOF' diff --git a/hphp/test/zend/bad/ns_008.php b/hphp/test/zend/bad/ns_008.php index eea0ee7f1..04ae332c1 100644 --- a/hphp/test/zend/bad/ns_008.php +++ b/hphp/test/zend/bad/ns_008.php @@ -4,5 +4,5 @@ namespace test; class foo { } -$x = __NAMESPACE__ . "\\foo"; +$x = __NAMESPACE__ . "\\foo"; echo get_class(new $x),"\n"; \ No newline at end of file diff --git a/hphp/test/zend/bad/ns_009.php b/hphp/test/zend/bad/ns_009.php index fa226e48d..2e242542b 100644 --- a/hphp/test/zend/bad/ns_009.php +++ b/hphp/test/zend/bad/ns_009.php @@ -2,5 +2,5 @@ class foo { } -$x = __NAMESPACE__ . "\\foo"; +$x = __NAMESPACE__ . "\\foo"; echo get_class(new $x),"\n"; \ No newline at end of file diff --git a/hphp/test/zend/bad/ns_011.php b/hphp/test/zend/bad/ns_011.php index 9d1c1eb3e..f4e0b88dd 100644 --- a/hphp/test/zend/bad/ns_011.php +++ b/hphp/test/zend/bad/ns_011.php @@ -4,7 +4,7 @@ namespace test\ns1; function foo() { echo __FUNCTION__,"\n"; } - + foo(); \test\ns1\foo(); bar(); diff --git a/hphp/test/zend/bad/ns_015.php.exp b/hphp/test/zend/bad/ns_015.php.exp index 7ed6ff82d..51d7b8d16 100644 --- a/hphp/test/zend/bad/ns_015.php.exp +++ b/hphp/test/zend/bad/ns_015.php.exp @@ -1 +1,2 @@ 5 + diff --git a/hphp/test/zend/bad/ns_019.php b/hphp/test/zend/bad/ns_019.php index 8d1e1cc5c..1a080814c 100644 --- a/hphp/test/zend/bad/ns_019.php +++ b/hphp/test/zend/bad/ns_019.php @@ -3,5 +3,5 @@ function foo() { return __FUNCTION__; } -$x = __NAMESPACE__ . "\\foo"; +$x = __NAMESPACE__ . "\\foo"; echo $x(),"\n"; \ No newline at end of file diff --git a/hphp/test/zend/bad/ns_026.php b/hphp/test/zend/bad/ns_026.php index 723241480..ee9595f51 100644 --- a/hphp/test/zend/bad/ns_026.php +++ b/hphp/test/zend/bad/ns_026.php @@ -3,10 +3,10 @@ namespace Foo; class Foo { function __construct() { - echo "Method - ".__CLASS__."::".__FUNCTION__."\n"; + echo "Method - ".__CLASS__."::".__FUNCTION__."\n"; } static function Bar() { - echo "Method - ".__CLASS__."::".__FUNCTION__."\n"; + echo "Method - ".__CLASS__."::".__FUNCTION__."\n"; } } diff --git a/hphp/test/zend/bad/ns_026.php.exp b/hphp/test/zend/bad/ns_026.php.exp index 4e89e6658..06ae4fddf 100644 --- a/hphp/test/zend/bad/ns_026.php.exp +++ b/hphp/test/zend/bad/ns_026.php.exp @@ -3,5 +3,4 @@ Func - Foo\Bar Method - Foo\Foo::__construct Method - Foo\Foo::Bar Func - Foo\Bar - HipHop Fatal error: Call to undefined function Foo\Foo\Bar() in %sns_026.php on line %d \ No newline at end of file diff --git a/hphp/test/zend/bad/ns_027.php b/hphp/test/zend/bad/ns_027.php index d59ea0248..64053406a 100644 --- a/hphp/test/zend/bad/ns_027.php +++ b/hphp/test/zend/bad/ns_027.php @@ -3,10 +3,10 @@ require "ns_027.inc"; class Foo { function __construct() { - echo __CLASS__,"\n"; + echo __CLASS__,"\n"; } static function Bar() { - echo __CLASS__,"\n"; + echo __CLASS__,"\n"; } } diff --git a/hphp/test/zend/bad/ns_028.php b/hphp/test/zend/bad/ns_028.php index d17f7829f..d6dd3e57b 100644 --- a/hphp/test/zend/bad/ns_028.php +++ b/hphp/test/zend/bad/ns_028.php @@ -3,10 +3,10 @@ require "ns_028.inc"; class Foo { function __construct() { - echo "Method - ".__CLASS__."::".__FUNCTION__."\n"; + echo "Method - ".__CLASS__."::".__FUNCTION__."\n"; } static function Bar() { - echo "Method - ".__CLASS__."::".__FUNCTION__."\n"; + echo "Method - ".__CLASS__."::".__FUNCTION__."\n"; } } diff --git a/hphp/test/zend/bad/ns_033.php.exp b/hphp/test/zend/bad/ns_033.php.exp index f225ebcfe..00d9cccfe 100644 --- a/hphp/test/zend/bad/ns_033.php.exp +++ b/hphp/test/zend/bad/ns_033.php.exp @@ -1 +1,2 @@ HipHop Warning: The use statement with non-compound name 'A' has no effect in %sns_033.php on line 2 + diff --git a/hphp/test/zend/bad/ns_038.php.exp b/hphp/test/zend/bad/ns_038.php.exp index 2a49b74c1..e194ee759 100644 --- a/hphp/test/zend/bad/ns_038.php.exp +++ b/hphp/test/zend/bad/ns_038.php.exp @@ -1,3 +1,3 @@ ok - HipHop Fatal error: Call to undefined method Exception::bar() in %sns_038.php on line 7 + diff --git a/hphp/test/zend/bad/ns_041.php b/hphp/test/zend/bad/ns_041.php index 575fd0093..f3882a47f 100644 --- a/hphp/test/zend/bad/ns_041.php +++ b/hphp/test/zend/bad/ns_041.php @@ -2,7 +2,7 @@ namespace test\ns1; const FOO = "ok\n"; - + echo(FOO); echo(\test\ns1\FOO); echo(\test\ns1\FOO); diff --git a/hphp/test/zend/bad/ns_041.php.exp b/hphp/test/zend/bad/ns_041.php.exp index 7d49a689c..513159b8e 100644 --- a/hphp/test/zend/bad/ns_041.php.exp +++ b/hphp/test/zend/bad/ns_041.php.exp @@ -1,6 +1,5 @@ ok ok ok - HipHop Notice: Use of undefined constant BAR - assumed 'BAR' in %sns_041.php on line 9 BAR diff --git a/hphp/test/zend/bad/ns_053.php.exp b/hphp/test/zend/bad/ns_053.php.exp index 06aed879d..4a70ced1c 100644 --- a/hphp/test/zend/bad/ns_053.php.exp +++ b/hphp/test/zend/bad/ns_053.php.exp @@ -1,2 +1,3 @@ ns_053.php ns_053.php + diff --git a/hphp/test/zend/bad/ns_057.php.exp b/hphp/test/zend/bad/ns_057.php.exp index 08019fde8..5bae52a41 100644 --- a/hphp/test/zend/bad/ns_057.php.exp +++ b/hphp/test/zend/bad/ns_057.php.exp @@ -8,5 +8,4 @@ const ok const ok class ok ok - HipHop Fatal error: Undefined constant 'Test\ns1\unknown' in %sns_057.php on line %d \ No newline at end of file diff --git a/hphp/test/zend/bad/ns_058.php.exp b/hphp/test/zend/bad/ns_058.php.exp index 660bef1fd..78ff8ba11 100644 --- a/hphp/test/zend/bad/ns_058.php.exp +++ b/hphp/test/zend/bad/ns_058.php.exp @@ -8,5 +8,4 @@ const ok const ok class ok ok - HipHop Fatal error: Undefined constant 'unknown' in %sns_058.php on line %d diff --git a/hphp/test/zend/bad/ns_059.php.exp b/hphp/test/zend/bad/ns_059.php.exp index e34d1348d..40f277a76 100644 --- a/hphp/test/zend/bad/ns_059.php.exp +++ b/hphp/test/zend/bad/ns_059.php.exp @@ -1 +1,2 @@ HipHop Fatal error: Arrays are not allowed as constants in %sns_059.php on line 2 + diff --git a/hphp/test/zend/bad/ns_064.php b/hphp/test/zend/bad/ns_064.php index 0caba2ef5..8f3eb1d1f 100644 --- a/hphp/test/zend/bad/ns_064.php +++ b/hphp/test/zend/bad/ns_064.php @@ -4,11 +4,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/hphp/test/zend/bad/ns_072.php b/hphp/test/zend/bad/ns_072.php index ceb82e9bd..57756437d 100644 --- a/hphp/test/zend/bad/ns_072.php +++ b/hphp/test/zend/bad/ns_072.php @@ -3,7 +3,7 @@ namespace foo; interface foo { - + } class bar { @@ -13,7 +13,7 @@ class bar { } class test implements foo { - + } diff --git a/hphp/test/zend/bad/ns_073.php b/hphp/test/zend/bad/ns_073.php index a215110d3..8627085a3 100644 --- a/hphp/test/zend/bad/ns_073.php +++ b/hphp/test/zend/bad/ns_073.php @@ -2,8 +2,8 @@ namespace foo; -$x = function (\stdclass $x = NULL) { - var_dump($x); +$x = function (\stdclass $x = NULL) { + var_dump($x); }; $x(NULL); diff --git a/hphp/test/zend/bad/ns_074.php b/hphp/test/zend/bad/ns_074.php index 6d71d16ff..be5904341 100644 --- a/hphp/test/zend/bad/ns_074.php +++ b/hphp/test/zend/bad/ns_074.php @@ -2,8 +2,8 @@ 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/hphp/test/zend/bad/ns_076.php.exp b/hphp/test/zend/bad/ns_076.php.exp index 675e56be6..1b73a1e2c 100644 --- a/hphp/test/zend/bad/ns_076.php.exp +++ b/hphp/test/zend/bad/ns_076.php.exp @@ -1,12 +1,9 @@ HipHop Notice: Use of undefined constant unknown - assumed 'unknown' in %sns_076.php on line %d - HipHop Notice: Use of undefined constant unknown - assumed 'unknown' in %sns_076.php on line %d - HipHop Notice: Use of undefined constant unknown - assumed 'unknown' in %sns_076.php on line %d unknown array(1) { ["unknown"]=> %s(7) "unknown" } - HipHop Fatal error: Undefined constant 'unknown' in %sns_076.php on line %d diff --git a/hphp/test/zend/bad/objects_001.php.exp b/hphp/test/zend/bad/objects_001.php.exp index 52cd9e083..ecf36c74d 100644 --- a/hphp/test/zend/bad/objects_001.php.exp +++ b/hphp/test/zend/bad/objects_001.php.exp @@ -6,25 +6,18 @@ bool(false) bool(true) bool(false) bool(true) - HipHop Notice: Object of class Bar could not be converted to int in hphp/test/zend/bad/objects_001.php on line %d bool(false) - HipHop Notice: Object of class Bar could not be converted to int in hphp/test/zend/bad/objects_001.php on line %d bool(true) - HipHop Notice: Object of class Bar could not be converted to int in hphp/test/zend/bad/objects_001.php on line %d bool(true) - HipHop Notice: Object of class Bar could not be converted to int in hphp/test/zend/bad/objects_001.php on line %d bool(false) - HipHop Notice: Object of class Bar could not be converted to double in hphp/test/zend/bad/objects_001.php on line %d bool(true) - HipHop Notice: Object of class Bar could not be converted to double in hphp/test/zend/bad/objects_001.php on line %d bool(false) - HipHop Notice: Object of class Bar could not be converted to int in hphp/test/zend/bad/objects_001.php on line %d bool(true) Done diff --git a/hphp/test/zend/bad/objects_002.php b/hphp/test/zend/bad/objects_002.php index 67c6f1a89..a08331101 100644 --- a/hphp/test/zend/bad/objects_002.php +++ b/hphp/test/zend/bad/objects_002.php @@ -5,11 +5,11 @@ class test { } class test2 extends test { - function foo() {} + function foo() {} } class test3 extends test { - function foo($arg) {} + function foo($arg) {} } echo "Done\n"; diff --git a/hphp/test/zend/bad/objects_003.php b/hphp/test/zend/bad/objects_003.php index 08f34145d..f60d9c086 100644 --- a/hphp/test/zend/bad/objects_003.php +++ b/hphp/test/zend/bad/objects_003.php @@ -5,11 +5,11 @@ 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"; diff --git a/hphp/test/zend/bad/objects_004.php b/hphp/test/zend/bad/objects_004.php index 5518c1714..cf602f333 100644 --- a/hphp/test/zend/bad/objects_004.php +++ b/hphp/test/zend/bad/objects_004.php @@ -5,11 +5,11 @@ 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"; diff --git a/hphp/test/zend/bad/objects_005.php b/hphp/test/zend/bad/objects_005.php index 4e688ab21..0a022a9c9 100644 --- a/hphp/test/zend/bad/objects_005.php +++ b/hphp/test/zend/bad/objects_005.php @@ -5,11 +5,11 @@ class test { } class test2 extends test { - function &foo() {} + function &foo() {} } class test3 extends test { - function foo() {} + function foo() {} } echo "Done\n"; diff --git a/hphp/test/zend/bad/objects_006.php b/hphp/test/zend/bad/objects_006.php index dc6e22dc6..d06d06cab 100644 --- a/hphp/test/zend/bad/objects_006.php +++ b/hphp/test/zend/bad/objects_006.php @@ -5,11 +5,11 @@ 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"; diff --git a/hphp/test/zend/bad/objects_007.php b/hphp/test/zend/bad/objects_007.php index 78374f307..bf62514e2 100644 --- a/hphp/test/zend/bad/objects_007.php +++ b/hphp/test/zend/bad/objects_007.php @@ -5,11 +5,11 @@ 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"; diff --git a/hphp/test/zend/bad/objects_008.php b/hphp/test/zend/bad/objects_008.php index 411f6a1c2..4045f8932 100644 --- a/hphp/test/zend/bad/objects_008.php +++ b/hphp/test/zend/bad/objects_008.php @@ -5,11 +5,11 @@ 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"; diff --git a/hphp/test/zend/bad/objects_009.php b/hphp/test/zend/bad/objects_009.php index d0087ce70..871df8669 100644 --- a/hphp/test/zend/bad/objects_009.php +++ b/hphp/test/zend/bad/objects_009.php @@ -5,11 +5,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/hphp/test/zend/bad/objects_013.php b/hphp/test/zend/bad/objects_013.php index a5ff42de4..0bf194353 100644 --- a/hphp/test/zend/bad/objects_013.php +++ b/hphp/test/zend/bad/objects_013.php @@ -4,7 +4,7 @@ interface foo { } class bar implements foo, foo { -} +} echo "Done\n"; ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/objects_014.php b/hphp/test/zend/bad/objects_014.php index 04d55160d..74a6d1e5d 100644 --- a/hphp/test/zend/bad/objects_014.php +++ b/hphp/test/zend/bad/objects_014.php @@ -4,7 +4,7 @@ interface foo { } interface bar extends foo, foo { -} +} echo "Done\n"; ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/objects_022.php b/hphp/test/zend/bad/objects_022.php index e5b466902..026782419 100644 --- a/hphp/test/zend/bad/objects_022.php +++ b/hphp/test/zend/bad/objects_022.php @@ -1,11 +1,11 @@ -testFoo(new foo); $foo->testBar(new bar); diff --git a/hphp/test/zend/bad/objects_024.php b/hphp/test/zend/bad/objects_024.php index 4ae088c28..9dc7ec09f 100644 --- a/hphp/test/zend/bad/objects_024.php +++ b/hphp/test/zend/bad/objects_024.php @@ -1,12 +1,12 @@ -test(); $foo::test(); diff --git a/hphp/test/zend/bad/objects_027.php.exp b/hphp/test/zend/bad/objects_027.php.exp index fba35504b..fad8516b1 100644 --- a/hphp/test/zend/bad/objects_027.php.exp +++ b/hphp/test/zend/bad/objects_027.php.exp @@ -14,3 +14,5 @@ Strict Standards: call_user_func() expects parameter 1 to be a valid callback, n Strict Standards: Non-static method bar::show() should not be called statically in hphp/test/zend/bad/objects_027.php on line %d object(foo)#%d (0) { } + + diff --git a/hphp/test/zend/bad/offset_array.php.exp b/hphp/test/zend/bad/offset_array.php.exp index df660bf09..98cb466e7 100644 --- a/hphp/test/zend/bad/offset_array.php.exp +++ b/hphp/test/zend/bad/offset_array.php.exp @@ -1,9 +1,7 @@ int(2) int(1) - HipHop Notice: Undefined index: in hphp/test/zend/bad/offset_array.php on line %d NULL - HipHop Notice: Undefined index: run away in hphp/test/zend/bad/offset_array.php on line %d NULL int(2) @@ -11,10 +9,8 @@ int(1) Strict Standards: Resource ID#%d used as offset, casting to integer (%d) in hphp/test/zend/bad/offset_array.php on line %d int(%d) - HipHop Warning: Illegal offset type in hphp/test/zend/bad/offset_array.php on line %d NULL - HipHop Warning: Illegal offset type in hphp/test/zend/bad/offset_array.php on line %d NULL Done diff --git a/hphp/test/zend/bad/offset_assign.php.exp b/hphp/test/zend/bad/offset_assign.php.exp index b527cd503..cd3430e0e 100644 --- a/hphp/test/zend/bad/offset_assign.php.exp +++ b/hphp/test/zend/bad/offset_assign.php.exp @@ -1,3 +1,2 @@ HipHop Warning: Illegal string offset 'x' in %soffset_assign.php on line %d - HipHop Fatal error: Cannot use string offset as an array in %soffset_assign.php on line %d diff --git a/hphp/test/zend/bad/offset_string.php.exp b/hphp/test/zend/bad/offset_string.php.exp index 12220aef1..2116f3ca8 100644 --- a/hphp/test/zend/bad/offset_string.php.exp +++ b/hphp/test/zend/bad/offset_string.php.exp @@ -1,35 +1,24 @@ string(1) "i" - HipHop Notice: String offset cast occurred in hphp/test/zend/bad/offset_string.php on line %d string(1) "S" - HipHop Notice: String offset cast occurred in hphp/test/zend/bad/offset_string.php on line %d string(1) "S" - HipHop Warning: Illegal string offset 'run away' in hphp/test/zend/bad/offset_string.php on line %d string(1) "S" string(1) "c" - HipHop Warning: Illegal string offset '14.5' in hphp/test/zend/bad/offset_string.php on line %d string(1) "o" - HipHop Notice: A non well formed numeric value encountered in hphp/test/zend/bad/offset_string.php on line %d string(1) "r" - HipHop Notice: String offset cast occurred in hphp/test/zend/bad/offset_string.php on line %d string(1) "i" - HipHop Notice: String offset cast occurred in hphp/test/zend/bad/offset_string.php on line %d string(1) "S" - HipHop Warning: Illegal offset type in hphp/test/zend/bad/offset_string.php on line %d string(1) "%s" - HipHop Warning: Illegal offset type in hphp/test/zend/bad/offset_string.php on line %d - HipHop Notice: Object of class stdClass could not be converted to int in hphp/test/zend/bad/offset_string.php on line %d string(1) "%s" - HipHop Warning: Illegal offset type in hphp/test/zend/bad/offset_string.php on line %d string(1) "i" Done \ No newline at end of file diff --git a/hphp/test/zend/bad/property003.php.exp b/hphp/test/zend/bad/property003.php.exp index 668d5395e..0fd4ef538 100644 --- a/hphp/test/zend/bad/property003.php.exp +++ b/hphp/test/zend/bad/property003.php.exp @@ -1,3 +1,2 @@ PRE-CLASS-GUARD - HipHop 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 hphp/test/zend/bad/property003.php on line %d \ No newline at end of file diff --git a/hphp/test/zend/bad/property004.php.exp b/hphp/test/zend/bad/property004.php.exp index 550464fae..7e97158bc 100644 --- a/hphp/test/zend/bad/property004.php.exp +++ b/hphp/test/zend/bad/property004.php.exp @@ -1,3 +1,2 @@ PRE-CLASS-GUARD - HipHop 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 hphp/test/zend/bad/property004.php on line %d \ No newline at end of file diff --git a/hphp/test/zend/bad/property005.php b/hphp/test/zend/bad/property005.php index 8657a573f..096918e17 100644 --- a/hphp/test/zend/bad/property005.php +++ b/hphp/test/zend/bad/property005.php @@ -2,7 +2,7 @@ error_reporting(E_ALL | E_STRICT); class Base { - private $hello; + private $hello; } trait THello1 { diff --git a/hphp/test/zend/bad/property005.php.exp b/hphp/test/zend/bad/property005.php.exp index 94d89a7a9..080ba0ae5 100644 --- a/hphp/test/zend/bad/property005.php.exp +++ b/hphp/test/zend/bad/property005.php.exp @@ -2,5 +2,4 @@ PRE-CLASS-GUARD Strict Standards: Notice and THello1 define the same property ($hello) in the composition of Notice. This might be incompatible, to improve maintainability consider using accessor methods in traits instead. Class was composed in hphp/test/zend/bad/property005.php on line %d POST-CLASS-GUARD - HipHop Fatal error: TraitsTest and THello1 define the same property ($hello) in the composition of TraitsTest. However, the definition differs and is considered incompatible. Class was composed in hphp/test/zend/bad/property005.php on line %d diff --git a/hphp/test/zend/bad/property006.php b/hphp/test/zend/bad/property006.php index e2a0386b5..352d9f1b8 100644 --- a/hphp/test/zend/bad/property006.php +++ b/hphp/test/zend/bad/property006.php @@ -2,7 +2,7 @@ error_reporting(E_ALL | E_STRICT); class Base { - private $hello; + private $hello; } trait THello1 { diff --git a/hphp/test/zend/bad/property007.php b/hphp/test/zend/bad/property007.php index aea880e1c..2980321ab 100644 --- a/hphp/test/zend/bad/property007.php +++ b/hphp/test/zend/bad/property007.php @@ -2,7 +2,7 @@ error_reporting(E_ALL | E_STRICT); class Base { - protected $hello; + protected $hello; } trait THello1 { diff --git a/hphp/test/zend/bad/property_exists.php b/hphp/test/zend/bad/property_exists.php index c53deb1c9..78facb573 100644 --- a/hphp/test/zend/bad/property_exists.php +++ b/hphp/test/zend/bad/property_exists.php @@ -10,7 +10,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/hphp/test/zend/bad/result_unused.php.exp b/hphp/test/zend/bad/result_unused.php.exp index d29c1db68..ac1e7b1a4 100644 --- a/hphp/test/zend/bad/result_unused.php.exp +++ b/hphp/test/zend/bad/result_unused.php.exp @@ -1,2 +1,3 @@ HipHop Notice: Uninitialized string offset: 3 in %sresult_unused.php on line %d ok + diff --git a/hphp/test/zend/bad/settype_double.php.exp b/hphp/test/zend/bad/settype_double.php.exp index 62745467b..0f108c542 100644 --- a/hphp/test/zend/bad/settype_double.php.exp +++ b/hphp/test/zend/bad/settype_double.php.exp @@ -10,7 +10,6 @@ float(0) float(1) float(0) float(%d) - HipHop Notice: Object of class test could not be converted to double in hphp/test/zend/bad/settype_double.php on line %d float(1) Done diff --git a/hphp/test/zend/bad/settype_int.php.exp b/hphp/test/zend/bad/settype_int.php.exp index bee751963..c00c0221e 100644 --- a/hphp/test/zend/bad/settype_int.php.exp +++ b/hphp/test/zend/bad/settype_int.php.exp @@ -10,7 +10,6 @@ int(0) int(1) int(0) int(%d) - HipHop Notice: Object of class test could not be converted to int in hphp/test/zend/bad/settype_int.php on line %d int(1) Done diff --git a/hphp/test/zend/bad/settype_resource.php.exp b/hphp/test/zend/bad/settype_resource.php.exp index f97e499d8..0e16b9d09 100644 Binary files a/hphp/test/zend/bad/settype_resource.php.exp and b/hphp/test/zend/bad/settype_resource.php.exp differ diff --git a/hphp/test/zend/bad/settype_string.php.exp b/hphp/test/zend/bad/settype_string.php.exp index f0244f968..1d9cd4ae7 100644 Binary files a/hphp/test/zend/bad/settype_string.php.exp and b/hphp/test/zend/bad/settype_string.php.exp differ diff --git a/hphp/test/zend/bad/strict_002.php b/hphp/test/zend/bad/strict_002.php index 16cf6e8fc..bc1e5eaad 100644 --- a/hphp/test/zend/bad/strict_002.php +++ b/hphp/test/zend/bad/strict_002.php @@ -1,10 +1,10 @@ foo = 5; $fp = fopen(__FILE__, 'r'); diff --git a/hphp/test/zend/bad/trait_constant_001.php b/hphp/test/zend/bad/trait_constant_001.php index 5d2154da3..8238cd2f0 100644 --- a/hphp/test/zend/bad/trait_constant_001.php +++ b/hphp/test/zend/bad/trait_constant_001.php @@ -11,7 +11,7 @@ class Direct { } class IndirectInheritance extends Direct { - + } trait TestTraitIndirect { diff --git a/hphp/test/zend/bad/trait_constant_002.php b/hphp/test/zend/bad/trait_constant_002.php index c3579a327..bdcf3b138 100644 --- a/hphp/test/zend/bad/trait_constant_002.php +++ b/hphp/test/zend/bad/trait_constant_002.php @@ -5,11 +5,11 @@ return __TRAIT__; } } - + function someFun() { return __TRAIT__; } - + $t = __TRAIT__; var_dump($t); diff --git a/hphp/test/zend/bad/trait_exists_001.php.exp b/hphp/test/zend/bad/trait_exists_001.php.exp index c78006b98..1bbc85458 100644 --- a/hphp/test/zend/bad/trait_exists_001.php.exp +++ b/hphp/test/zend/bad/trait_exists_001.php.exp @@ -1,6 +1,5 @@ bool(true) bool(false) bool(false) - HipHop Warning: trait_exists() expects parameter 1 to be string, object given in hphp/test/zend/bad/trait_exists_001.php on line %d NULL diff --git a/hphp/test/zend/bad/unset_cv01.php.exp b/hphp/test/zend/bad/unset_cv01.php.exp index 1a1779862..d6e05c16c 100644 --- a/hphp/test/zend/bad/unset_cv01.php.exp +++ b/hphp/test/zend/bad/unset_cv01.php.exp @@ -1,3 +1,2 @@ ok - HipHop Notice: Undefined variable: x in %sunset_cv01.php on line %d diff --git a/hphp/test/zend/bad/unset_cv02.php.exp b/hphp/test/zend/bad/unset_cv02.php.exp index e97ed3d14..78c38ad6c 100644 --- a/hphp/test/zend/bad/unset_cv02.php.exp +++ b/hphp/test/zend/bad/unset_cv02.php.exp @@ -1,3 +1,2 @@ ok - HipHop Notice: Undefined variable: x in %sunset_cv02.php on line %d diff --git a/hphp/test/zend/bad/unset_cv03.php.exp b/hphp/test/zend/bad/unset_cv03.php.exp index 14757e081..795c9b67c 100644 --- a/hphp/test/zend/bad/unset_cv03.php.exp +++ b/hphp/test/zend/bad/unset_cv03.php.exp @@ -1,3 +1,2 @@ ok - HipHop Notice: Undefined variable: x in %sunset_cv03.php on line %d diff --git a/hphp/test/zend/bad/unset_cv04.php.exp b/hphp/test/zend/bad/unset_cv04.php.exp index b05295216..d966b2595 100644 --- a/hphp/test/zend/bad/unset_cv04.php.exp +++ b/hphp/test/zend/bad/unset_cv04.php.exp @@ -1,3 +1,2 @@ ok - HipHop Notice: Undefined variable: x in %sunset_cv04.php on line %d diff --git a/hphp/test/zend/bad/unset_cv05.php.exp b/hphp/test/zend/bad/unset_cv05.php.exp index 87b397983..9e4bd9787 100644 --- a/hphp/test/zend/bad/unset_cv05.php.exp +++ b/hphp/test/zend/bad/unset_cv05.php.exp @@ -1,9 +1,6 @@ ok - HipHop Warning: session_start(): Cannot send session cookie - headers already sent by (output started at %sunset_cv05.php on line %d - HipHop Warning: session_start(): Cannot send session cache limiter - headers already sent (output started at %sunset_cv05.php:%d) in %sunset_cv05.php on line %d - HipHop Notice: Array to string conversion in %sunset_cv05.php on line %d Array ok diff --git a/hphp/test/zend/bad/unset_cv06.php.exp b/hphp/test/zend/bad/unset_cv06.php.exp index 20f5bc16b..63258e844 100644 --- a/hphp/test/zend/bad/unset_cv06.php.exp +++ b/hphp/test/zend/bad/unset_cv06.php.exp @@ -1,4 +1,3 @@ 1 - HipHop Notice: Undefined index: x in %sunset_cv06.php on line %d ok diff --git a/hphp/test/zend/bad/unset_cv09.php.exp b/hphp/test/zend/bad/unset_cv09.php.exp index c20266e35..83688f076 100644 --- a/hphp/test/zend/bad/unset_cv09.php.exp +++ b/hphp/test/zend/bad/unset_cv09.php.exp @@ -1,4 +1,3 @@ ok - HipHop Notice: Undefined variable: x in %sunset_cv09.php on line %d ok diff --git a/hphp/test/zend/bad/unset_cv10.php.exp b/hphp/test/zend/bad/unset_cv10.php.exp index ddea4cb49..0e07209ae 100644 --- a/hphp/test/zend/bad/unset_cv10.php.exp +++ b/hphp/test/zend/bad/unset_cv10.php.exp @@ -1,4 +1,3 @@ ok - HipHop Notice: Undefined variable: x in %sunset_cv10.php on line %d ok diff --git a/hphp/test/zend/good/016.php b/hphp/test/zend/good/016.php index 70b1ea5f7..1bcd33c1f 100644 --- a/hphp/test/zend/good/016.php +++ b/hphp/test/zend/good/016.php @@ -1,6 +1,6 @@ bar->bar); echo "Done\n"; diff --git a/hphp/test/zend/good/032.php b/hphp/test/zend/good/032.php index 56c01d143..e7d43a635 100644 --- a/hphp/test/zend/good/032.php +++ b/hphp/test/zend/good/032.php @@ -1,4 +1,4 @@ -hello(); class TraitsTest2 { use THelloImpl; - use THello; + use THello; } $test = new TraitsTest2(); diff --git a/hphp/test/zend/good/anonymous_func_001.php b/hphp/test/zend/good/anonymous_func_001.php index 6ec43dedd..1786e7252 100644 --- a/hphp/test/zend/good/anonymous_func_001.php +++ b/hphp/test/zend/good/anonymous_func_001.php @@ -1,9 +1,9 @@ - \ No newline at end of file diff --git a/hphp/test/zend/good/bug21888.php b/hphp/test/zend/good/bug21888.php index 6ee62de81..732a968bf 100644 --- a/hphp/test/zend/good/bug21888.php +++ b/hphp/test/zend/good/bug21888.php @@ -5,19 +5,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/hphp/test/zend/good/bug24635.php b/hphp/test/zend/good/bug24635.php index e9feab1a8..15fb256e7 100644 --- a/hphp/test/zend/good/bug24635.php +++ b/hphp/test/zend/good/bug24635.php @@ -10,14 +10,14 @@ class PageClass { class SectionClass { function __construct($comment) { $this->Comment = $comment; - } + } function __destruct() { - out($this->Comment); // this line doesn't crash PHP - out("\n"); // this line - } + out($this->Comment); // this line doesn't crash PHP + out("\n"); // this line + } } function out($code) { return; } -$site = new SiteClass(); +$site = new SiteClass(); $site->page->Display(); echo "OK\n"; ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/bug26077.php b/hphp/test/zend/good/bug26077.php similarity index 100% rename from hphp/test/zend/bad/bug26077.php rename to hphp/test/zend/good/bug26077.php diff --git a/hphp/test/zend/good/bug26077.php.exp b/hphp/test/zend/good/bug26077.php.exp new file mode 100644 index 000000000..922a780ce --- /dev/null +++ b/hphp/test/zend/good/bug26077.php.exp @@ -0,0 +1 @@ +===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/bug26698.php b/hphp/test/zend/good/bug26698.php similarity index 100% rename from hphp/test/zend/bad/bug26698.php rename to hphp/test/zend/good/bug26698.php diff --git a/hphp/test/zend/bad/bug26698.php.exp b/hphp/test/zend/good/bug26698.php.exp similarity index 78% rename from hphp/test/zend/bad/bug26698.php.exp rename to hphp/test/zend/good/bug26698.php.exp index 3f908d390..ca726c40f 100644 --- a/hphp/test/zend/bad/bug26698.php.exp +++ b/hphp/test/zend/good/bug26698.php.exp @@ -1,4 +1,4 @@ Caught: NONE Caught: NONE Caught: NONE -===DONE=== +===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/bug26801.php b/hphp/test/zend/good/bug26801.php similarity index 100% rename from hphp/test/zend/bad/bug26801.php rename to hphp/test/zend/good/bug26801.php diff --git a/hphp/test/zend/good/bug26801.php.exp b/hphp/test/zend/good/bug26801.php.exp new file mode 100644 index 000000000..922a780ce --- /dev/null +++ b/hphp/test/zend/good/bug26801.php.exp @@ -0,0 +1 @@ +===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/bug26802.php b/hphp/test/zend/good/bug26802.php similarity index 72% rename from hphp/test/zend/bad/bug26802.php rename to hphp/test/zend/good/bug26802.php index e04632ce6..926a2487a 100644 --- a/hphp/test/zend/bad/bug26802.php +++ b/hphp/test/zend/good/bug26802.php @@ -11,15 +11,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/hphp/test/zend/bad/bug26802.php.exp b/hphp/test/zend/good/bug26802.php.exp similarity index 70% rename from hphp/test/zend/bad/bug26802.php.exp rename to hphp/test/zend/good/bug26802.php.exp index ec6eab23b..72c564228 100644 --- a/hphp/test/zend/bad/bug26802.php.exp +++ b/hphp/test/zend/good/bug26802.php.exp @@ -1,3 +1,3 @@ global_func foo::foo_func -===DONE=== +===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/bug27304.php b/hphp/test/zend/good/bug27304.php similarity index 94% rename from hphp/test/zend/bad/bug27304.php rename to hphp/test/zend/good/bug27304.php index ccf87629d..838946ea9 100644 --- a/hphp/test/zend/bad/bug27304.php +++ b/hphp/test/zend/good/bug27304.php @@ -11,6 +11,6 @@ class Staticexample $b = new Staticexample(); Staticexample::test(); $b->test(); - + ?> ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/bug27304.php.exp b/hphp/test/zend/good/bug27304.php.exp similarity index 68% rename from hphp/test/zend/bad/bug27304.php.exp rename to hphp/test/zend/good/bug27304.php.exp index 1de16848b..af0708baa 100644 --- a/hphp/test/zend/bad/bug27304.php.exp +++ b/hphp/test/zend/good/bug27304.php.exp @@ -1,3 +1,3 @@ bool(false) bool(false) -===DONE=== +===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/bug27669.php b/hphp/test/zend/good/bug27669.php similarity index 100% rename from hphp/test/zend/bad/bug27669.php rename to hphp/test/zend/good/bug27669.php diff --git a/hphp/test/zend/bad/bug27669.php.exp b/hphp/test/zend/good/bug27669.php.exp similarity index 52% rename from hphp/test/zend/bad/bug27669.php.exp rename to hphp/test/zend/good/bug27669.php.exp index a91ab9297..5fcc2a41b 100644 --- a/hphp/test/zend/bad/bug27669.php.exp +++ b/hphp/test/zend/good/bug27669.php.exp @@ -1,2 +1,2 @@ Hello World -===DONE=== +===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/bug28072.php b/hphp/test/zend/good/bug28072.php index 6253ab6b7..2f1df2b16 100644 --- a/hphp/test/zend/good/bug28072.php +++ b/hphp/test/zend/good/bug28072.php @@ -1,8 +1,8 @@ \ No newline at end of file diff --git a/hphp/test/zend/good/bug28377.php b/hphp/test/zend/good/bug28377.php index e1fb70d05..01336e8cf 100644 --- a/hphp/test/zend/good/bug28377.php +++ b/hphp/test/zend/good/bug28377.php @@ -5,13 +5,13 @@ 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'); ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/bug28442.php b/hphp/test/zend/good/bug28442.php similarity index 100% rename from hphp/test/zend/bad/bug28442.php rename to hphp/test/zend/good/bug28442.php diff --git a/hphp/test/zend/bad/bug28442.php.exp b/hphp/test/zend/good/bug28442.php.exp similarity index 95% rename from hphp/test/zend/bad/bug28442.php.exp rename to hphp/test/zend/good/bug28442.php.exp index e6bfb36c6..6ed9a2483 100644 --- a/hphp/test/zend/bad/bug28442.php.exp +++ b/hphp/test/zend/good/bug28442.php.exp @@ -14,4 +14,4 @@ string(2) "B2" string(2) "A2" string(2) "C2" string(2) "C2" -===DONE=== +===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/bug29104.php b/hphp/test/zend/good/bug29104.php index 559764de2..2a0674982 100644 --- a/hphp/test/zend/good/bug29104.php +++ b/hphp/test/zend/good/bug29104.php @@ -1,14 +1,14 @@ \ No newline at end of file diff --git a/hphp/test/zend/good/bug30161.php b/hphp/test/zend/good/bug30161.php index 70dd702cc..f595a4713 100644 --- a/hphp/test/zend/good/bug30161.php +++ b/hphp/test/zend/good/bug30161.php @@ -15,7 +15,7 @@ class hariCow extends FIIFO { } catch(Exception $e) { } } - + public function __toString() { return "ok\n"; } diff --git a/hphp/test/zend/bad/bug30346.php b/hphp/test/zend/good/bug30346.php similarity index 88% rename from hphp/test/zend/bad/bug30346.php rename to hphp/test/zend/good/bug30346.php index 5243b8370..6eb228efd 100644 --- a/hphp/test/zend/bad/bug30346.php +++ b/hphp/test/zend/good/bug30346.php @@ -2,7 +2,7 @@ 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/hphp/test/zend/good/bug30346.php.exp b/hphp/test/zend/good/bug30346.php.exp new file mode 100644 index 000000000..c0a310f2a --- /dev/null +++ b/hphp/test/zend/good/bug30346.php.exp @@ -0,0 +1,2 @@ +page_show +===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/bug30394.php b/hphp/test/zend/good/bug30394.php similarity index 98% rename from hphp/test/zend/bad/bug30394.php rename to hphp/test/zend/good/bug30394.php index 6932e704c..a6c4bcfa8 100644 --- a/hphp/test/zend/bad/bug30394.php +++ b/hphp/test/zend/good/bug30394.php @@ -5,12 +5,12 @@ class Container { return $this->_p[ $what ]; } - + public function __set( $what, $value ) { $this->_p[ $what ] = $value; } - + private $_p = array(); } diff --git a/hphp/test/zend/good/bug30394.php.exp b/hphp/test/zend/good/bug30394.php.exp new file mode 100644 index 000000000..60750bad2 --- /dev/null +++ b/hphp/test/zend/good/bug30394.php.exp @@ -0,0 +1 @@ +2 - 3 \ No newline at end of file diff --git a/hphp/test/zend/bad/bug30407.php b/hphp/test/zend/good/bug30407.php similarity index 100% rename from hphp/test/zend/bad/bug30407.php rename to hphp/test/zend/good/bug30407.php diff --git a/hphp/test/zend/bad/bug30407.php.exp b/hphp/test/zend/good/bug30407.php.exp similarity index 74% rename from hphp/test/zend/bad/bug30407.php.exp rename to hphp/test/zend/good/bug30407.php.exp index 5641dbc3b..17ea07798 100644 --- a/hphp/test/zend/bad/bug30407.php.exp +++ b/hphp/test/zend/good/bug30407.php.exp @@ -1,3 +1,3 @@ string(3) "one" string(3) "one" -===DONE=== +===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/bug30451.php b/hphp/test/zend/good/bug30451.php index 61ebd9ead..591b97787 100644 --- a/hphp/test/zend/good/bug30451.php +++ b/hphp/test/zend/good/bug30451.php @@ -3,7 +3,7 @@ class A { protected static $property = TRUE; - + protected static function method() { return TRUE; } @@ -13,15 +13,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/hphp/test/zend/good/bug30707.php b/hphp/test/zend/good/bug30707.php index fa21a53fb..3279f91ee 100644 --- a/hphp/test/zend/good/bug30707.php +++ b/hphp/test/zend/good/bug30707.php @@ -11,7 +11,7 @@ class C { } } - function plap($a) { + function plap($a) { } function plop() { diff --git a/hphp/test/zend/bad/bug30725.php b/hphp/test/zend/good/bug30725.php similarity index 92% rename from hphp/test/zend/bad/bug30725.php rename to hphp/test/zend/good/bug30725.php index 1622c853c..f744992b8 100644 --- a/hphp/test/zend/bad/bug30725.php +++ b/hphp/test/zend/good/bug30725.php @@ -1,4 +1,4 @@ -query()); } @@ -29,7 +29,7 @@ try { } catch(Exception $e) { echo "ok\n"; } - + try { $db->select2(); } catch(Exception $e) { diff --git a/hphp/test/zend/good/bug31683.php b/hphp/test/zend/good/bug31683.php index 1499a1985..eae1390e4 100644 --- a/hphp/test/zend/good/bug31683.php +++ b/hphp/test/zend/good/bug31683.php @@ -3,42 +3,42 @@ 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/hphp/test/zend/bad/bug32226.php b/hphp/test/zend/good/bug32226.php similarity index 100% rename from hphp/test/zend/bad/bug32226.php rename to hphp/test/zend/good/bug32226.php diff --git a/hphp/test/zend/good/bug32226.php.exp b/hphp/test/zend/good/bug32226.php.exp new file mode 100644 index 000000000..aa8220465 --- /dev/null +++ b/hphp/test/zend/good/bug32226.php.exp @@ -0,0 +1,2 @@ +Caught +===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/bug32252.php b/hphp/test/zend/good/bug32252.php similarity index 100% rename from hphp/test/zend/bad/bug32252.php rename to hphp/test/zend/good/bug32252.php diff --git a/hphp/test/zend/bad/bug32252.php.exp b/hphp/test/zend/good/bug32252.php.exp similarity index 74% rename from hphp/test/zend/bad/bug32252.php.exp rename to hphp/test/zend/good/bug32252.php.exp index f014c258c..6afbc7584 100644 --- a/hphp/test/zend/bad/bug32252.php.exp +++ b/hphp/test/zend/good/bug32252.php.exp @@ -1,3 +1,3 @@ Test::offsetSet(-1, 123) CAUGHT -===DONE=== +===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/bug32428.php b/hphp/test/zend/good/bug32428.php index 68c83f71a..2d2225233 100644 --- a/hphp/test/zend/good/bug32428.php +++ b/hphp/test/zend/good/bug32428.php @@ -1,8 +1,8 @@ - \ No newline at end of file diff --git a/hphp/test/zend/good/bug32674.php b/hphp/test/zend/good/bug32674.php index 41e68d908..7cca8e953 100644 --- a/hphp/test/zend/good/bug32674.php +++ b/hphp/test/zend/good/bug32674.php @@ -46,10 +46,10 @@ $col = new collection(); try { foreach($col as $co) { - //irrelevant + //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/hphp/test/zend/good/bug32799.php b/hphp/test/zend/good/bug32799.php index 6088854c2..a208f7b2d 100644 --- a/hphp/test/zend/good/bug32799.php +++ b/hphp/test/zend/good/bug32799.php @@ -2,12 +2,12 @@ class test{ public $c=1; function __destruct (){ - if (!isset($GLOBALS['p'])) { - echo "NULL\n"; - } else { + if (!isset($GLOBALS['p'])) { + echo "NULL\n"; + } else { $GLOBALS['p']->c++; // no warning print $GLOBALS['p']->c."\n"; // segfault - var_dump($GLOBALS['p']); + var_dump($GLOBALS['p']); } } } diff --git a/hphp/test/zend/good/bug32833.php b/hphp/test/zend/good/bug32833.php index 888882437..cfc2b36f5 100644 --- a/hphp/test/zend/good/bug32833.php +++ b/hphp/test/zend/good/bug32833.php @@ -1,4 +1,4 @@ - $val) diff --git a/hphp/test/zend/good/bug33277.php b/hphp/test/zend/good/bug33277.php index 26f1a9dd3..f07af9e79 100644 --- a/hphp/test/zend/good/bug33277.php +++ b/hphp/test/zend/good/bug33277.php @@ -4,20 +4,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(); ?> \ No newline at end of file diff --git a/hphp/test/zend/good/bug33512.php b/hphp/test/zend/good/bug33512.php index 6fbdf35f7..6dd4bb909 100644 --- a/hphp/test/zend/good/bug33512.php +++ b/hphp/test/zend/good/bug33512.php @@ -38,7 +38,7 @@ class TheObj { var_dump($SomeObj->RealVar1); print $SomeObj->{'RealVar'.(3)}."\n"; - + unset($SomeObj->RealVar1); unset($SomeObj->{'RealVar'.(3)}); diff --git a/hphp/test/zend/bad/bug33710.php b/hphp/test/zend/good/bug33710.php similarity index 98% rename from hphp/test/zend/bad/bug33710.php rename to hphp/test/zend/good/bug33710.php index b8ee7ba9c..4de55c6cb 100644 --- a/hphp/test/zend/bad/bug33710.php +++ b/hphp/test/zend/good/bug33710.php @@ -6,12 +6,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/hphp/test/zend/good/bug33710.php.exp b/hphp/test/zend/good/bug33710.php.exp new file mode 100644 index 000000000..922a780ce --- /dev/null +++ b/hphp/test/zend/good/bug33710.php.exp @@ -0,0 +1 @@ +===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/bug33802.php b/hphp/test/zend/good/bug33802.php similarity index 100% rename from hphp/test/zend/bad/bug33802.php rename to hphp/test/zend/good/bug33802.php diff --git a/hphp/test/zend/good/bug33802.php.exp b/hphp/test/zend/good/bug33802.php.exp new file mode 100644 index 000000000..b5754e203 --- /dev/null +++ b/hphp/test/zend/good/bug33802.php.exp @@ -0,0 +1 @@ +ok \ No newline at end of file diff --git a/hphp/test/zend/good/bug34260.php b/hphp/test/zend/good/bug34260.php index ede2346bc..0b4a731ac 100644 --- a/hphp/test/zend/good/bug34260.php +++ b/hphp/test/zend/good/bug34260.php @@ -13,7 +13,7 @@ class Faulty function NormalMethod($Args) { - echo "I heart me\n"; + echo "I heart me\n"; } } diff --git a/hphp/test/zend/good/bug34467.php b/hphp/test/zend/good/bug34467.php index 9b1241ca4..54a131f4c 100644 --- a/hphp/test/zend/good/bug34467.php +++ b/hphp/test/zend/good/bug34467.php @@ -5,10 +5,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/hphp/test/zend/bad/bug34893.php b/hphp/test/zend/good/bug34893.php similarity index 100% rename from hphp/test/zend/bad/bug34893.php rename to hphp/test/zend/good/bug34893.php diff --git a/hphp/test/zend/good/bug34893.php.exp b/hphp/test/zend/good/bug34893.php.exp new file mode 100644 index 000000000..f6ea04951 --- /dev/null +++ b/hphp/test/zend/good/bug34893.php.exp @@ -0,0 +1 @@ +foobar \ No newline at end of file diff --git a/hphp/test/zend/good/bug35017.php b/hphp/test/zend/good/bug35017.php index 6f11c7587..0386441cc 100644 --- a/hphp/test/zend/good/bug35017.php +++ b/hphp/test/zend/good/bug35017.php @@ -7,7 +7,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/hphp/test/zend/bad/bug35411.php b/hphp/test/zend/good/bug35411.php similarity index 100% rename from hphp/test/zend/bad/bug35411.php rename to hphp/test/zend/good/bug35411.php diff --git a/hphp/test/zend/bad/bug35411.php.exp b/hphp/test/zend/good/bug35411.php.exp similarity index 78% rename from hphp/test/zend/bad/bug35411.php.exp rename to hphp/test/zend/good/bug35411.php.exp index 6ca693d3b..b9d481d2e 100644 --- a/hphp/test/zend/bad/bug35411.php.exp +++ b/hphp/test/zend/good/bug35411.php.exp @@ -2,4 +2,4 @@ foo\{bar}baz foo\{ bar}baz foobarbaz foo\{bar}baz -foo\{ bar}baz +foo\{ bar}baz \ No newline at end of file diff --git a/hphp/test/zend/good/bug38623.php b/hphp/test/zend/good/bug38623.php index c4ecb9f64..c5c26fd08 100644 --- a/hphp/test/zend/good/bug38623.php +++ b/hphp/test/zend/good/bug38623.php @@ -1,8 +1,8 @@ \ No newline at end of file diff --git a/hphp/test/zend/good/bug39297.php b/hphp/test/zend/good/bug39297.php index e7f5bbea9..ca5c6da7d 100644 --- a/hphp/test/zend/good/bug39297.php +++ b/hphp/test/zend/good/bug39297.php @@ -14,14 +14,14 @@ class MyTree implements ArrayAccess { } public function offsetSet($offset, $value) { - echo "offsetSet()\n"; + echo "offsetSet()\n"; $cannonicalName = strtolower($offset); $this->children[$cannonicalName] = $value; $value->parent = $this; - } - + } + public function offsetGet($offset) { - echo "offsetGet()\n"; + echo "offsetGet()\n"; $cannonicalName = strtolower($offset); return $this->children[$cannonicalName]; } diff --git a/hphp/test/zend/good/bug39346.php b/hphp/test/zend/good/bug39346.php index bd075ac9d..ecffc253f 100644 --- a/hphp/test/zend/good/bug39346.php +++ b/hphp/test/zend/good/bug39346.php @@ -3,12 +3,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/hphp/test/zend/good/bug39438.php b/hphp/test/zend/good/bug39438.php index 09784d1f7..67a8d9080 100644 --- a/hphp/test/zend/good/bug39438.php +++ b/hphp/test/zend/good/bug39438.php @@ -2,34 +2,34 @@ $i=0; $test2=array( 'a1_teasermenu' => array( - 'downloadcounter' => 2777, + 'downloadcounter' => 2777, 'versions' => array( - '0.1.0' => array ( - 'title' => 'A1 Teasermenu', - 'description' => 'Displays a teaser for advanced subpages or a selection of advanced pages', - 'state' => 'stable', - 'reviewstate' => 0, - 'category' => 'plugin', - 'downloadcounter' => 2787, - 'lastuploaddate' => 1088427240, - 'dependencies' => array ( - 'depends' => array( - 'typo3' =>'', - 'php' =>'', - 'cms' => '' - ), - 'conflicts' => array('' =>'') - ), - 'authorname' => 'Mirko Balluff', - 'authoremail' => 'balluff@amt1.de', - 'ownerusername' => 'amt1', - 't3xfilemd5' => '3a4ec198b6ea8d0bc2d69d9b7400398f', - ) - ) - ) + '0.1.0' => array ( + 'title' => 'A1 Teasermenu', + 'description' => 'Displays a teaser for advanced subpages or a selection of advanced pages', + 'state' => 'stable', + 'reviewstate' => 0, + 'category' => 'plugin', + 'downloadcounter' => 2787, + 'lastuploaddate' => 1088427240, + 'dependencies' => array ( + 'depends' => array( + 'typo3' =>'', + 'php' =>'', + 'cms' => '' + ), + 'conflicts' => array('' =>'') + ), + 'authorname' => 'Mirko Balluff', + 'authoremail' => 'balluff@amt1.de', + 'ownerusername' => 'amt1', + 't3xfilemd5' => '3a4ec198b6ea8d0bc2d69d9b7400398f', + ) + ) + ) ); $test=array(); -while($i<1200) { +while($i<1200) { $test[]=$test2; $i++; } diff --git a/hphp/test/zend/bad/bug39445.php b/hphp/test/zend/good/bug39445.php similarity index 100% rename from hphp/test/zend/bad/bug39445.php rename to hphp/test/zend/good/bug39445.php diff --git a/hphp/test/zend/good/bug39445.php.exp b/hphp/test/zend/good/bug39445.php.exp new file mode 100644 index 000000000..a0139eeaa --- /dev/null +++ b/hphp/test/zend/good/bug39445.php.exp @@ -0,0 +1 @@ +LOWERCASE \ No newline at end of file diff --git a/hphp/test/zend/bad/bug39602.php b/hphp/test/zend/good/bug39602.php similarity index 100% rename from hphp/test/zend/bad/bug39602.php rename to hphp/test/zend/good/bug39602.php diff --git a/hphp/test/zend/good/bug39602.php.exp b/hphp/test/zend/good/bug39602.php.exp new file mode 100644 index 000000000..b5754e203 --- /dev/null +++ b/hphp/test/zend/good/bug39602.php.exp @@ -0,0 +1 @@ +ok \ No newline at end of file diff --git a/hphp/test/zend/good/bug39721.php b/hphp/test/zend/good/bug39721.php index c55b3126d..de69b2b5a 100644 --- a/hphp/test/zend/good/bug39721.php +++ b/hphp/test/zend/good/bug39721.php @@ -2,18 +2,18 @@ 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/hphp/test/zend/good/bug39825.php b/hphp/test/zend/good/bug39825.php index 0d175fccf..a064cd9db 100644 --- a/hphp/test/zend/good/bug39825.php +++ b/hphp/test/zend/good/bug39825.php @@ -1,4 +1,4 @@ - 2, "foo" => "bar"); $obj = (object)$array; foreach ($obj as $name => $value) { diff --git a/hphp/test/zend/good/bug39944.php b/hphp/test/zend/good/bug39944.php index 02e794a44..617152fd3 100644 --- a/hphp/test/zend/good/bug39944.php +++ b/hphp/test/zend/good/bug39944.php @@ -32,12 +32,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); @@ -48,7 +48,7 @@ class RefTest { function Add($strToAdd) { $this->addToArray($this->getArray(), $strToAdd); - } + } function &getArray() { if (!$this->arr) diff --git a/hphp/test/zend/good/bug39990.php b/hphp/test/zend/good/bug39990.php index 94b8c1828..caa516bf8 100644 --- a/hphp/test/zend/good/bug39990.php +++ b/hphp/test/zend/good/bug39990.php @@ -1,10 +1,10 @@ arr as $value) echo "$value\n"; diff --git a/hphp/test/zend/bad/bug41351.php b/hphp/test/zend/good/bug41351.php similarity index 100% rename from hphp/test/zend/bad/bug41351.php rename to hphp/test/zend/good/bug41351.php diff --git a/hphp/test/zend/bad/bug41351.php.exp b/hphp/test/zend/good/bug41351.php.exp similarity index 69% rename from hphp/test/zend/bad/bug41351.php.exp rename to hphp/test/zend/good/bug41351.php.exp index 8f9ba1f9b..129276c8f 100644 --- a/hphp/test/zend/bad/bug41351.php.exp +++ b/hphp/test/zend/good/bug41351.php.exp @@ -1 +1 @@ -HipHop Fatal error: Cannot use [] for reading in hphp/test/zend/bad/bug41351.php on line %d +HipHop Fatal error: Cannot use [] for reading in hphp/test/zend/good/bug41351.php on line 6 diff --git a/hphp/test/zend/bad/bug41351_2.php b/hphp/test/zend/good/bug41351_2.php similarity index 100% rename from hphp/test/zend/bad/bug41351_2.php rename to hphp/test/zend/good/bug41351_2.php diff --git a/hphp/test/zend/bad/bug41351_2.php.exp b/hphp/test/zend/good/bug41351_2.php.exp similarity index 68% rename from hphp/test/zend/bad/bug41351_2.php.exp rename to hphp/test/zend/good/bug41351_2.php.exp index b6d62058c..56767256c 100644 --- a/hphp/test/zend/bad/bug41351_2.php.exp +++ b/hphp/test/zend/good/bug41351_2.php.exp @@ -1 +1 @@ -HipHop Fatal error: Cannot use [] for reading in hphp/test/zend/bad/bug41351_2.php on line %d +HipHop Fatal error: Cannot use [] for reading in hphp/test/zend/good/bug41351_2.php on line 6 diff --git a/hphp/test/zend/bad/bug41351_3.php b/hphp/test/zend/good/bug41351_3.php similarity index 100% rename from hphp/test/zend/bad/bug41351_3.php rename to hphp/test/zend/good/bug41351_3.php diff --git a/hphp/test/zend/bad/bug41351_3.php.exp b/hphp/test/zend/good/bug41351_3.php.exp similarity index 68% rename from hphp/test/zend/bad/bug41351_3.php.exp rename to hphp/test/zend/good/bug41351_3.php.exp index 6046e5867..0d000c4dd 100644 --- a/hphp/test/zend/bad/bug41351_3.php.exp +++ b/hphp/test/zend/good/bug41351_3.php.exp @@ -1 +1 @@ -HipHop Fatal error: Cannot use [] for reading in hphp/test/zend/bad/bug41351_3.php on line %d +HipHop Fatal error: Cannot use [] for reading in hphp/test/zend/good/bug41351_3.php on line 6 diff --git a/hphp/test/zend/good/bug41929.php b/hphp/test/zend/good/bug41929.php index 14301ad9a..9280507e5 100644 --- a/hphp/test/zend/good/bug41929.php +++ b/hphp/test/zend/good/bug41929.php @@ -7,7 +7,7 @@ class C { foreach ($this as $k=>$v) { echo "$k: $v\n"; } - } + } } class D extends C { diff --git a/hphp/test/zend/good/bug41961.php b/hphp/test/zend/good/bug41961.php index c67f0c2bb..36ef2a6a7 100644 --- a/hphp/test/zend/good/bug41961.php +++ b/hphp/test/zend/good/bug41961.php @@ -1,24 +1,24 @@ 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"; - } + } } ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/bug43200_2.php b/hphp/test/zend/good/bug43200_2.php similarity index 100% rename from hphp/test/zend/bad/bug43200_2.php rename to hphp/test/zend/good/bug43200_2.php diff --git a/hphp/test/zend/good/bug43200_2.php.exp b/hphp/test/zend/good/bug43200_2.php.exp new file mode 100644 index 000000000..ea8d2865d --- /dev/null +++ b/hphp/test/zend/good/bug43200_2.php.exp @@ -0,0 +1 @@ +works \ No newline at end of file diff --git a/hphp/test/zend/good/bug43426.php b/hphp/test/zend/good/bug43426.php index 03bacfba1..317f55fb5 100644 --- a/hphp/test/zend/good/bug43426.php +++ b/hphp/test/zend/good/bug43426.php @@ -29,6 +29,6 @@ $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"; ?> \ No newline at end of file diff --git a/hphp/test/zend/good/bug44899_2.php b/hphp/test/zend/good/bug44899_2.php index 111012546..26ddeba97 100644 --- a/hphp/test/zend/good/bug44899_2.php +++ b/hphp/test/zend/good/bug44899_2.php @@ -13,7 +13,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/hphp/test/zend/good/bug45744.php b/hphp/test/zend/good/bug45744.php index b69c8e782..a655b1850 100644 --- a/hphp/test/zend/good/bug45744.php +++ b/hphp/test/zend/good/bug45744.php @@ -3,7 +3,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); @@ -21,7 +21,7 @@ class Foo2 { public function __construct(array $data) { var_dump(array_map(array($this, 'callBack'), $data)); } - + private function callBack($value) { } } diff --git a/hphp/test/zend/bad/bug45910.php b/hphp/test/zend/good/bug45910.php similarity index 99% rename from hphp/test/zend/bad/bug45910.php rename to hphp/test/zend/good/bug45910.php index 9c08e8b7b..2ba52facb 100644 --- a/hphp/test/zend/bad/bug45910.php +++ b/hphp/test/zend/good/bug45910.php @@ -11,7 +11,7 @@ class foo { self::CCC => 'b', self::DDD => self::AAA ); - + public static function test() { self::$foo; } diff --git a/hphp/test/zend/good/bug45910.php.exp b/hphp/test/zend/good/bug45910.php.exp new file mode 100644 index 000000000..56a6051ca --- /dev/null +++ b/hphp/test/zend/good/bug45910.php.exp @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/hphp/test/zend/bad/bug45910_2.php b/hphp/test/zend/good/bug45910_2.php similarity index 99% rename from hphp/test/zend/bad/bug45910_2.php rename to hphp/test/zend/good/bug45910_2.php index cc5349423..73b6d8424 100644 --- a/hphp/test/zend/bad/bug45910_2.php +++ b/hphp/test/zend/good/bug45910_2.php @@ -11,7 +11,7 @@ class foo { self::CCC => 'b', self::DDD => 11 ); - + public static function test() { self::$foo; } diff --git a/hphp/test/zend/good/bug45910_2.php.exp b/hphp/test/zend/good/bug45910_2.php.exp new file mode 100644 index 000000000..56a6051ca --- /dev/null +++ b/hphp/test/zend/good/bug45910_2.php.exp @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/hphp/test/zend/bad/bug46106.php b/hphp/test/zend/good/bug46106.php similarity index 100% rename from hphp/test/zend/bad/bug46106.php rename to hphp/test/zend/good/bug46106.php diff --git a/hphp/test/zend/good/bug46106.php.exp b/hphp/test/zend/good/bug46106.php.exp new file mode 100644 index 000000000..096264973 --- /dev/null +++ b/hphp/test/zend/good/bug46106.php.exp @@ -0,0 +1 @@ +DONE \ No newline at end of file diff --git a/hphp/test/zend/bad/bug46196.php b/hphp/test/zend/good/bug46196.php similarity index 93% rename from hphp/test/zend/bad/bug46196.php rename to hphp/test/zend/good/bug46196.php index 9b1fb911e..a20938d58 100644 --- a/hphp/test/zend/bad/bug46196.php +++ b/hphp/test/zend/good/bug46196.php @@ -1,8 +1,8 @@ Test(); diff --git a/hphp/test/zend/good/bug46409.php b/hphp/test/zend/good/bug46409.php index 033760b59..b94be16fd 100644 --- a/hphp/test/zend/good/bug46409.php +++ b/hphp/test/zend/good/bug46409.php @@ -1,7 +1,7 @@ val; } diff --git a/hphp/test/zend/bad/bug47572.php b/hphp/test/zend/good/bug47572.php similarity index 100% rename from hphp/test/zend/bad/bug47572.php rename to hphp/test/zend/good/bug47572.php diff --git a/hphp/test/zend/bad/bug47572.php.exp b/hphp/test/zend/good/bug47572.php.exp similarity index 59% rename from hphp/test/zend/bad/bug47572.php.exp rename to hphp/test/zend/good/bug47572.php.exp index d4da01092..7c17317e1 100644 --- a/hphp/test/zend/bad/bug47572.php.exp +++ b/hphp/test/zend/good/bug47572.php.exp @@ -1 +1 @@ -HipHop Notice: Use of undefined constant FOO - assumed 'FOO' in hphp/test/zend/bad/bug47572.php on line %d +HipHop Notice: Use of undefined constant FOO - assumed 'FOO' in hphp/test/zend/good/bug47572.php on line 5 diff --git a/hphp/test/zend/good/bug47771.php b/hphp/test/zend/good/bug47771.php index 361ad7458..48440c6bf 100644 --- a/hphp/test/zend/good/bug47771.php +++ b/hphp/test/zend/good/bug47771.php @@ -4,21 +4,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/hphp/test/zend/bad/bug48215.php b/hphp/test/zend/good/bug48215.php similarity index 100% rename from hphp/test/zend/bad/bug48215.php rename to hphp/test/zend/good/bug48215.php diff --git a/hphp/test/zend/bad/bug48215.php.exp b/hphp/test/zend/good/bug48215.php.exp similarity index 78% rename from hphp/test/zend/bad/bug48215.php.exp rename to hphp/test/zend/good/bug48215.php.exp index f9c362b1b..c0a7cfee4 100644 --- a/hphp/test/zend/bad/bug48215.php.exp +++ b/hphp/test/zend/good/bug48215.php.exp @@ -2,4 +2,4 @@ B::__construct A::__construct B::A A::A -===DONE=== +===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/bug48409.php b/hphp/test/zend/good/bug48409.php similarity index 99% rename from hphp/test/zend/bad/bug48409.php rename to hphp/test/zend/good/bug48409.php index 758c2d1a3..0f610a104 100644 --- a/hphp/test/zend/bad/bug48409.php +++ b/hphp/test/zend/good/bug48409.php @@ -12,7 +12,7 @@ class BBB return array('foo' => 'xyz'); } } - + class CCC { public function process($p) diff --git a/hphp/test/zend/good/bug48409.php.exp b/hphp/test/zend/good/bug48409.php.exp new file mode 100644 index 000000000..4753fd4a6 --- /dev/null +++ b/hphp/test/zend/good/bug48409.php.exp @@ -0,0 +1 @@ +Exception thrown \ No newline at end of file diff --git a/hphp/test/zend/bad/bug48428.php b/hphp/test/zend/good/bug48428.php similarity index 100% rename from hphp/test/zend/bad/bug48428.php rename to hphp/test/zend/good/bug48428.php diff --git a/hphp/test/zend/good/bug48428.php.exp b/hphp/test/zend/good/bug48428.php.exp new file mode 100644 index 000000000..17416ae33 --- /dev/null +++ b/hphp/test/zend/good/bug48428.php.exp @@ -0,0 +1 @@ +ERROR \ No newline at end of file diff --git a/hphp/test/zend/good/bug50261.php b/hphp/test/zend/good/bug50261.php index c93c82c87..799c0ce72 100644 --- a/hphp/test/zend/good/bug50261.php +++ b/hphp/test/zend/good/bug50261.php @@ -9,12 +9,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/hphp/test/zend/good/bug51822.php b/hphp/test/zend/good/bug51822.php index e68cb3c39..81ec1240b 100644 --- a/hphp/test/zend/good/bug51822.php +++ b/hphp/test/zend/good/bug51822.php @@ -4,14 +4,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/hphp/test/zend/bad/bug52484.php b/hphp/test/zend/good/bug52484.php similarity index 91% rename from hphp/test/zend/bad/bug52484.php rename to hphp/test/zend/good/bug52484.php index 267a717ae..2ac6e677a 100644 --- a/hphp/test/zend/bad/bug52484.php +++ b/hphp/test/zend/good/bug52484.php @@ -1,6 +1,6 @@ $prop); } diff --git a/hphp/test/zend/bad/bug52484.php.exp b/hphp/test/zend/good/bug52484.php.exp similarity index 66% rename from hphp/test/zend/bad/bug52484.php.exp rename to hphp/test/zend/good/bug52484.php.exp index b81ab2baa..5ec5b722e 100644 --- a/hphp/test/zend/bad/bug52484.php.exp +++ b/hphp/test/zend/good/bug52484.php.exp @@ -1 +1 @@ -HipHop Fatal error: Cannot access empty property in hphp/test/zend/bad/bug52484.php on line %d +HipHop Fatal error: Cannot access empty property in hphp/test/zend/good/bug52484.php on line 12 diff --git a/hphp/test/zend/bad/bug52484_2.php b/hphp/test/zend/good/bug52484_2.php similarity index 100% rename from hphp/test/zend/bad/bug52484_2.php rename to hphp/test/zend/good/bug52484_2.php diff --git a/hphp/test/zend/bad/bug52484_2.php.exp b/hphp/test/zend/good/bug52484_2.php.exp similarity index 65% rename from hphp/test/zend/bad/bug52484_2.php.exp rename to hphp/test/zend/good/bug52484_2.php.exp index 3647d8b1c..f79d3368f 100644 --- a/hphp/test/zend/bad/bug52484_2.php.exp +++ b/hphp/test/zend/good/bug52484_2.php.exp @@ -1 +1 @@ -HipHop Fatal error: Cannot access empty property in hphp/test/zend/bad/bug52484_2.php on line %d +HipHop Fatal error: Cannot access empty property in hphp/test/zend/good/bug52484_2.php on line 12 diff --git a/hphp/test/zend/bad/bug52484_3.php b/hphp/test/zend/good/bug52484_3.php similarity index 91% rename from hphp/test/zend/bad/bug52484_3.php rename to hphp/test/zend/good/bug52484_3.php index 52f3c9736..caef12a47 100644 --- a/hphp/test/zend/bad/bug52484_3.php +++ b/hphp/test/zend/good/bug52484_3.php @@ -1,6 +1,6 @@ $prop); } diff --git a/hphp/test/zend/bad/bug52484_3.php.exp b/hphp/test/zend/good/bug52484_3.php.exp similarity index 65% rename from hphp/test/zend/bad/bug52484_3.php.exp rename to hphp/test/zend/good/bug52484_3.php.exp index 45ea24d27..40652dcd0 100644 --- a/hphp/test/zend/bad/bug52484_3.php.exp +++ b/hphp/test/zend/good/bug52484_3.php.exp @@ -1 +1 @@ -HipHop Fatal error: Cannot access empty property in hphp/test/zend/bad/bug52484_3.php on line %d +HipHop Fatal error: Cannot access empty property in hphp/test/zend/good/bug52484_3.php on line 12 diff --git a/hphp/test/zend/good/bug52940.php b/hphp/test/zend/good/bug52940.php index 81323cbe1..ad5b7c6e7 100644 --- a/hphp/test/zend/good/bug52940.php +++ b/hphp/test/zend/good/bug52940.php @@ -1,7 +1,7 @@ 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/hphp/test/zend/bad/bug55355.php b/hphp/test/zend/good/bug55355.php similarity index 95% rename from hphp/test/zend/bad/bug55355.php rename to hphp/test/zend/good/bug55355.php index bf024679e..8f10f4868 100644 --- a/hphp/test/zend/bad/bug55355.php +++ b/hphp/test/zend/good/bug55355.php @@ -5,7 +5,7 @@ trait ATrait { function bar() { $this->foo(); } - abstract function foo(); + abstract function foo(); } // A class on the second level in the diff --git a/hphp/test/zend/good/bug55355.php.exp b/hphp/test/zend/good/bug55355.php.exp new file mode 100644 index 000000000..096264973 --- /dev/null +++ b/hphp/test/zend/good/bug55355.php.exp @@ -0,0 +1 @@ +DONE \ No newline at end of file diff --git a/hphp/test/zend/bad/bug55424.php b/hphp/test/zend/good/bug55424.php similarity index 98% rename from hphp/test/zend/bad/bug55424.php rename to hphp/test/zend/good/bug55424.php index 117f560ce..a0de23ce8 100644 --- a/hphp/test/zend/bad/bug55424.php +++ b/hphp/test/zend/good/bug55424.php @@ -8,7 +8,7 @@ } abstract function setAttribute(); - } + } class Base { diff --git a/hphp/test/zend/good/bug55424.php.exp b/hphp/test/zend/good/bug55424.php.exp new file mode 100644 index 000000000..096264973 --- /dev/null +++ b/hphp/test/zend/good/bug55424.php.exp @@ -0,0 +1 @@ +DONE \ No newline at end of file diff --git a/hphp/test/zend/bad/bug55445.php b/hphp/test/zend/good/bug55445.php similarity index 100% rename from hphp/test/zend/bad/bug55445.php rename to hphp/test/zend/good/bug55445.php diff --git a/hphp/test/zend/good/bug55445.php.exp b/hphp/test/zend/good/bug55445.php.exp new file mode 100644 index 000000000..b72896b9b --- /dev/null +++ b/hphp/test/zend/good/bug55445.php.exp @@ -0,0 +1 @@ +

Welcome chris

\ No newline at end of file diff --git a/hphp/test/zend/good/bug55554c.php b/hphp/test/zend/good/bug55554c.php index 90d0425e8..00ce21772 100644 --- a/hphp/test/zend/good/bug55554c.php +++ b/hphp/test/zend/good/bug55554c.php @@ -25,7 +25,7 @@ trait TC2 { class ReportCollision { use TC1, TC2; - + public function __construct() { echo "New constructor executed\n"; } diff --git a/hphp/test/zend/good/bug55578.php b/hphp/test/zend/good/bug55578.php index 48b11b2a3..9e0f4dd0d 100644 --- a/hphp/test/zend/good/bug55578.php +++ b/hphp/test/zend/good/bug55578.php @@ -1,11 +1,11 @@ -x; + return ++$this->x; } } class Z extends Y { function z() { - return ++$this->x; + return ++$this->x; } } $a = new Z(); diff --git a/hphp/test/zend/good/bug60536_001.php.exp b/hphp/test/zend/good/bug60536_001.php.exp new file mode 100644 index 000000000..096264973 --- /dev/null +++ b/hphp/test/zend/good/bug60536_001.php.exp @@ -0,0 +1 @@ +DONE \ No newline at end of file diff --git a/hphp/test/zend/bad/bug60717.php b/hphp/test/zend/good/bug60717.php similarity index 99% rename from hphp/test/zend/bad/bug60717.php rename to hphp/test/zend/good/bug60717.php index d6e8a10e4..d985a4a82 100644 --- a/hphp/test/zend/bad/bug60717.php +++ b/hphp/test/zend/good/bug60717.php @@ -31,12 +31,12 @@ namespace HTML { use TextArea, HTMLAttributes, TextUTF8; } - + class HTMLHelper2 implements Helper { use TextArea, TextUTF8, HTMLAttributes; } - + class HTMLHelper3 implements Helper { use HTMLAttributes, TextArea, TextUTF8; @@ -46,16 +46,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/hphp/test/zend/good/bug60717.php.exp b/hphp/test/zend/good/bug60717.php.exp new file mode 100644 index 000000000..8ad96f878 --- /dev/null +++ b/hphp/test/zend/good/bug60717.php.exp @@ -0,0 +1 @@ +Done \ No newline at end of file diff --git a/hphp/test/zend/bad/bug61761.php b/hphp/test/zend/good/bug61761.php similarity index 100% rename from hphp/test/zend/bad/bug61761.php rename to hphp/test/zend/good/bug61761.php diff --git a/hphp/test/zend/good/bug61761.php.exp b/hphp/test/zend/good/bug61761.php.exp new file mode 100644 index 000000000..17026517c --- /dev/null +++ b/hphp/test/zend/good/bug61761.php.exp @@ -0,0 +1 @@ +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/good/bug61998.php b/hphp/test/zend/good/bug61998.php index ac26ddc40..c8974d7a1 100644 --- a/hphp/test/zend/good/bug61998.php +++ b/hphp/test/zend/good/bug61998.php @@ -9,7 +9,7 @@ class Foo { } } -trait T1 { +trait T1 { public function func() { echo "From T1\n"; } @@ -36,7 +36,7 @@ class Bar { } } -trait T2 { +trait T2 { public function func2() { echo "From T2\n"; } diff --git a/hphp/test/zend/good/bug62763.php b/hphp/test/zend/good/bug62763.php new file mode 100644 index 000000000..703369c7d --- /dev/null +++ b/hphp/test/zend/good/bug62763.php @@ -0,0 +1,18 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/bug62763.php.exp b/hphp/test/zend/good/bug62763.php.exp new file mode 100644 index 000000000..4918f6733 --- /dev/null +++ b/hphp/test/zend/good/bug62763.php.exp @@ -0,0 +1 @@ +test1::shutdowntest2::__destruct \ No newline at end of file diff --git a/hphp/test/zend/bad/bug62907.php b/hphp/test/zend/good/bug62907.php similarity index 77% rename from hphp/test/zend/bad/bug62907.php rename to hphp/test/zend/good/bug62907.php index d6a163fb1..fc8852004 100644 --- a/hphp/test/zend/bad/bug62907.php +++ b/hphp/test/zend/good/bug62907.php @@ -3,12 +3,12 @@ function __autoload($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; -} +} class C extends B { public function __construct() { diff --git a/hphp/test/zend/good/bug62907.php.exp b/hphp/test/zend/good/bug62907.php.exp new file mode 100644 index 000000000..820394749 --- /dev/null +++ b/hphp/test/zend/good/bug62907.php.exp @@ -0,0 +1 @@ +okey \ No newline at end of file diff --git a/hphp/test/zend/bad/bug62956.php b/hphp/test/zend/good/bug62956.php similarity index 100% rename from hphp/test/zend/bad/bug62956.php rename to hphp/test/zend/good/bug62956.php diff --git a/hphp/test/zend/good/bug62956.php.exp b/hphp/test/zend/good/bug62956.php.exp new file mode 100644 index 000000000..17026517c --- /dev/null +++ b/hphp/test/zend/good/bug62956.php.exp @@ -0,0 +1 @@ +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/bug63055.php b/hphp/test/zend/good/bug63055.php similarity index 100% rename from hphp/test/zend/bad/bug63055.php rename to hphp/test/zend/good/bug63055.php diff --git a/hphp/test/zend/good/bug63055.php.exp b/hphp/test/zend/good/bug63055.php.exp new file mode 100644 index 000000000..820394749 --- /dev/null +++ b/hphp/test/zend/good/bug63055.php.exp @@ -0,0 +1 @@ +okey \ No newline at end of file diff --git a/hphp/test/zend/bad/bug63305.php b/hphp/test/zend/good/bug63305.php similarity index 100% rename from hphp/test/zend/bad/bug63305.php rename to hphp/test/zend/good/bug63305.php diff --git a/hphp/test/zend/good/bug63305.php.exp b/hphp/test/zend/good/bug63305.php.exp new file mode 100644 index 000000000..820394749 --- /dev/null +++ b/hphp/test/zend/good/bug63305.php.exp @@ -0,0 +1 @@ +okey \ No newline at end of file diff --git a/hphp/test/zend/good/bug63635.php b/hphp/test/zend/good/bug63635.php index 95a0c660c..656fd5a6b 100644 --- a/hphp/test/zend/good/bug63635.php +++ b/hphp/test/zend/good/bug63635.php @@ -2,17 +2,17 @@ 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/hphp/test/zend/bad/call_static_004.php b/hphp/test/zend/good/call_static_004.php similarity index 100% rename from hphp/test/zend/bad/call_static_004.php rename to hphp/test/zend/good/call_static_004.php diff --git a/hphp/test/zend/bad/call_static_004.php.exp b/hphp/test/zend/good/call_static_004.php.exp similarity index 66% rename from hphp/test/zend/bad/call_static_004.php.exp rename to hphp/test/zend/good/call_static_004.php.exp index ff2fd45ec..7a132fbe6 100644 --- a/hphp/test/zend/bad/call_static_004.php.exp +++ b/hphp/test/zend/good/call_static_004.php.exp @@ -1,3 +1,2 @@ string(3) "AaA" - -HipHop Fatal error: Function name must be a string in hphp/test/zend/bad/call_static_004.php on line %d +HipHop Fatal error: Function name must be a string in hphp/test/zend/good/call_static_004.php on line 12 diff --git a/hphp/test/zend/bad/catch_002.php b/hphp/test/zend/good/catch_002.php similarity index 100% rename from hphp/test/zend/bad/catch_002.php rename to hphp/test/zend/good/catch_002.php diff --git a/hphp/test/zend/good/catch_002.php.exp b/hphp/test/zend/good/catch_002.php.exp new file mode 100644 index 000000000..aa8220465 --- /dev/null +++ b/hphp/test/zend/good/catch_002.php.exp @@ -0,0 +1,2 @@ +Caught +===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/catch_003.php b/hphp/test/zend/good/catch_003.php similarity index 100% rename from hphp/test/zend/bad/catch_003.php rename to hphp/test/zend/good/catch_003.php diff --git a/hphp/test/zend/good/catch_003.php.exp b/hphp/test/zend/good/catch_003.php.exp new file mode 100644 index 000000000..aa8220465 --- /dev/null +++ b/hphp/test/zend/good/catch_003.php.exp @@ -0,0 +1,2 @@ +Caught +===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/catch_004.php b/hphp/test/zend/good/catch_004.php similarity index 99% rename from hphp/test/zend/bad/catch_004.php rename to hphp/test/zend/good/catch_004.php index f852faad9..5a4de1f43 100644 --- a/hphp/test/zend/bad/catch_004.php +++ b/hphp/test/zend/good/catch_004.php @@ -17,7 +17,7 @@ class MyObject { echo __METHOD__ . "() Must not be called\n"; } - + static function test() { try diff --git a/hphp/test/zend/good/catch_004.php.exp b/hphp/test/zend/good/catch_004.php.exp new file mode 100644 index 000000000..aa8220465 --- /dev/null +++ b/hphp/test/zend/good/catch_004.php.exp @@ -0,0 +1,2 @@ +Caught +===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/clone_002.php b/hphp/test/zend/good/clone_002.php index b8e83834b..b3a62cb94 100644 --- a/hphp/test/zend/good/clone_002.php +++ b/hphp/test/zend/good/clone_002.php @@ -1,4 +1,4 @@ -x; } diff --git a/hphp/test/zend/bad/dynamic_call_002.php b/hphp/test/zend/good/dynamic_call_002.php similarity index 82% rename from hphp/test/zend/bad/dynamic_call_002.php rename to hphp/test/zend/good/dynamic_call_002.php index 53edf51f7..6154494fe 100644 --- a/hphp/test/zend/bad/dynamic_call_002.php +++ b/hphp/test/zend/good/dynamic_call_002.php @@ -1,4 +1,4 @@ - \ No newline at end of file diff --git a/hphp/test/zend/bad/errmsg_001.php.exp b/hphp/test/zend/good/errmsg_001.php.exp similarity index 54% rename from hphp/test/zend/bad/errmsg_001.php.exp rename to hphp/test/zend/good/errmsg_001.php.exp index 34138a989..054477cb9 100644 --- a/hphp/test/zend/bad/errmsg_001.php.exp +++ b/hphp/test/zend/good/errmsg_001.php.exp @@ -1 +1 @@ -HipHop Fatal error: Non-abstract method Impl::Foo() must contain body in hphp/test/zend/bad/errmsg_001.php on line %d +HipHop Fatal error: Non-abstract method Impl::Foo() must contain body in hphp/test/zend/good/errmsg_001.php on line 7 diff --git a/hphp/test/zend/bad/errmsg_003.php b/hphp/test/zend/good/errmsg_003.php similarity index 100% rename from hphp/test/zend/bad/errmsg_003.php rename to hphp/test/zend/good/errmsg_003.php diff --git a/hphp/test/zend/good/errmsg_003.php.exp b/hphp/test/zend/good/errmsg_003.php.exp new file mode 100644 index 000000000..f69cd7fa3 --- /dev/null +++ b/hphp/test/zend/good/errmsg_003.php.exp @@ -0,0 +1 @@ +HipHop Fatal error: Cannot re-assign $this in hphp/test/zend/good/errmsg_003.php on line 6 diff --git a/hphp/test/zend/bad/errmsg_006.php b/hphp/test/zend/good/errmsg_006.php similarity index 100% rename from hphp/test/zend/bad/errmsg_006.php rename to hphp/test/zend/good/errmsg_006.php diff --git a/hphp/test/zend/bad/errmsg_006.php.exp b/hphp/test/zend/good/errmsg_006.php.exp similarity index 68% rename from hphp/test/zend/bad/errmsg_006.php.exp rename to hphp/test/zend/good/errmsg_006.php.exp index 1269b8f18..71f3566ad 100644 --- a/hphp/test/zend/bad/errmsg_006.php.exp +++ b/hphp/test/zend/good/errmsg_006.php.exp @@ -1 +1 @@ -HipHop Fatal error: Cannot use [] for reading in hphp/test/zend/bad/errmsg_006.php on line %d +HipHop Fatal error: Cannot use [] for reading in hphp/test/zend/good/errmsg_006.php on line 4 diff --git a/hphp/test/zend/bad/errmsg_007.php b/hphp/test/zend/good/errmsg_007.php similarity index 100% rename from hphp/test/zend/bad/errmsg_007.php rename to hphp/test/zend/good/errmsg_007.php diff --git a/hphp/test/zend/bad/errmsg_007.php.exp b/hphp/test/zend/good/errmsg_007.php.exp similarity index 68% rename from hphp/test/zend/bad/errmsg_007.php.exp rename to hphp/test/zend/good/errmsg_007.php.exp index b0ce7db1f..2be792d5e 100644 --- a/hphp/test/zend/bad/errmsg_007.php.exp +++ b/hphp/test/zend/good/errmsg_007.php.exp @@ -1 +1 @@ -HipHop Fatal error: Cannot use [] for reading in hphp/test/zend/bad/errmsg_007.php on line %d +HipHop Fatal error: Cannot use [] for reading in hphp/test/zend/good/errmsg_007.php on line 4 diff --git a/hphp/test/zend/bad/errmsg_016.php b/hphp/test/zend/good/errmsg_016.php similarity index 100% rename from hphp/test/zend/bad/errmsg_016.php rename to hphp/test/zend/good/errmsg_016.php diff --git a/hphp/test/zend/bad/errmsg_016.php.exp b/hphp/test/zend/good/errmsg_016.php.exp similarity index 53% rename from hphp/test/zend/bad/errmsg_016.php.exp rename to hphp/test/zend/good/errmsg_016.php.exp index ff076fa0d..67d3dcb7a 100644 --- a/hphp/test/zend/bad/errmsg_016.php.exp +++ b/hphp/test/zend/good/errmsg_016.php.exp @@ -1 +1 @@ -HipHop Fatal error: Method test::__isset() must take exactly 1 argument in hphp/test/zend/bad/errmsg_016.php on line %d +HipHop Fatal error: Method test::__isset() must take exactly 1 argument in hphp/test/zend/good/errmsg_016.php on line 4 diff --git a/hphp/test/zend/bad/errmsg_017.php b/hphp/test/zend/good/errmsg_017.php similarity index 100% rename from hphp/test/zend/bad/errmsg_017.php rename to hphp/test/zend/good/errmsg_017.php diff --git a/hphp/test/zend/bad/errmsg_017.php.exp b/hphp/test/zend/good/errmsg_017.php.exp similarity index 53% rename from hphp/test/zend/bad/errmsg_017.php.exp rename to hphp/test/zend/good/errmsg_017.php.exp index a746508ad..557d36080 100644 --- a/hphp/test/zend/bad/errmsg_017.php.exp +++ b/hphp/test/zend/good/errmsg_017.php.exp @@ -1 +1 @@ -HipHop Fatal error: Method test::__unset() must take exactly 1 argument in hphp/test/zend/bad/errmsg_017.php on line %d +HipHop Fatal error: Method test::__unset() must take exactly 1 argument in hphp/test/zend/good/errmsg_017.php on line 4 diff --git a/hphp/test/zend/bad/errmsg_028.php b/hphp/test/zend/good/errmsg_028.php similarity index 100% rename from hphp/test/zend/bad/errmsg_028.php rename to hphp/test/zend/good/errmsg_028.php diff --git a/hphp/test/zend/bad/errmsg_028.php.exp b/hphp/test/zend/good/errmsg_028.php.exp similarity index 54% rename from hphp/test/zend/bad/errmsg_028.php.exp rename to hphp/test/zend/good/errmsg_028.php.exp index 67f840d76..a7802627f 100644 --- a/hphp/test/zend/bad/errmsg_028.php.exp +++ b/hphp/test/zend/good/errmsg_028.php.exp @@ -1 +1 @@ -HipHop Fatal error: Cannot use 'self' as class name as it is reserved in hphp/test/zend/bad/errmsg_028.php on line %d +HipHop Fatal error: Cannot use 'self' as class name as it is reserved in hphp/test/zend/good/errmsg_028.php on line 3 diff --git a/hphp/test/zend/bad/errmsg_029.php b/hphp/test/zend/good/errmsg_029.php similarity index 100% rename from hphp/test/zend/bad/errmsg_029.php rename to hphp/test/zend/good/errmsg_029.php diff --git a/hphp/test/zend/bad/errmsg_029.php.exp b/hphp/test/zend/good/errmsg_029.php.exp similarity index 53% rename from hphp/test/zend/bad/errmsg_029.php.exp rename to hphp/test/zend/good/errmsg_029.php.exp index 55a1bba05..9bbd08a8e 100644 --- a/hphp/test/zend/bad/errmsg_029.php.exp +++ b/hphp/test/zend/good/errmsg_029.php.exp @@ -1 +1 @@ -HipHop Fatal error: Cannot use 'parent' as class name as it is reserved in hphp/test/zend/bad/errmsg_029.php on line %d +HipHop Fatal error: Cannot use 'parent' as class name as it is reserved in hphp/test/zend/good/errmsg_029.php on line 3 diff --git a/hphp/test/zend/bad/errmsg_032.php b/hphp/test/zend/good/errmsg_032.php similarity index 100% rename from hphp/test/zend/bad/errmsg_032.php rename to hphp/test/zend/good/errmsg_032.php diff --git a/hphp/test/zend/bad/errmsg_032.php.exp b/hphp/test/zend/good/errmsg_032.php.exp similarity index 54% rename from hphp/test/zend/bad/errmsg_032.php.exp rename to hphp/test/zend/good/errmsg_032.php.exp index c8047f568..f12aa1628 100644 --- a/hphp/test/zend/bad/errmsg_032.php.exp +++ b/hphp/test/zend/good/errmsg_032.php.exp @@ -1 +1 @@ -HipHop Fatal error: Constructor test::__construct() cannot be static in hphp/test/zend/bad/errmsg_032.php on line %d +HipHop Fatal error: Constructor test::__construct() cannot be static in hphp/test/zend/good/errmsg_032.php on line 5 diff --git a/hphp/test/zend/bad/errmsg_037.php b/hphp/test/zend/good/errmsg_037.php similarity index 100% rename from hphp/test/zend/bad/errmsg_037.php rename to hphp/test/zend/good/errmsg_037.php diff --git a/hphp/test/zend/bad/errmsg_037.php.exp b/hphp/test/zend/good/errmsg_037.php.exp similarity index 59% rename from hphp/test/zend/bad/errmsg_037.php.exp rename to hphp/test/zend/good/errmsg_037.php.exp index ef56e189e..f6eed0c48 100644 --- a/hphp/test/zend/bad/errmsg_037.php.exp +++ b/hphp/test/zend/good/errmsg_037.php.exp @@ -1 +1 @@ -HipHop Fatal error: Properties cannot be declared abstract in hphp/test/zend/bad/errmsg_037.php on line %d +HipHop Fatal error: Properties cannot be declared abstract in hphp/test/zend/good/errmsg_037.php on line 4 diff --git a/hphp/test/zend/bad/errmsg_039.php b/hphp/test/zend/good/errmsg_039.php similarity index 100% rename from hphp/test/zend/bad/errmsg_039.php rename to hphp/test/zend/good/errmsg_039.php diff --git a/hphp/test/zend/bad/errmsg_039.php.exp b/hphp/test/zend/good/errmsg_039.php.exp similarity index 66% rename from hphp/test/zend/bad/errmsg_039.php.exp rename to hphp/test/zend/good/errmsg_039.php.exp index 50310d859..db113a8a5 100644 --- a/hphp/test/zend/bad/errmsg_039.php.exp +++ b/hphp/test/zend/good/errmsg_039.php.exp @@ -1 +1 @@ -HipHop Fatal error: Cannot redeclare test::$var in hphp/test/zend/bad/errmsg_039.php on line %d +HipHop Fatal error: Cannot redeclare test::$var in hphp/test/zend/good/errmsg_039.php on line 5 diff --git a/hphp/test/zend/bad/errmsg_040.php b/hphp/test/zend/good/errmsg_040.php similarity index 100% rename from hphp/test/zend/bad/errmsg_040.php rename to hphp/test/zend/good/errmsg_040.php diff --git a/hphp/test/zend/bad/errmsg_040.php.exp b/hphp/test/zend/good/errmsg_040.php.exp similarity index 58% rename from hphp/test/zend/bad/errmsg_040.php.exp rename to hphp/test/zend/good/errmsg_040.php.exp index 965897904..55954b4c7 100644 --- a/hphp/test/zend/bad/errmsg_040.php.exp +++ b/hphp/test/zend/good/errmsg_040.php.exp @@ -1 +1 @@ -HipHop Fatal error: Arrays are not allowed in class constants in hphp/test/zend/bad/errmsg_040.php on line %d +HipHop Fatal error: Arrays are not allowed in class constants in hphp/test/zend/good/errmsg_040.php on line 4 diff --git a/hphp/test/zend/bad/errmsg_042.php b/hphp/test/zend/good/errmsg_042.php similarity index 100% rename from hphp/test/zend/bad/errmsg_042.php rename to hphp/test/zend/good/errmsg_042.php diff --git a/hphp/test/zend/bad/errmsg_042.php.exp b/hphp/test/zend/good/errmsg_042.php.exp similarity index 62% rename from hphp/test/zend/bad/errmsg_042.php.exp rename to hphp/test/zend/good/errmsg_042.php.exp index c398da075..2c4df3109 100644 --- a/hphp/test/zend/bad/errmsg_042.php.exp +++ b/hphp/test/zend/good/errmsg_042.php.exp @@ -1 +1 @@ -HipHop Fatal error: Key element cannot be a reference in hphp/test/zend/bad/errmsg_042.php on line %d +HipHop Fatal error: Key element cannot be a reference in hphp/test/zend/good/errmsg_042.php on line 5 diff --git a/hphp/test/zend/bad/error_002.php b/hphp/test/zend/good/error_002.php similarity index 100% rename from hphp/test/zend/bad/error_002.php rename to hphp/test/zend/good/error_002.php diff --git a/hphp/test/zend/good/error_002.php.exp b/hphp/test/zend/good/error_002.php.exp new file mode 100644 index 000000000..370a0b5de --- /dev/null +++ b/hphp/test/zend/good/error_002.php.exp @@ -0,0 +1 @@ +HipHop Fatal error: Trait 'abc' not found in hphp/test/zend/good/error_002.php on line 3 diff --git a/hphp/test/zend/bad/error_003.php b/hphp/test/zend/good/error_003.php similarity index 67% rename from hphp/test/zend/bad/error_003.php rename to hphp/test/zend/good/error_003.php index 7bd9853d5..223a864d2 100644 --- a/hphp/test/zend/bad/error_003.php +++ b/hphp/test/zend/good/error_003.php @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/hphp/test/zend/good/exception_002.php.exp b/hphp/test/zend/good/exception_002.php.exp new file mode 100644 index 000000000..d8263ee98 --- /dev/null +++ b/hphp/test/zend/good/exception_002.php.exp @@ -0,0 +1 @@ +2 \ No newline at end of file diff --git a/hphp/test/zend/bad/exception_004.php b/hphp/test/zend/good/exception_004.php similarity index 94% rename from hphp/test/zend/bad/exception_004.php rename to hphp/test/zend/good/exception_004.php index 5235c2dd2..2075bf7da 100644 --- a/hphp/test/zend/bad/exception_004.php +++ b/hphp/test/zend/good/exception_004.php @@ -1,4 +1,4 @@ - \ No newline at end of file diff --git a/hphp/test/zend/good/jump11.php b/hphp/test/zend/good/jump11.php index cb861cc51..d90a184cb 100644 --- a/hphp/test/zend/good/jump11.php +++ b/hphp/test/zend/good/jump11.php @@ -1,16 +1,16 @@ sayHello(); $o->sayWorld(); diff --git a/hphp/test/zend/good/language003.php b/hphp/test/zend/good/language003.php index cb52b0ebd..2301bebe7 100644 --- a/hphp/test/zend/good/language003.php +++ b/hphp/test/zend/good/language003.php @@ -12,13 +12,13 @@ trait World { echo 'World'; } } - + class MyHelloWorld { use Hello, World { Hello::saySomething insteadof World; } } - + $o = new MyHelloWorld(); $o->saySomething(); ?> \ No newline at end of file diff --git a/hphp/test/zend/good/language004.php b/hphp/test/zend/good/language004.php index 18f7e63e3..98d1120ef 100644 --- a/hphp/test/zend/good/language004.php +++ b/hphp/test/zend/good/language004.php @@ -12,14 +12,14 @@ trait World { echo ' World'; } } - + class MyHelloWorld { use Hello, World { Hello::saySomething insteadof World; World::saySomething as sayWorld; } } - + $o = new MyHelloWorld(); $o->saySomething(); $o->sayWorld(); diff --git a/hphp/test/zend/good/language005.php b/hphp/test/zend/good/language005.php index 8874c19df..2c131a5b9 100644 --- a/hphp/test/zend/good/language005.php +++ b/hphp/test/zend/good/language005.php @@ -21,7 +21,7 @@ trait B { class Talker { use A, B { - B::smallTalk insteadof A; + B::smallTalk insteadof A; A::bigTalk insteadof B; B::bigTalk as talk; } diff --git a/hphp/test/zend/good/language009.php b/hphp/test/zend/good/language009.php index 62307a40e..443fb7a49 100644 --- a/hphp/test/zend/good/language009.php +++ b/hphp/test/zend/good/language009.php @@ -21,7 +21,7 @@ trait C { class MyClass { use C, A, B { - B::foo insteadof A, C; + B::foo insteadof A, C; } } diff --git a/hphp/test/zend/bad/lsb_001.php b/hphp/test/zend/good/lsb_001.php similarity index 99% rename from hphp/test/zend/bad/lsb_001.php rename to hphp/test/zend/good/lsb_001.php index b99ff321d..b31a699c3 100644 --- a/hphp/test/zend/bad/lsb_001.php +++ b/hphp/test/zend/good/lsb_001.php @@ -7,7 +7,7 @@ class TestClass { protected static function staticFunction() { return 'TestClassFunction'; } - + public static function testStaticVar() { return static::$staticVar; } diff --git a/hphp/test/zend/bad/lsb_001.php.exp b/hphp/test/zend/good/lsb_001.php.exp similarity index 94% rename from hphp/test/zend/bad/lsb_001.php.exp rename to hphp/test/zend/good/lsb_001.php.exp index ea6b57f73..7c4d5b4e3 100644 --- a/hphp/test/zend/bad/lsb_001.php.exp +++ b/hphp/test/zend/good/lsb_001.php.exp @@ -7,4 +7,4 @@ ChildClassFunction TestClassStatic TestClassConst TestClassFunction -==DONE== +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/lsb_002.php b/hphp/test/zend/good/lsb_002.php similarity index 99% rename from hphp/test/zend/bad/lsb_002.php rename to hphp/test/zend/good/lsb_002.php index afa965d2b..5ed252f84 100644 --- a/hphp/test/zend/bad/lsb_002.php +++ b/hphp/test/zend/good/lsb_002.php @@ -7,7 +7,7 @@ class TestClass { protected static function staticFunction() { return 'TestClassFunction'; } - + public function testStaticVar() { return static::$staticVar; } diff --git a/hphp/test/zend/bad/lsb_002.php.exp b/hphp/test/zend/good/lsb_002.php.exp similarity index 94% rename from hphp/test/zend/bad/lsb_002.php.exp rename to hphp/test/zend/good/lsb_002.php.exp index ea6b57f73..7c4d5b4e3 100644 --- a/hphp/test/zend/bad/lsb_002.php.exp +++ b/hphp/test/zend/good/lsb_002.php.exp @@ -7,4 +7,4 @@ ChildClassFunction TestClassStatic TestClassConst TestClassFunction -==DONE== +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/lsb_003.php b/hphp/test/zend/good/lsb_003.php similarity index 100% rename from hphp/test/zend/bad/lsb_003.php rename to hphp/test/zend/good/lsb_003.php diff --git a/hphp/test/zend/bad/lsb_003.php.exp b/hphp/test/zend/good/lsb_003.php.exp similarity index 70% rename from hphp/test/zend/bad/lsb_003.php.exp rename to hphp/test/zend/good/lsb_003.php.exp index 0a99bbd04..cfdf41451 100644 --- a/hphp/test/zend/bad/lsb_003.php.exp +++ b/hphp/test/zend/good/lsb_003.php.exp @@ -1,3 +1,3 @@ TestClass ChildClass -==DONE== +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/lsb_004.php b/hphp/test/zend/good/lsb_004.php similarity index 100% rename from hphp/test/zend/bad/lsb_004.php rename to hphp/test/zend/good/lsb_004.php diff --git a/hphp/test/zend/bad/lsb_004.php.exp b/hphp/test/zend/good/lsb_004.php.exp similarity index 70% rename from hphp/test/zend/bad/lsb_004.php.exp rename to hphp/test/zend/good/lsb_004.php.exp index 0a99bbd04..cfdf41451 100644 --- a/hphp/test/zend/bad/lsb_004.php.exp +++ b/hphp/test/zend/good/lsb_004.php.exp @@ -1,3 +1,3 @@ TestClass ChildClass -==DONE== +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/lsb_005.php b/hphp/test/zend/good/lsb_005.php similarity index 100% rename from hphp/test/zend/bad/lsb_005.php rename to hphp/test/zend/good/lsb_005.php diff --git a/hphp/test/zend/bad/lsb_005.php.exp b/hphp/test/zend/good/lsb_005.php.exp similarity index 88% rename from hphp/test/zend/bad/lsb_005.php.exp rename to hphp/test/zend/good/lsb_005.php.exp index 0e13f6b5e..efb3faedf 100644 --- a/hphp/test/zend/bad/lsb_005.php.exp +++ b/hphp/test/zend/good/lsb_005.php.exp @@ -9,4 +9,4 @@ TestBB TestC TestBB TestA -==DONE== +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/lsb_011.php b/hphp/test/zend/good/lsb_011.php similarity index 100% rename from hphp/test/zend/bad/lsb_011.php rename to hphp/test/zend/good/lsb_011.php diff --git a/hphp/test/zend/good/lsb_011.php.exp b/hphp/test/zend/good/lsb_011.php.exp new file mode 100644 index 000000000..b5754e203 --- /dev/null +++ b/hphp/test/zend/good/lsb_011.php.exp @@ -0,0 +1 @@ +ok \ No newline at end of file diff --git a/hphp/test/zend/bad/lsb_012.php b/hphp/test/zend/good/lsb_012.php similarity index 100% rename from hphp/test/zend/bad/lsb_012.php rename to hphp/test/zend/good/lsb_012.php diff --git a/hphp/test/zend/good/lsb_012.php.exp b/hphp/test/zend/good/lsb_012.php.exp new file mode 100644 index 000000000..b5754e203 --- /dev/null +++ b/hphp/test/zend/good/lsb_012.php.exp @@ -0,0 +1 @@ +ok \ No newline at end of file diff --git a/hphp/test/zend/bad/lsb_014.php b/hphp/test/zend/good/lsb_014.php similarity index 100% rename from hphp/test/zend/bad/lsb_014.php rename to hphp/test/zend/good/lsb_014.php diff --git a/hphp/test/zend/bad/lsb_014.php.exp b/hphp/test/zend/good/lsb_014.php.exp similarity index 88% rename from hphp/test/zend/bad/lsb_014.php.exp rename to hphp/test/zend/good/lsb_014.php.exp index 5d7970b0c..368276148 100644 --- a/hphp/test/zend/bad/lsb_014.php.exp +++ b/hphp/test/zend/good/lsb_014.php.exp @@ -1,3 +1,3 @@ bool(false) bool(true) -ok +ok \ No newline at end of file diff --git a/hphp/test/zend/bad/lsb_015.php b/hphp/test/zend/good/lsb_015.php similarity index 99% rename from hphp/test/zend/bad/lsb_015.php rename to hphp/test/zend/good/lsb_015.php index 1750007e0..7495aa333 100644 --- a/hphp/test/zend/bad/lsb_015.php +++ b/hphp/test/zend/good/lsb_015.php @@ -8,7 +8,7 @@ class C { } public static function getException() { return new Exception(); - + } } class A { diff --git a/hphp/test/zend/bad/lsb_015.php.exp b/hphp/test/zend/good/lsb_015.php.exp similarity index 84% rename from hphp/test/zend/bad/lsb_015.php.exp rename to hphp/test/zend/good/lsb_015.php.exp index 2e8f0b6d7..6b236a591 100644 --- a/hphp/test/zend/bad/lsb_015.php.exp +++ b/hphp/test/zend/good/lsb_015.php.exp @@ -18,4 +18,4 @@ B B B B -==DONE== +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/lsb_016.php b/hphp/test/zend/good/lsb_016.php similarity index 100% rename from hphp/test/zend/bad/lsb_016.php rename to hphp/test/zend/good/lsb_016.php diff --git a/hphp/test/zend/bad/lsb_016.php.exp b/hphp/test/zend/good/lsb_016.php.exp similarity index 76% rename from hphp/test/zend/bad/lsb_016.php.exp rename to hphp/test/zend/good/lsb_016.php.exp index 1d441aa40..b95533b70 100644 --- a/hphp/test/zend/bad/lsb_016.php.exp +++ b/hphp/test/zend/good/lsb_016.php.exp @@ -1,4 +1,4 @@ TestChild TestChild TestChild -==DONE== +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/lsb_017.php b/hphp/test/zend/good/lsb_017.php similarity index 100% rename from hphp/test/zend/bad/lsb_017.php rename to hphp/test/zend/good/lsb_017.php diff --git a/hphp/test/zend/good/lsb_017.php.exp b/hphp/test/zend/good/lsb_017.php.exp new file mode 100644 index 000000000..4a6280182 --- /dev/null +++ b/hphp/test/zend/good/lsb_017.php.exp @@ -0,0 +1,5 @@ +D +C +B +A +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/good/lsb_019.php b/hphp/test/zend/good/lsb_019.php index 72802c607..e597ef56d 100644 --- a/hphp/test/zend/good/lsb_019.php +++ b/hphp/test/zend/good/lsb_019.php @@ -5,7 +5,7 @@ class TestClass { protected static function staticFunction() { return 'TestClassFunction'; } - + public static function testStaticVar() { TestClass::$staticVar = 'TestClassStatic'; ChildClass1::$staticVar = 'ChildClassStatic'; diff --git a/hphp/test/zend/good/lsb_020.php b/hphp/test/zend/good/lsb_020.php index 2f5bec359..e04fb60d2 100644 --- a/hphp/test/zend/good/lsb_020.php +++ b/hphp/test/zend/good/lsb_020.php @@ -5,7 +5,7 @@ class TestClass { public static function staticFunction() { return 'TestClassFunction'; } - + public static function testStaticVar() { TestClass::$staticVar = 'TestClassStatic'; ChildClass1::$staticVar = 'ChildClassStatic'; diff --git a/hphp/test/zend/good/lsb_022.php b/hphp/test/zend/good/lsb_022.php index 74ad8f79e..116a3519e 100644 --- a/hphp/test/zend/good/lsb_022.php +++ b/hphp/test/zend/good/lsb_022.php @@ -9,7 +9,7 @@ class A { } class B extends A { static function test() { - echo "B\n"; + echo "B\n"; } static function __callstatic($name, $args) { parent::__callstatic($name, $args); diff --git a/hphp/test/zend/bad/magic_by_ref_001.php b/hphp/test/zend/good/magic_by_ref_001.php similarity index 100% rename from hphp/test/zend/bad/magic_by_ref_001.php rename to hphp/test/zend/good/magic_by_ref_001.php diff --git a/hphp/test/zend/good/magic_by_ref_001.php.exp b/hphp/test/zend/good/magic_by_ref_001.php.exp new file mode 100644 index 000000000..269b39faf --- /dev/null +++ b/hphp/test/zend/good/magic_by_ref_001.php.exp @@ -0,0 +1 @@ +HipHop Fatal error: Method test::__set() cannot take arguments by reference in hphp/test/zend/good/magic_by_ref_001.php on line 4 diff --git a/hphp/test/zend/bad/magic_by_ref_002.php b/hphp/test/zend/good/magic_by_ref_002.php similarity index 100% rename from hphp/test/zend/bad/magic_by_ref_002.php rename to hphp/test/zend/good/magic_by_ref_002.php diff --git a/hphp/test/zend/good/magic_by_ref_002.php.exp b/hphp/test/zend/good/magic_by_ref_002.php.exp new file mode 100644 index 000000000..9b5788e22 --- /dev/null +++ b/hphp/test/zend/good/magic_by_ref_002.php.exp @@ -0,0 +1 @@ +HipHop Fatal error: Method test::__set() cannot take arguments by reference in hphp/test/zend/good/magic_by_ref_002.php on line 4 diff --git a/hphp/test/zend/bad/magic_by_ref_003.php b/hphp/test/zend/good/magic_by_ref_003.php similarity index 100% rename from hphp/test/zend/bad/magic_by_ref_003.php rename to hphp/test/zend/good/magic_by_ref_003.php diff --git a/hphp/test/zend/good/magic_by_ref_003.php.exp b/hphp/test/zend/good/magic_by_ref_003.php.exp new file mode 100644 index 000000000..60e199ad9 --- /dev/null +++ b/hphp/test/zend/good/magic_by_ref_003.php.exp @@ -0,0 +1 @@ +HipHop Fatal error: Method test::__get() cannot take arguments by reference in hphp/test/zend/good/magic_by_ref_003.php on line 4 diff --git a/hphp/test/zend/bad/magic_by_ref_004.php b/hphp/test/zend/good/magic_by_ref_004.php similarity index 100% rename from hphp/test/zend/bad/magic_by_ref_004.php rename to hphp/test/zend/good/magic_by_ref_004.php diff --git a/hphp/test/zend/good/magic_by_ref_004.php.exp b/hphp/test/zend/good/magic_by_ref_004.php.exp new file mode 100644 index 000000000..6edbc4f63 --- /dev/null +++ b/hphp/test/zend/good/magic_by_ref_004.php.exp @@ -0,0 +1 @@ +HipHop Fatal error: Method test::__unset() cannot take arguments by reference in hphp/test/zend/good/magic_by_ref_004.php on line 4 diff --git a/hphp/test/zend/bad/magic_by_ref_005.php b/hphp/test/zend/good/magic_by_ref_005.php similarity index 100% rename from hphp/test/zend/bad/magic_by_ref_005.php rename to hphp/test/zend/good/magic_by_ref_005.php diff --git a/hphp/test/zend/good/magic_by_ref_005.php.exp b/hphp/test/zend/good/magic_by_ref_005.php.exp new file mode 100644 index 000000000..72788abf0 --- /dev/null +++ b/hphp/test/zend/good/magic_by_ref_005.php.exp @@ -0,0 +1 @@ +HipHop Fatal error: Method test::__isset() cannot take arguments by reference in hphp/test/zend/good/magic_by_ref_005.php on line 4 diff --git a/hphp/test/zend/bad/magic_by_ref_006.php b/hphp/test/zend/good/magic_by_ref_006.php similarity index 100% rename from hphp/test/zend/bad/magic_by_ref_006.php rename to hphp/test/zend/good/magic_by_ref_006.php diff --git a/hphp/test/zend/good/magic_by_ref_006.php.exp b/hphp/test/zend/good/magic_by_ref_006.php.exp new file mode 100644 index 000000000..6d854b065 --- /dev/null +++ b/hphp/test/zend/good/magic_by_ref_006.php.exp @@ -0,0 +1 @@ +HipHop Fatal error: Method test::__call() cannot take arguments by reference in hphp/test/zend/good/magic_by_ref_006.php on line 4 diff --git a/hphp/test/zend/bad/magic_by_ref_007.php b/hphp/test/zend/good/magic_by_ref_007.php similarity index 100% rename from hphp/test/zend/bad/magic_by_ref_007.php rename to hphp/test/zend/good/magic_by_ref_007.php diff --git a/hphp/test/zend/good/magic_by_ref_007.php.exp b/hphp/test/zend/good/magic_by_ref_007.php.exp new file mode 100644 index 000000000..8ed4f717d --- /dev/null +++ b/hphp/test/zend/good/magic_by_ref_007.php.exp @@ -0,0 +1 @@ +HipHop Fatal error: Method test::__call() cannot take arguments by reference in hphp/test/zend/good/magic_by_ref_007.php on line 4 diff --git a/hphp/test/zend/good/magic_methods_001.php b/hphp/test/zend/good/magic_methods_001.php index 25dfee322..e1b58beaf 100644 --- a/hphp/test/zend/good/magic_methods_001.php +++ b/hphp/test/zend/good/magic_methods_001.php @@ -1,11 +1,11 @@ line %d + lines = re.sub(r'line \d+\n', 'line %d\n', lines) + # kill identical lines + lines = re.sub(r'-(.*)\n\+\1\n', '', lines) + + return re.search(r'\n(\+|\-)', lines) is None + +for filename in set(test_files): + good_file = filename.replace('bad', 'good', 1) + if isOkDiff(filename): + os.rename(filename, good_file) + file(good_file+'.exp', 'w').write( + file(filename+'.out').read().replace('/bad', '/good') + ) + os.unlink(filename+'.exp') + + else: + if not os.path.exists(good_file): + continue + os.unlink(good_file) + os.unlink(good_file+'.exp')