diff options
Diffstat (limited to 'tests')
150 files changed, 283 insertions, 297 deletions
diff --git a/tests/basic/bug31875.phpt b/tests/basic/bug31875.phpt index 78085d766b..65f68b9af3 100644 --- a/tests/basic/bug31875.phpt +++ b/tests/basic/bug31875.phpt @@ -17,7 +17,7 @@ var_dump(in_array($disabled_function, $functions['internal'])); $functions = get_defined_functions(true); var_dump(in_array($disabled_function, $functions['internal'])); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(false) diff --git a/tests/basic/bug61000.phpt b/tests/basic/bug61000.phpt index 8149d68e94..01e27bfd9b 100644 --- a/tests/basic/bug61000.phpt +++ b/tests/basic/bug61000.phpt @@ -10,7 +10,7 @@ a[a][]=foo&a[a][b][c]=bar <?php print_r($_GET); print_r($_POST); ---EXPECTF-- +--EXPECT-- Array ( ) diff --git a/tests/basic/bug71273.phpt b/tests/basic/bug71273.phpt index d0cd72577e..3db4454605 100644 --- a/tests/basic/bug71273.phpt +++ b/tests/basic/bug71273.phpt @@ -16,6 +16,6 @@ Bug #71273 A wrong ext directory setup in php.ini leads to crash var_dump(preg_match(",.+a[\\/].+[\\/]w.php_kartoffelbrei.dll.+,s", $out)); ?> ==DONE== ---EXPECTF-- +--EXPECT-- int(1) ==DONE== diff --git a/tests/basic/encoding.phpt b/tests/basic/encoding.phpt index 8c110f84a6..dbf61db9bc 100644 --- a/tests/basic/encoding.phpt +++ b/tests/basic/encoding.phpt @@ -1,6 +1,5 @@ --TEST-- PHP encoding setting test ---INI-- --FILE-- <?php var_dump(ini_get('default_charset')); @@ -20,6 +19,7 @@ var_dump(ini_set('output_encoding', 'EUC-JP')); var_dump(ini_get('input_encoding')); var_dump(ini_get('internal_encoding')); var_dump(ini_get('output_encoding')); +?> --EXPECT-- string(5) "UTF-8" string(0) "" diff --git a/tests/basic/rfc1867_anonymous_upload.phpt b/tests/basic/rfc1867_anonymous_upload.phpt index 1612d554cf..5650b5cd5d 100644 --- a/tests/basic/rfc1867_anonymous_upload.phpt +++ b/tests/basic/rfc1867_anonymous_upload.phpt @@ -27,11 +27,11 @@ array(2) { [%d]=> array(5) { ["name"]=> - %string|unicode%(9) "file1.txt" + string(9) "file1.txt" ["type"]=> - %string|unicode%(16) "text/plain-file1" + string(16) "text/plain-file1" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> @@ -40,11 +40,11 @@ array(2) { [%d]=> array(5) { ["name"]=> - %string|unicode%(9) "file2.txt" + string(9) "file2.txt" ["type"]=> - %string|unicode%(16) "text/plain-file2" + string(16) "text/plain-file2" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> diff --git a/tests/basic/rfc1867_boundary_1.phpt b/tests/basic/rfc1867_boundary_1.phpt index bea825e797..014bae897e 100644 --- a/tests/basic/rfc1867_boundary_1.phpt +++ b/tests/basic/rfc1867_boundary_1.phpt @@ -14,7 +14,7 @@ Content-Disposition: form-data; name="foobar" var_dump($_FILES); var_dump($_POST); ?> ---EXPECTF-- +--EXPECT-- array(0) { } array(1) { diff --git a/tests/basic/rfc1867_boundary_2.phpt b/tests/basic/rfc1867_boundary_2.phpt index b59fc6db98..775488999e 100644 --- a/tests/basic/rfc1867_boundary_2.phpt +++ b/tests/basic/rfc1867_boundary_2.phpt @@ -14,7 +14,7 @@ Content-Disposition: form-data; name="foobar" var_dump($_FILES); var_dump($_POST); ?> ---EXPECTF-- +--EXPECT-- array(0) { } array(1) { diff --git a/tests/basic/rfc1867_empty_upload.phpt b/tests/basic/rfc1867_empty_upload.phpt index bb6ccee896..77fe53ea58 100644 --- a/tests/basic/rfc1867_empty_upload.phpt +++ b/tests/basic/rfc1867_empty_upload.phpt @@ -42,11 +42,11 @@ array(3) { ["file1"]=> array(5) { ["name"]=> - %string|unicode%(9) "file1.txt" + string(9) "file1.txt" ["type"]=> - %string|unicode%(16) "text/plain-file1" + string(16) "text/plain-file1" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> @@ -55,11 +55,11 @@ array(3) { ["file2"]=> array(5) { ["name"]=> - %string|unicode%(0) "" + string(0) "" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(0) "" + string(0) "" ["error"]=> int(4) ["size"]=> @@ -68,11 +68,11 @@ array(3) { ["file3"]=> array(5) { ["name"]=> - %string|unicode%(9) "file3.txt" + string(9) "file3.txt" ["type"]=> - %string|unicode%(16) "text/plain-file3" + string(16) "text/plain-file3" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> diff --git a/tests/basic/rfc1867_file_upload_disabled.phpt b/tests/basic/rfc1867_file_upload_disabled.phpt index 1e1a747372..ab6ddc1861 100644 --- a/tests/basic/rfc1867_file_upload_disabled.phpt +++ b/tests/basic/rfc1867_file_upload_disabled.phpt @@ -23,7 +23,7 @@ foo var_dump($_FILES); var_dump($_POST); ?> ---EXPECTF-- +--EXPECT-- array(0) { } array(2) { diff --git a/tests/basic/rfc1867_malicious_input.phpt b/tests/basic/rfc1867_malicious_input.phpt index 98ed47ca20..333e8894c5 100644 --- a/tests/basic/rfc1867_malicious_input.phpt +++ b/tests/basic/rfc1867_malicious_input.phpt @@ -16,7 +16,7 @@ Content-Type: text/plain-file1 var_dump($_FILES); var_dump($_POST); ?> ---EXPECTF-- +--EXPECT-- array(0) { } array(0) { diff --git a/tests/basic/rfc1867_max_file_size.phpt b/tests/basic/rfc1867_max_file_size.phpt index 61fd89f3d2..89406a407f 100644 --- a/tests/basic/rfc1867_max_file_size.phpt +++ b/tests/basic/rfc1867_max_file_size.phpt @@ -42,11 +42,11 @@ array(3) { ["file1"]=> array(5) { ["name"]=> - %string|unicode%(9) "file1.txt" + string(9) "file1.txt" ["type"]=> - %string|unicode%(16) "text/plain-file1" + string(16) "text/plain-file1" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> @@ -55,11 +55,11 @@ array(3) { ["file2"]=> array(5) { ["name"]=> - %string|unicode%(9) "file2.txt" + string(9) "file2.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(0) "" + string(0) "" ["error"]=> int(2) ["size"]=> @@ -68,11 +68,11 @@ array(3) { ["file3"]=> array(5) { ["name"]=> - %string|unicode%(9) "file3.txt" + string(9) "file3.txt" ["type"]=> - %string|unicode%(16) "text/plain-file3" + string(16) "text/plain-file3" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> @@ -81,7 +81,7 @@ array(3) { } array(1) { ["MAX_FILE_SIZE"]=> - %string|unicode%(1) "1" + string(1) "1" } string(1) "1" string(1) "3" diff --git a/tests/basic/rfc1867_missing_boundary_2.phpt b/tests/basic/rfc1867_missing_boundary_2.phpt index 9cc847f780..bdfe977428 100644 --- a/tests/basic/rfc1867_missing_boundary_2.phpt +++ b/tests/basic/rfc1867_missing_boundary_2.phpt @@ -20,11 +20,11 @@ array(1) { ["file1"]=> array(5) { ["name"]=> - %string|unicode%(9) "file1.txt" + string(9) "file1.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(0) "" + string(0) "" ["error"]=> int(3) ["size"]=> diff --git a/tests/basic/rfc1867_post_max_filesize.phpt b/tests/basic/rfc1867_post_max_filesize.phpt index 89115d0703..58e05319a1 100644 --- a/tests/basic/rfc1867_post_max_filesize.phpt +++ b/tests/basic/rfc1867_post_max_filesize.phpt @@ -38,11 +38,11 @@ array(3) { ["file1"]=> array(5) { ["name"]=> - %string|unicode%(9) "file1.txt" + string(9) "file1.txt" ["type"]=> - %string|unicode%(16) "text/plain-file1" + string(16) "text/plain-file1" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> @@ -51,11 +51,11 @@ array(3) { ["file2"]=> array(5) { ["name"]=> - %string|unicode%(9) "file2.txt" + string(9) "file2.txt" ["type"]=> - %string|unicode%(0) "" + string(0) "" ["tmp_name"]=> - %string|unicode%(0) "" + string(0) "" ["error"]=> int(1) ["size"]=> @@ -64,11 +64,11 @@ array(3) { ["file3"]=> array(5) { ["name"]=> - %string|unicode%(9) "file3.txt" + string(9) "file3.txt" ["type"]=> - %string|unicode%(16) "text/plain-file3" + string(16) "text/plain-file3" ["tmp_name"]=> - %string|unicode%(%d) "%s" + string(%d) "%s" ["error"]=> int(0) ["size"]=> diff --git a/tests/classes/__call_003.phpt b/tests/classes/__call_003.phpt index a32554571b..24d1b1b0b4 100644 --- a/tests/classes/__call_003.phpt +++ b/tests/classes/__call_003.phpt @@ -21,7 +21,7 @@ Force pass-by-reference to __call var_dump($a, $b); ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> string(8) "original" diff --git a/tests/classes/__call_004.phpt b/tests/classes/__call_004.phpt index 4c2797872f..ca980c65f0 100644 --- a/tests/classes/__call_004.phpt +++ b/tests/classes/__call_004.phpt @@ -26,7 +26,7 @@ class B extends A { $b = new B(); $b->test(); ?> ---EXPECTF-- +--EXPECT-- In B::__call(test1, array(1,a)) object(B)#1 (0) { } diff --git a/tests/classes/__set__get_004.phpt b/tests/classes/__set__get_004.phpt index afed2ad8f3..004edc973a 100644 --- a/tests/classes/__set__get_004.phpt +++ b/tests/classes/__set__get_004.phpt @@ -31,7 +31,7 @@ var_dump($foo->bar->baz); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- string(5) "Check" string(5) "Check" ===DONE=== diff --git a/tests/classes/array_conversion_keys.phpt b/tests/classes/array_conversion_keys.phpt index e3bd7e0331..6c642f1f85 100644 --- a/tests/classes/array_conversion_keys.phpt +++ b/tests/classes/array_conversion_keys.phpt @@ -10,7 +10,7 @@ class foo } var_export((array) new foo); ?> ---EXPECTF-- +--EXPECT-- array ( '' . "\0" . 'foo' . "\0" . 'private' => 'private', '' . "\0" . '*' . "\0" . 'protected' => 'protected', diff --git a/tests/classes/autoload_007.phpt b/tests/classes/autoload_007.phpt index ba542a1450..4ea1f6de17 100644 --- a/tests/classes/autoload_007.phpt +++ b/tests/classes/autoload_007.phpt @@ -10,5 +10,5 @@ spl_autoload_register(function ($name) { $a = new stdClass; var_dump($a instanceof UndefC); ?> ---EXPECTF-- +--EXPECT-- bool(false) diff --git a/tests/classes/autoload_008.phpt b/tests/classes/autoload_008.phpt index 1f3f075843..905fcaadf4 100644 --- a/tests/classes/autoload_008.phpt +++ b/tests/classes/autoload_008.phpt @@ -21,5 +21,5 @@ catch (Exception $e) { echo "In Exception catch block. Autoload should not have been triggered.\n"; } ?> ---EXPECTF-- +--EXPECT-- In Exception catch block. Autoload should not have been triggered. diff --git a/tests/classes/autoload_011.phpt b/tests/classes/autoload_011.phpt index aaea38c6f0..630cbf3208 100644 --- a/tests/classes/autoload_011.phpt +++ b/tests/classes/autoload_011.phpt @@ -14,4 +14,7 @@ class C extends UndefBase --EXPECTF-- In autoload: string(9) "UndefBase" -Fatal error: Class 'UndefBase' not found in %s on line %d +Fatal error: Uncaught Error: Class 'UndefBase' not found in %s:%d +Stack trace: +#0 {main} + thrown in %sautoload_011.php on line %d diff --git a/tests/classes/autoload_013.phpt b/tests/classes/autoload_013.phpt index a63b129562..c85c18ec15 100644 --- a/tests/classes/autoload_013.phpt +++ b/tests/classes/autoload_013.phpt @@ -1,7 +1,5 @@ --TEST-- Ensure the ReflectionClass constructor triggers autoload. ---SKIPIF-- -<?php extension_loaded('reflection') or die('skip'); ?> --FILE-- <?php spl_autoload_register(function ($name) { @@ -16,6 +14,6 @@ catch (ReflectionException $e) { echo $e->getMessage(); } ?> ---EXPECTF-- +--EXPECT-- In autoload: string(6) "UndefC" Class UndefC does not exist diff --git a/tests/classes/autoload_014.phpt b/tests/classes/autoload_014.phpt index 3eb0484ec3..827224aaa5 100644 --- a/tests/classes/autoload_014.phpt +++ b/tests/classes/autoload_014.phpt @@ -1,7 +1,5 @@ --TEST-- Ensure the ReflectionMethod constructor triggers autoload. ---SKIPIF-- -<?php extension_loaded('reflection') or die('skip'); ?> --FILE-- <?php spl_autoload_register(function ($name) { @@ -16,6 +14,6 @@ catch (ReflectionException $e) { echo $e->getMessage(); } ?> ---EXPECTF-- +--EXPECT-- In autoload: string(6) "UndefC" Class UndefC does not exist diff --git a/tests/classes/autoload_015.phpt b/tests/classes/autoload_015.phpt index edff01c91a..9f023d5be5 100644 --- a/tests/classes/autoload_015.phpt +++ b/tests/classes/autoload_015.phpt @@ -1,7 +1,5 @@ --TEST-- Ensure the ReflectionProperty constructor triggers autoload. ---SKIPIF-- -<?php extension_loaded('reflection') or die('skip'); ?> --FILE-- <?php spl_autoload_register(function ($name) { @@ -16,6 +14,6 @@ catch (ReflectionException $e) { echo $e->getMessage(); } ?> ---EXPECTF-- +--EXPECT-- In autoload: string(6) "UndefC" Class UndefC does not exist diff --git a/tests/classes/autoload_016.phpt b/tests/classes/autoload_016.phpt index d1ff885746..ceb8ce6bbc 100644 --- a/tests/classes/autoload_016.phpt +++ b/tests/classes/autoload_016.phpt @@ -1,7 +1,5 @@ --TEST-- Ensure ReflectionClass::getProperty() triggers autoload ---SKIPIF-- -<?php extension_loaded('reflection') or die('skip'); ?> --FILE-- <?php spl_autoload_register(function ($name) { @@ -17,6 +15,6 @@ $rc->getProperty("UndefC::p"); echo $e->getMessage(); } ?> ---EXPECTF-- +--EXPECT-- In autoload: string(6) "undefc" Class undefc does not exist diff --git a/tests/classes/autoload_017.phpt b/tests/classes/autoload_017.phpt index 8e1aeac748..a1485f3aeb 100644 --- a/tests/classes/autoload_017.phpt +++ b/tests/classes/autoload_017.phpt @@ -1,7 +1,5 @@ --TEST-- Ensure ReflectionClass::implementsInterface triggers autoload. ---SKIPIF-- -<?php extension_loaded('reflection') or die('skip'); ?> --FILE-- <?php spl_autoload_register(function ($name) { @@ -17,6 +15,6 @@ try { echo $e->getMessage(); } ?> ---EXPECTF-- +--EXPECT-- In autoload: string(6) "UndefI" Interface UndefI does not exist diff --git a/tests/classes/autoload_018.phpt b/tests/classes/autoload_018.phpt index 0d4812908c..e83767d632 100644 --- a/tests/classes/autoload_018.phpt +++ b/tests/classes/autoload_018.phpt @@ -18,7 +18,7 @@ spl_autoload_register(function ($name) { var_dump(class_exists('UndefinedClass0')); ?> ---EXPECTF-- +--EXPECT-- IN: autoload(UndefinedClass0) IN: autoload(UndefinedClass1) IN: autoload(UndefinedClass2) diff --git a/tests/classes/autoload_019.phpt b/tests/classes/autoload_019.phpt index b9bcd6e6d1..aefb6f8253 100644 --- a/tests/classes/autoload_019.phpt +++ b/tests/classes/autoload_019.phpt @@ -9,5 +9,5 @@ spl_autoload_register(function ($name) { class_exists("unDefinedClass"); ?> ---EXPECTF-- +--EXPECT-- autoload unDefinedClass diff --git a/tests/classes/bug75765.phpt b/tests/classes/bug75765.phpt new file mode 100644 index 0000000000..d24f62db80 --- /dev/null +++ b/tests/classes/bug75765.phpt @@ -0,0 +1,22 @@ +--TEST-- +Ensure that extending of undefined class throws the exception +--FILE-- +<?php + +try { + class A extends B {} +} catch (Error $e) { + var_dump(class_exists('A')); + var_dump(class_exists('B')); + throw $e; +} + +?> +--EXPECTF-- +bool(false) +bool(false) + +Fatal error: Uncaught Error: Class 'B' not found in %sbug75765.php:%d +Stack trace: +#0 {main} + thrown in %sbug75765.php on line %d diff --git a/tests/classes/class_stdclass.phpt b/tests/classes/class_stdclass.phpt index 5e3422aeae..a8c12715e2 100644 --- a/tests/classes/class_stdclass.phpt +++ b/tests/classes/class_stdclass.phpt @@ -9,6 +9,6 @@ echo get_class($obj)."\n"; echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- stdClass Done diff --git a/tests/classes/constants_basic_003.phpt b/tests/classes/constants_basic_003.phpt index 1762c99a13..abf48e3c82 100644 --- a/tests/classes/constants_basic_003.phpt +++ b/tests/classes/constants_basic_003.phpt @@ -21,7 +21,7 @@ Ensure class properties and constants can be defined in terms of constants that var_dump(B::ca); var_dump(B::cc); ?> ---EXPECTF-- +--EXPECT-- string(12) "hello from A" string(12) "hello from C" string(12) "hello from A" diff --git a/tests/classes/constants_basic_005.phpt b/tests/classes/constants_basic_005.phpt index c26eb6691f..6d1ac8355d 100644 --- a/tests/classes/constants_basic_005.phpt +++ b/tests/classes/constants_basic_005.phpt @@ -10,6 +10,6 @@ Test constants with default values based on other constants. } var_dump(C::CONST_1, C::CONST_2); ?> ---EXPECTF-- +--EXPECT-- string(5) "hello" string(5) "hello" diff --git a/tests/classes/constants_basic_006.phpt b/tests/classes/constants_basic_006.phpt index 9ede9bce09..a293c0bede 100644 --- a/tests/classes/constants_basic_006.phpt +++ b/tests/classes/constants_basic_006.phpt @@ -19,7 +19,7 @@ Ensure class constants are not evaluated when a class is looked up to resolve in var_dump(C::X, C::$a, D::X, D::$a, E::X, E::$a); ?> ---EXPECTF-- +--EXPECT-- string(5) "hello" array(2) { ["nasty"]=> diff --git a/tests/classes/constants_error_002.phpt b/tests/classes/constants_error_002.phpt index 63aa22109c..c6b3b7b6b3 100644 --- a/tests/classes/constants_error_002.phpt +++ b/tests/classes/constants_error_002.phpt @@ -8,5 +8,5 @@ Error case: class constant as an array } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===DONE=== diff --git a/tests/classes/constants_error_004.phpt b/tests/classes/constants_error_004.phpt index adafc0614b..b7f668909b 100644 --- a/tests/classes/constants_error_004.phpt +++ b/tests/classes/constants_error_004.phpt @@ -10,4 +10,7 @@ Class constant whose initial value references a non-existent class $a = new C(); ?> --EXPECTF-- -Fatal error: Class 'D' not found in %s on line %d +Fatal error: Uncaught Error: Class 'D' not found in %s:%d +Stack trace: +#0 {main} + thrown in %s on line %d diff --git a/tests/classes/constants_visibility_001.phpt b/tests/classes/constants_visibility_001.phpt index 37a0154d92..a5eeb47f37 100644 --- a/tests/classes/constants_visibility_001.phpt +++ b/tests/classes/constants_visibility_001.phpt @@ -17,7 +17,7 @@ A::staticConstDump(); (new A())->constDump(); ?> ---EXPECTF-- +--EXPECT-- string(11) "publicConst" string(11) "publicConst" string(11) "publicConst" diff --git a/tests/classes/ctor_dtor.phpt b/tests/classes/ctor_dtor.phpt index 3f57a312e4..bcac143025 100644 --- a/tests/classes/ctor_dtor.phpt +++ b/tests/classes/ctor_dtor.phpt @@ -29,7 +29,7 @@ $t = new late(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- early::__construct early::__construct early::__destruct diff --git a/tests/classes/ctor_dtor_inheritance.phpt b/tests/classes/ctor_dtor_inheritance.phpt index 84b38665e6..5e240571d7 100644 --- a/tests/classes/ctor_dtor_inheritance.phpt +++ b/tests/classes/ctor_dtor_inheritance.phpt @@ -52,7 +52,7 @@ unset($t); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Testing class base base::__construct base Object diff --git a/tests/classes/destructor_and_exceptions.phpt b/tests/classes/destructor_and_exceptions.phpt index 8100c92465..0da6e642af 100644 --- a/tests/classes/destructor_and_exceptions.phpt +++ b/tests/classes/destructor_and_exceptions.phpt @@ -51,7 +51,7 @@ catch(FatalException $e) ?> ===DONE=== ---EXPECTF-- +--EXPECT-- FailClass::__destruct Caught: FailClass FatalException::__construct diff --git a/tests/classes/destructor_visibility_003.phpt b/tests/classes/destructor_visibility_003.phpt index 4f75166940..c0235cd1e3 100644 --- a/tests/classes/destructor_visibility_003.phpt +++ b/tests/classes/destructor_visibility_003.phpt @@ -21,6 +21,6 @@ unset($obj); // Derived::__destruct is being called not Base::__destruct ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Derived::__destruct ===DONE=== diff --git a/tests/classes/factory_and_singleton_009.phpt b/tests/classes/factory_and_singleton_009.phpt index 9134245a17..c1cfcbdcdf 100644 --- a/tests/classes/factory_and_singleton_009.phpt +++ b/tests/classes/factory_and_singleton_009.phpt @@ -13,7 +13,7 @@ $obj = new test; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===DONE=== Warning: Call to protected test::__destruct() from context '' during shutdown ignored in Unknown on line 0 diff --git a/tests/classes/factory_and_singleton_010.phpt b/tests/classes/factory_and_singleton_010.phpt index bd7e7e32b7..9466fe55e4 100644 --- a/tests/classes/factory_and_singleton_010.phpt +++ b/tests/classes/factory_and_singleton_010.phpt @@ -13,7 +13,7 @@ $obj = new test; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===DONE=== Warning: Call to private test::__destruct() from context '' during shutdown ignored in Unknown on line 0 diff --git a/tests/classes/final.phpt b/tests/classes/final.phpt index f82087749b..0e100d2304 100644 --- a/tests/classes/final.phpt +++ b/tests/classes/final.phpt @@ -23,7 +23,7 @@ $t2->show(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Call to function first::show() Call to function second::show() Done diff --git a/tests/classes/interface_constant_inheritance_004.phpt b/tests/classes/interface_constant_inheritance_004.phpt index c10b19b821..aca9865eb1 100644 --- a/tests/classes/interface_constant_inheritance_004.phpt +++ b/tests/classes/interface_constant_inheritance_004.phpt @@ -14,5 +14,5 @@ class C implements IA, IB { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/tests/classes/interface_doubled.phpt b/tests/classes/interface_doubled.phpt index b7c4b7a141..8fbfcba7ff 100644 --- a/tests/classes/interface_doubled.phpt +++ b/tests/classes/interface_doubled.phpt @@ -153,7 +153,7 @@ echo $t->test('if_e'); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- class_a is_a(class_a, if_a) yes is_a(class_a, if_b) no diff --git a/tests/classes/interface_implemented.phpt b/tests/classes/interface_implemented.phpt index bfc9c47fb1..e224c5bd23 100644 --- a/tests/classes/interface_implemented.phpt +++ b/tests/classes/interface_implemented.phpt @@ -59,7 +59,7 @@ $t = new derived_d(); $t->test(); ?> ---EXPECTF-- +--EXPECT-- is_a(base, base) = yes is_a(base, derived_a) = no is_a(base, derived_b) = no diff --git a/tests/classes/interface_optional_arg_003.phpt b/tests/classes/interface_optional_arg_003.phpt index aa769ec7de..cf583fe204 100644 --- a/tests/classes/interface_optional_arg_003.phpt +++ b/tests/classes/interface_optional_arg_003.phpt @@ -13,5 +13,5 @@ class C implements I { $c = new C; $c->f(); ?> ---EXPECTF-- +--EXPECT-- int(2) diff --git a/tests/classes/iterators_004.phpt b/tests/classes/iterators_004.phpt index df76c7fe31..dc5a07a603 100644 --- a/tests/classes/iterators_004.phpt +++ b/tests/classes/iterators_004.phpt @@ -51,7 +51,7 @@ foreach($obj as $v => $w) { print "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 1st try 2nd try object:max=>3 diff --git a/tests/classes/iterators_008.phpt b/tests/classes/iterators_008.phpt index 463e54e1ba..26c8e01704 100644 --- a/tests/classes/iterators_008.phpt +++ b/tests/classes/iterators_008.phpt @@ -34,7 +34,7 @@ class D extends C implements Iterator { foreach (new D as $x) {} ?> ---EXPECTF-- +--EXPECT-- D::rewind(2) D::valid(2) D::current(2) diff --git a/tests/classes/method_call_variation_001.phpt b/tests/classes/method_call_variation_001.phpt index 9537321b15..5b6b725bc2 100644 --- a/tests/classes/method_call_variation_001.phpt +++ b/tests/classes/method_call_variation_001.phpt @@ -20,7 +20,7 @@ In $a->$b[Y]() and $a->X[Y]() both $a->$b[Y] and $a->X[Y] represent a global fun $c->functions[0](5, 6); $c->functions[1][2][3][4](7, 8); ?> ---EXPECTF-- +--EXPECT-- Called global foo(1, 2) Called global foo(3, 4) Called global foo(5, 6) diff --git a/tests/classes/private_005b.phpt b/tests/classes/private_005b.phpt deleted file mode 100644 index db139f65b7..0000000000 --- a/tests/classes/private_005b.phpt +++ /dev/null @@ -1,37 +0,0 @@ ---TEST-- -ZE2 A private method cannot be called in a derived class ---FILE-- -<?php - -class pass { - private function show() { - echo "Call show()\n"; - } - - public function do_show() { - $this->show(); - } -} - -class fail extends pass { - function do_show() { - $this->show(); - } -} - -$t = new pass(); -$t->do_show(); - -$t2 = new fail(); -$t2->do_show(); - -echo "Done\n"; // shouldn't be displayed -?> ---EXPECTF-- -Call show() - -Fatal error: Uncaught Error: Call to private method pass::show() from context 'fail' in %s:%d -Stack trace: -#0 %s(%d): fail->do_show() -#1 {main} - thrown in %s on line %d diff --git a/tests/classes/private_006.phpt b/tests/classes/private_006.phpt index cd53ebac8b..895affac75 100644 --- a/tests/classes/private_006.phpt +++ b/tests/classes/private_006.phpt @@ -32,7 +32,7 @@ class fail extends third { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Call show() Call show() Call show() diff --git a/tests/classes/private_006b.phpt b/tests/classes/private_006b.phpt index a31431272c..1c678601b6 100644 --- a/tests/classes/private_006b.phpt +++ b/tests/classes/private_006b.phpt @@ -33,7 +33,7 @@ $t3->do_show(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Call show() Call show() Done diff --git a/tests/classes/private_007.phpt b/tests/classes/private_007.phpt index acf56665a7..abc2258bc2 100644 --- a/tests/classes/private_007.phpt +++ b/tests/classes/private_007.phpt @@ -22,7 +22,7 @@ Foo::priv(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Bar::priv() Foo::priv() Done diff --git a/tests/classes/private_007b.phpt b/tests/classes/private_007b.phpt index 588a199e76..3272d0c8a0 100644 --- a/tests/classes/private_007b.phpt +++ b/tests/classes/private_007b.phpt @@ -23,7 +23,7 @@ $obj->priv(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Bar::priv() Foo::priv() Done diff --git a/tests/classes/private_members.phpt b/tests/classes/private_members.phpt index af336ae85d..4d8fd9eeb0 100644 --- a/tests/classes/private_members.phpt +++ b/tests/classes/private_members.phpt @@ -51,7 +51,7 @@ unset($t); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- derived::__construct(begin) base::__construct(begin) base::test diff --git a/tests/classes/private_members_serialization.phpt b/tests/classes/private_members_serialization.phpt index c8dd3ab248..c196f7d8f9 100644 --- a/tests/classes/private_members_serialization.phpt +++ b/tests/classes/private_members_serialization.phpt @@ -19,5 +19,5 @@ class bar extends foo var_dump(str_replace("\0", '\0', serialize(new bar()))); ?> ---EXPECTF-- +--EXPECT-- string(114) "O:3:"bar":3:{s:12:"\0foo\0private";s:7:"private";s:12:"\0*\0protected";s:9:"protected";s:6:"public";s:6:"public";}" diff --git a/tests/classes/property_override_privateStatic_private.phpt b/tests/classes/property_override_privateStatic_private.phpt index c579c1b969..5be1eaf509 100644 --- a/tests/classes/property_override_privateStatic_private.phpt +++ b/tests/classes/property_override_privateStatic_private.phpt @@ -27,7 +27,7 @@ Redeclare inherited private static property as private. $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p diff --git a/tests/classes/property_override_privateStatic_privateStatic.phpt b/tests/classes/property_override_privateStatic_privateStatic.phpt index fe458f900d..2a1488a319 100644 --- a/tests/classes/property_override_privateStatic_privateStatic.phpt +++ b/tests/classes/property_override_privateStatic_privateStatic.phpt @@ -26,7 +26,7 @@ Redeclare inherited private static property as private static. B::showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p (static) diff --git a/tests/classes/property_override_privateStatic_protected.phpt b/tests/classes/property_override_privateStatic_protected.phpt index 52336f22ef..8e570ddbad 100644 --- a/tests/classes/property_override_privateStatic_protected.phpt +++ b/tests/classes/property_override_privateStatic_protected.phpt @@ -27,7 +27,7 @@ Redeclare inherited private static property as protected. $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p diff --git a/tests/classes/property_override_privateStatic_protectedStatic.phpt b/tests/classes/property_override_privateStatic_protectedStatic.phpt index fc07929b3a..03e1abddf2 100644 --- a/tests/classes/property_override_privateStatic_protectedStatic.phpt +++ b/tests/classes/property_override_privateStatic_protectedStatic.phpt @@ -26,7 +26,7 @@ Redeclare inherited private static property as protected static. B::showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p (static) diff --git a/tests/classes/property_override_privateStatic_public.phpt b/tests/classes/property_override_privateStatic_public.phpt index 2eba25c0b5..1db49f9845 100644 --- a/tests/classes/property_override_privateStatic_public.phpt +++ b/tests/classes/property_override_privateStatic_public.phpt @@ -27,7 +27,7 @@ Redeclare inherited private static property as public. $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p diff --git a/tests/classes/property_override_privateStatic_publicStatic.phpt b/tests/classes/property_override_privateStatic_publicStatic.phpt index 05c53e7b6e..2a18747a30 100644 --- a/tests/classes/property_override_privateStatic_publicStatic.phpt +++ b/tests/classes/property_override_privateStatic_publicStatic.phpt @@ -26,7 +26,7 @@ Redeclare inherited private static property as public static. B::showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p (static) diff --git a/tests/classes/property_override_private_private.phpt b/tests/classes/property_override_private_private.phpt index a0cdd208af..74184d111a 100644 --- a/tests/classes/property_override_private_private.phpt +++ b/tests/classes/property_override_private_private.phpt @@ -28,7 +28,7 @@ Redeclare inherited private property as private. $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p A::p B::p diff --git a/tests/classes/property_override_private_privateStatic.phpt b/tests/classes/property_override_private_privateStatic.phpt index 27ba55fad1..3aead95c0c 100644 --- a/tests/classes/property_override_private_privateStatic.phpt +++ b/tests/classes/property_override_private_privateStatic.phpt @@ -28,7 +28,7 @@ Redeclare inherited private property as private static. $b->showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p A::p B::p (static) diff --git a/tests/classes/property_override_private_protected.phpt b/tests/classes/property_override_private_protected.phpt index 70a9807843..25f6e5218f 100644 --- a/tests/classes/property_override_private_protected.phpt +++ b/tests/classes/property_override_private_protected.phpt @@ -28,7 +28,7 @@ Redeclare inherited private property as protected. $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p A::p B::p diff --git a/tests/classes/property_override_private_protectedStatic.phpt b/tests/classes/property_override_private_protectedStatic.phpt index 5c670920d3..6ccc953503 100644 --- a/tests/classes/property_override_private_protectedStatic.phpt +++ b/tests/classes/property_override_private_protectedStatic.phpt @@ -28,7 +28,7 @@ Redeclare inherited private property as protected static. $b->showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p A::p B::p (static) diff --git a/tests/classes/property_override_private_public.phpt b/tests/classes/property_override_private_public.phpt index 06ef7a158b..e54d1370de 100644 --- a/tests/classes/property_override_private_public.phpt +++ b/tests/classes/property_override_private_public.phpt @@ -28,7 +28,7 @@ Redeclare inherited private property as public. $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p A::p B::p diff --git a/tests/classes/property_override_private_publicStatic.phpt b/tests/classes/property_override_private_publicStatic.phpt index 1910c7e148..67c44a3f30 100644 --- a/tests/classes/property_override_private_publicStatic.phpt +++ b/tests/classes/property_override_private_publicStatic.phpt @@ -28,7 +28,7 @@ Redeclare inherited private property as public static. $b->showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p A::p B::p (static) diff --git a/tests/classes/property_override_protectedStatic_protectedStatic.phpt b/tests/classes/property_override_protectedStatic_protectedStatic.phpt index 96bebcac3b..c81a60423e 100644 --- a/tests/classes/property_override_protectedStatic_protectedStatic.phpt +++ b/tests/classes/property_override_protectedStatic_protectedStatic.phpt @@ -26,7 +26,7 @@ Redeclare inherited protected static property as protected static. B::showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p (static) diff --git a/tests/classes/property_override_protectedStatic_publicStatic.phpt b/tests/classes/property_override_protectedStatic_publicStatic.phpt index 783b333f14..7c39838228 100644 --- a/tests/classes/property_override_protectedStatic_publicStatic.phpt +++ b/tests/classes/property_override_protectedStatic_publicStatic.phpt @@ -26,7 +26,7 @@ Redeclare inherited protected static property as public static. B::showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p (static) diff --git a/tests/classes/property_override_protected_protected.phpt b/tests/classes/property_override_protected_protected.phpt index 61b42daaf3..c302639fbb 100644 --- a/tests/classes/property_override_protected_protected.phpt +++ b/tests/classes/property_override_protected_protected.phpt @@ -28,7 +28,7 @@ Redeclare inherited protected property as protected. $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p B::p B::p diff --git a/tests/classes/property_override_protected_public.phpt b/tests/classes/property_override_protected_public.phpt index fc6bed46f6..378003ba54 100644 --- a/tests/classes/property_override_protected_public.phpt +++ b/tests/classes/property_override_protected_public.phpt @@ -28,7 +28,7 @@ Redeclare inherited protected property as public. $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p B::p B::p diff --git a/tests/classes/property_override_publicStatic_publicStatic.phpt b/tests/classes/property_override_publicStatic_publicStatic.phpt index 7de7ece151..708d7fb479 100644 --- a/tests/classes/property_override_publicStatic_publicStatic.phpt +++ b/tests/classes/property_override_publicStatic_publicStatic.phpt @@ -26,7 +26,7 @@ Redeclare inherited public static property as public static. B::showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p (static) diff --git a/tests/classes/property_override_public_public.phpt b/tests/classes/property_override_public_public.phpt index 036f5a197a..83d3929702 100644 --- a/tests/classes/property_override_public_public.phpt +++ b/tests/classes/property_override_public_public.phpt @@ -28,7 +28,7 @@ Redeclare inherited public property as public. $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p B::p B::p diff --git a/tests/classes/static_properties_001.phpt b/tests/classes/static_properties_001.phpt index e14d87d7ab..e5e545fa22 100644 --- a/tests/classes/static_properties_001.phpt +++ b/tests/classes/static_properties_001.phpt @@ -15,7 +15,7 @@ var_dump(test::$ar); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(0) { } array(1) { diff --git a/tests/classes/static_properties_004.phpt b/tests/classes/static_properties_004.phpt index 265553f86d..42860c3301 100644 --- a/tests/classes/static_properties_004.phpt +++ b/tests/classes/static_properties_004.phpt @@ -1,5 +1,5 @@ --TEST-- -Inherited static properties can be separated from their reference set. +Inherited static properties cannot be separated from their reference set. --FILE-- <?php class C { public static $p = 'original'; } @@ -13,13 +13,13 @@ echo "\nChanging one changes all the others:\n"; D::$p = 'changed.all'; var_dump(C::$p, D::$p, E::$p); -echo "\nBut because this is implemented using PHP references, the reference set can easily be split:\n"; +echo "\nReferences cannot be used to split the properties:\n"; $ref = 'changed.one'; D::$p =& $ref; var_dump(C::$p, D::$p, E::$p); ?> ==Done== ---EXPECTF-- +--EXPECT-- Inherited static properties refer to the same value across classes: string(8) "original" string(8) "original" @@ -30,8 +30,8 @@ string(11) "changed.all" string(11) "changed.all" string(11) "changed.all" -But because this is implemented using PHP references, the reference set can easily be split: -string(11) "changed.all" +References cannot be used to split the properties: +string(11) "changed.one" +string(11) "changed.one" string(11) "changed.one" -string(11) "changed.all" ==Done== diff --git a/tests/classes/static_properties_undeclared_isset.phpt b/tests/classes/static_properties_undeclared_isset.phpt index 83fb7711c5..c8097f6e10 100644 --- a/tests/classes/static_properties_undeclared_isset.phpt +++ b/tests/classes/static_properties_undeclared_isset.phpt @@ -5,5 +5,5 @@ Issetting a non-existent static property Class C {} var_dump(isset(C::$p)); ?> ---EXPECTF-- +--EXPECT-- bool(false) diff --git a/tests/classes/tostring_002.phpt b/tests/classes/tostring_002.phpt index 893611924d..7dda92339e 100644 --- a/tests/classes/tostring_002.phpt +++ b/tests/classes/tostring_002.phpt @@ -23,7 +23,7 @@ $o = new Test; ?> ====DONE==== ---EXPECTF-- +--EXPECT-- Hello ====DONE==== Hello diff --git a/tests/classes/tostring_004.phpt b/tests/classes/tostring_004.phpt index b6ec473709..907f7bc306 100644 --- a/tests/classes/tostring_004.phpt +++ b/tests/classes/tostring_004.phpt @@ -34,7 +34,7 @@ echo "\nTry 2:\n"; printf($obj . "\n"); ?> ---EXPECTF-- +--EXPECT-- Object with no __toString(): Try 1: Error: 4096 - Object of class stdClass could not be converted to string diff --git a/tests/classes/type_hinting_003.phpt b/tests/classes/type_hinting_003.phpt index 50de31e44b..fb788e3d9c 100644 --- a/tests/classes/type_hinting_003.phpt +++ b/tests/classes/type_hinting_003.phpt @@ -57,7 +57,7 @@ array(1) { int(25) } -Fatal error: Uncaught TypeError: Argument 1 passed to Test::f1() must be of the type array, integer given, called in %s on line %d and defined in %s:%d +Fatal error: Uncaught TypeError: Argument 1 passed to Test::f1() must be of the type array, int given, called in %s on line %d and defined in %s:%d Stack trace: #0 %s(%d): Test::f1(1) #1 {main} diff --git a/tests/classes/type_hinting_004.phpt b/tests/classes/type_hinting_004.phpt index 2e4d49070e..174664c02f 100644 --- a/tests/classes/type_hinting_004.phpt +++ b/tests/classes/type_hinting_004.phpt @@ -149,10 +149,10 @@ Ensure type hints are enforced for functions invoked as callbacks. ?> --EXPECTF-- ---> Type hints with callback function: -0: Argument 1 passed to f1() must be an instance of A, integer given%s(%d) +0: Argument 1 passed to f1() must be an instance of A, int given%s(%d) in f1; -0: Argument 1 passed to f2() must be an instance of A or null, integer given%s(%d) +0: Argument 1 passed to f2() must be an instance of A or null, int given%s(%d) in f2; in f2; @@ -160,10 +160,10 @@ in f2; ---> Type hints with callback static method: -0: Argument 1 passed to C::f1() must be an instance of A, integer given%s(%d) +0: Argument 1 passed to C::f1() must be an instance of A, int given%s(%d) in C::f1 (static); -0: Argument 1 passed to C::f2() must be an instance of A or null, integer given%s(%d) +0: Argument 1 passed to C::f2() must be an instance of A or null, int given%s(%d) in C::f2 (static); in C::f2 (static); @@ -171,10 +171,10 @@ in C::f2 (static); ---> Type hints with callback instance method: -0: Argument 1 passed to D::f1() must be an instance of A, integer given%s(%d) +0: Argument 1 passed to D::f1() must be an instance of A, int given%s(%d) in C::f1 (instance); -0: Argument 1 passed to D::f2() must be an instance of A or null, integer given%s(%d) +0: Argument 1 passed to D::f2() must be an instance of A or null, int given%s(%d) in C::f2 (instance); in C::f2 (instance); diff --git a/tests/classes/unset_properties.phpt b/tests/classes/unset_properties.phpt index 288c0f2df4..417542ddea 100644 --- a/tests/classes/unset_properties.phpt +++ b/tests/classes/unset_properties.phpt @@ -126,7 +126,7 @@ echo $o->getPrivateProperty(); echo "\n\n"; ?> ---EXPECTF-- +--EXPECT-- publicProperty set true __isset "publicProperty" diff --git a/tests/classes/visibility_000c.phpt b/tests/classes/visibility_000c.phpt index c651b05d75..d1a7c9f1e1 100644 --- a/tests/classes/visibility_000c.phpt +++ b/tests/classes/visibility_000c.phpt @@ -27,5 +27,5 @@ class fail extends same { echo "Done\n"; // shouldn't be displayed ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/tests/classes/visibility_001c.phpt b/tests/classes/visibility_001c.phpt index a9a5896695..956c6762df 100644 --- a/tests/classes/visibility_001c.phpt +++ b/tests/classes/visibility_001c.phpt @@ -27,5 +27,5 @@ class fail extends same { echo "Done\n"; // shouldn't be displayed ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/tests/classes/visibility_002c.phpt b/tests/classes/visibility_002c.phpt index 308c9057db..64560171cc 100644 --- a/tests/classes/visibility_002c.phpt +++ b/tests/classes/visibility_002c.phpt @@ -27,5 +27,5 @@ class fail extends same { echo "Done\n"; // shouldn't be displayed ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/tests/classes/visibility_003a.phpt b/tests/classes/visibility_003a.phpt index 176cc4a906..17f5b49eb9 100644 --- a/tests/classes/visibility_003a.phpt +++ b/tests/classes/visibility_003a.phpt @@ -27,5 +27,5 @@ class fail extends same { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/tests/classes/visibility_003c.phpt b/tests/classes/visibility_003c.phpt index 27e2bc2bf5..7ac3239f59 100644 --- a/tests/classes/visibility_003c.phpt +++ b/tests/classes/visibility_003c.phpt @@ -27,5 +27,5 @@ class fail extends same { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/tests/classes/visibility_004a.phpt b/tests/classes/visibility_004a.phpt index 717f971999..a6acb40569 100644 --- a/tests/classes/visibility_004a.phpt +++ b/tests/classes/visibility_004a.phpt @@ -27,5 +27,5 @@ class fail extends same { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/tests/classes/visibility_004b.phpt b/tests/classes/visibility_004b.phpt index 1ede33450a..9e416fc6ae 100644 --- a/tests/classes/visibility_004b.phpt +++ b/tests/classes/visibility_004b.phpt @@ -27,5 +27,5 @@ class fail extends same { echo "Done\n"; // shouldn't be displayed ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/tests/classes/visibility_004c.phpt b/tests/classes/visibility_004c.phpt index e4f94a3567..abe25b1b39 100644 --- a/tests/classes/visibility_004c.phpt +++ b/tests/classes/visibility_004c.phpt @@ -27,5 +27,5 @@ class fail extends same { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/tests/func/bug64523.phpt b/tests/func/bug64523.phpt index e0092ada64..88adc43959 100644 --- a/tests/func/bug64523.phpt +++ b/tests/func/bug64523.phpt @@ -6,5 +6,5 @@ error_reporting = E_ALL ^ E_NOTICE ^ E_STRICT ^ E_DEPRECATED <?php echo ini_get('error_reporting'); ?> ---EXPECTF-- +--EXPECT-- 22519 diff --git a/tests/lang/038.phpt b/tests/lang/038.phpt index 195050b2fb..8e06bdd354 100644 --- a/tests/lang/038.phpt +++ b/tests/lang/038.phpt @@ -35,7 +35,7 @@ catch (Exception $e) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- string(15) "Error2Exception" string(5) "fopen" ===DONE=== diff --git a/tests/lang/039.phpt b/tests/lang/039.phpt index aa4b591649..b353e0fa4b 100644 --- a/tests/lang/039.phpt +++ b/tests/lang/039.phpt @@ -40,6 +40,6 @@ catch (Exception $e) ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Catchable ===DONE=== diff --git a/tests/lang/bug24054.phpt b/tests/lang/bug24054.phpt index 70916ecdf2..fd9a9bf0c7 100644 --- a/tests/lang/bug24054.phpt +++ b/tests/lang/bug24054.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #24054 (Assignment operator *= broken) --FILE-- -<?php // $Id$ +<?php define('LONG_MAX', is_int(5000000000)? 9223372036854775807 : 0x7FFFFFFF); define('LONG_MIN', -LONG_MAX - 1); diff --git a/tests/lang/bug24658.phpt b/tests/lang/bug24658.phpt index b089569d91..a53457d5d9 100644 --- a/tests/lang/bug24658.phpt +++ b/tests/lang/bug24658.phpt @@ -53,7 +53,7 @@ int(2) object(foo)#%d (0) { } -Fatal error: Uncaught TypeError: Argument 1 passed to typehint() must be an instance of foo, integer given in %s:%d +Fatal error: Uncaught TypeError: Argument 1 passed to typehint() must be an instance of foo, int given in %s:%d Stack trace: #0 [internal function]: typehint(1, 1) #1 %s(%d): array_walk(Array, 'typehint') diff --git a/tests/lang/bug35382.phpt b/tests/lang/bug35382.phpt index 69190d4c95..c2295c3440 100644 --- a/tests/lang/bug35382.phpt +++ b/tests/lang/bug35382.phpt @@ -5,5 +5,5 @@ Bug #35382 (Comment in end of file produces fatal error) eval("echo 'Hello'; // comment"); echo " World"; //last line comment ---EXPECTF-- +--EXPECT-- Hello World diff --git a/tests/lang/bug73172.phpt b/tests/lang/bug73172.phpt index 369d293cac..34435e5058 100644 --- a/tests/lang/bug73172.phpt +++ b/tests/lang/bug73172.phpt @@ -9,5 +9,5 @@ include dirname(__FILE__) . DIRECTORY_SEPARATOR . "bug73172.inc"; ?> ==DONE== ---EXPECTF-- +--EXPECT-- ==DONE== diff --git a/tests/lang/compare_objects_basic2.phpt b/tests/lang/compare_objects_basic2.phpt index 266d905253..ccd3a001fc 100644 --- a/tests/lang/compare_objects_basic2.phpt +++ b/tests/lang/compare_objects_basic2.phpt @@ -17,7 +17,7 @@ $obj2 = new DateTime(("2009-02-12 12:47:41 GMT")); var_dump($obj1 == $obj2); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Simple test comparing two objects with different compare callback handler bool(false) ===DONE=== diff --git a/tests/lang/engine_assignExecutionOrder_001.phpt b/tests/lang/engine_assignExecutionOrder_001.phpt index dcfbb50e19..a70e3eee93 100644 --- a/tests/lang/engine_assignExecutionOrder_001.phpt +++ b/tests/lang/engine_assignExecutionOrder_001.phpt @@ -75,7 +75,7 @@ var_dump(C::$string); Order with local assignment: in f() in g() -%string|unicode%(14) "assigned value" +string(14) "assigned value" Order with array assignment: @@ -83,7 +83,7 @@ in f() in g() array(1) { ["name"]=> - %string|unicode%(14) "assigned value" + string(14) "assigned value" } @@ -92,7 +92,7 @@ in f() in g() object(stdClass)#%d (1) { ["assigned value"]=> - %string|unicode%(14) "assigned value" + string(14) "assigned value" } @@ -105,7 +105,7 @@ object(stdClass)#%d (1) { ["o2"]=> object(stdClass)#%d (1) { ["assigned value"]=> - %string|unicode%(14) "assigned value" + string(14) "assigned value" } } } @@ -118,7 +118,7 @@ object(stdClass)#%d (1) { ["a"]=> array(1) { ["assigned value"]=> - %string|unicode%(14) "assigned value" + string(14) "assigned value" } } @@ -126,7 +126,7 @@ object(stdClass)#%d (1) { Order with static property assignment: in f() in g() -%string|unicode%(14) "assigned value" +string(14) "assigned value" Order with static array property assignment: @@ -134,17 +134,17 @@ in f() in g() array(1) { ["name"]=> - %string|unicode%(14) "assigned value" + string(14) "assigned value" } Order with indexed string assignment: in getOffset() in newChar() -%string|unicode%(5) "jello" +string(5) "jello" Order with static string property assignment: in getOffset() in newChar() -%string|unicode%(5) "jello" +string(5) "jello" diff --git a/tests/lang/engine_assignExecutionOrder_007.phpt b/tests/lang/engine_assignExecutionOrder_007.phpt index c79d34424d..14a2a812b1 100644 --- a/tests/lang/engine_assignExecutionOrder_007.phpt +++ b/tests/lang/engine_assignExecutionOrder_007.phpt @@ -11,7 +11,7 @@ $o->a = new $a[$i=2][++$i]; $o->a->b = new $a[$i=2][++$i]; print_r($o); ?> ---EXPECTF-- +--EXPECT-- Array ( [2] => Array diff --git a/tests/lang/engine_assignExecutionOrder_008.phpt b/tests/lang/engine_assignExecutionOrder_008.phpt index 1333bcda8a..be9b3423c8 100644 --- a/tests/lang/engine_assignExecutionOrder_008.phpt +++ b/tests/lang/engine_assignExecutionOrder_008.phpt @@ -2,7 +2,6 @@ Ensure by value assignments leave temporaries on the stack, for all sorts of assignees. --FILE-- <?php -error_reporting(E_ALL & ~E_STRICT); function f() { return 0; } $a[0][1] = 'good'; diff --git a/tests/lang/engine_assignExecutionOrder_009.phpt b/tests/lang/engine_assignExecutionOrder_009.phpt index 9a9b904d42..5401ecc287 100644 --- a/tests/lang/engine_assignExecutionOrder_009.phpt +++ b/tests/lang/engine_assignExecutionOrder_009.phpt @@ -22,7 +22,7 @@ var_dump($a[$i=1][++$i] <= $a[++$i][++$i]); var_dump($a[$i=1][++$i] > $a[++$i][++$i]); var_dump($a[$i=1][++$i] >= $a[++$i][++$i]); ?> ---EXPECTF-- +--EXPECT-- Function call args: f(0) f(1) bool(true) f(0) f(1) bool(true) diff --git a/tests/lang/foreachLoop.010.phpt b/tests/lang/foreachLoop.010.phpt index b1eb231bfa..e114e839b9 100644 --- a/tests/lang/foreachLoop.010.phpt +++ b/tests/lang/foreachLoop.010.phpt @@ -34,7 +34,7 @@ foreach ($a as $v) { } ?> ---EXPECTF-- +--EXPECT-- int(1) int(2) int(3) diff --git a/tests/lang/foreachLoop.011.phpt b/tests/lang/foreachLoop.011.phpt index 089caaa9cf..b1048fa9a2 100644 --- a/tests/lang/foreachLoop.011.phpt +++ b/tests/lang/foreachLoop.011.phpt @@ -21,7 +21,7 @@ foreach ($a as $v) { } ?> ---EXPECTF-- +--EXPECT-- Change from array to non iterable: int(1) int(2) diff --git a/tests/lang/foreachLoop.012.phpt b/tests/lang/foreachLoop.012.phpt index 54968a6aae..4d7beeba4f 100644 --- a/tests/lang/foreachLoop.012.phpt +++ b/tests/lang/foreachLoop.012.phpt @@ -68,7 +68,7 @@ withRefValue(3, $transform); withRefValue(4, $transform); ?> ---EXPECTF-- +--EXPECT-- Popping elements off end of an unreferenced array ---( Array with 1 element(s): )--- --> State of array before loop: diff --git a/tests/lang/foreachLoop.013.phpt b/tests/lang/foreachLoop.013.phpt index 31b5717311..acc197f86f 100644 --- a/tests/lang/foreachLoop.013.phpt +++ b/tests/lang/foreachLoop.013.phpt @@ -487,18 +487,21 @@ array(3) { } --> Do loop: iteration 0: $k=0; $v=v.0 - iteration 1: $k=3; $v=v.2 + iteration 1: $k=2; $v=v.1 + iteration 2: $k=4; $v=v.2 --> State of array after loop: -array(5) { +array(6) { [0]=> - string(5) "new.1" + string(5) "new.2" [1]=> - string(5) "new.0" + string(5) "new.1" [2]=> - string(3) "v.0" + string(5) "new.0" [3]=> - string(3) "v.1" + string(3) "v.0" [4]=> + string(3) "v.1" + [5]=> &string(3) "v.2" } @@ -516,19 +519,25 @@ array(4) { } --> Do loop: iteration 0: $k=0; $v=v.0 - iteration 1: $k=4; $v=v.3 + iteration 1: $k=2; $v=v.1 + iteration 2: $k=4; $v=v.2 + iteration 3: $k=6; $v=v.3 --> State of array after loop: -array(6) { +array(8) { [0]=> - string(5) "new.1" + string(5) "new.3" [1]=> - string(5) "new.0" + string(5) "new.2" [2]=> - string(3) "v.0" + string(5) "new.1" [3]=> - string(3) "v.1" + string(5) "new.0" [4]=> - string(3) "v.2" + string(3) "v.0" [5]=> + string(3) "v.1" + [6]=> + string(3) "v.2" + [7]=> &string(3) "v.3" } diff --git a/tests/lang/foreachLoop.014.phpt b/tests/lang/foreachLoop.014.phpt index 8356b0d228..9db3470e9c 100644 --- a/tests/lang/foreachLoop.014.phpt +++ b/tests/lang/foreachLoop.014.phpt @@ -70,7 +70,7 @@ withRefValue(3, $transform); withRefValue(4, $transform); ?> ---EXPECTF-- +--EXPECT-- Popping elements off end of a referenced array ---( Array with 1 element(s): )--- --> State of referenced array before loop: diff --git a/tests/lang/foreachLoop.015.phpt b/tests/lang/foreachLoop.015.phpt index 8a121bc052..ef5d030cd0 100644 --- a/tests/lang/foreachLoop.015.phpt +++ b/tests/lang/foreachLoop.015.phpt @@ -489,18 +489,21 @@ array(3) { } --> Do loop: iteration 0: $k=0; $v=v.0 - iteration 1: $k=3; $v=v.2 + iteration 1: $k=2; $v=v.1 + iteration 2: $k=4; $v=v.2 --> State of array after loop: -array(5) { +array(6) { [0]=> - string(5) "new.1" + string(5) "new.2" [1]=> - string(5) "new.0" + string(5) "new.1" [2]=> - string(3) "v.0" + string(5) "new.0" [3]=> - string(3) "v.1" + string(3) "v.0" [4]=> + string(3) "v.1" + [5]=> &string(3) "v.2" } @@ -518,19 +521,25 @@ array(4) { } --> Do loop: iteration 0: $k=0; $v=v.0 - iteration 1: $k=4; $v=v.3 + iteration 1: $k=2; $v=v.1 + iteration 2: $k=4; $v=v.2 + iteration 3: $k=6; $v=v.3 --> State of array after loop: -array(6) { +array(8) { [0]=> - string(5) "new.1" + string(5) "new.3" [1]=> - string(5) "new.0" + string(5) "new.2" [2]=> - string(3) "v.0" + string(5) "new.1" [3]=> - string(3) "v.1" + string(5) "new.0" [4]=> - string(3) "v.2" + string(3) "v.0" [5]=> + string(3) "v.1" + [6]=> + string(3) "v.2" + [7]=> &string(3) "v.3" } diff --git a/tests/lang/foreachLoop.016.phpt b/tests/lang/foreachLoop.016.phpt index f50d4aaa1c..00deb5f1db 100644 --- a/tests/lang/foreachLoop.016.phpt +++ b/tests/lang/foreachLoop.016.phpt @@ -2,7 +2,6 @@ Ensure foreach splits the iterated entity from its cow reference set, for all sorts of iterated entities. --FILE-- <?php - error_reporting(E_ALL & ~E_STRICT); echo "\n" . '$a' . "\n"; $b = $a = array('original'); diff --git a/tests/lang/foreachLoop.017.phpt b/tests/lang/foreachLoop.017.phpt index e791bf0fef..d68a82cc4c 100644 --- a/tests/lang/foreachLoop.017.phpt +++ b/tests/lang/foreachLoop.017.phpt @@ -6,6 +6,6 @@ $a = array ( "\x90" => 10 ); foreach ($a as $val=>$key) echo $key; echo "\nDone\n"; ?> ---EXPECTF-- +--EXPECT-- 10 Done diff --git a/tests/lang/foreachLoopIteratorAggregate.002.phpt b/tests/lang/foreachLoopIteratorAggregate.002.phpt index 81894a75b2..d4b8d2f2da 100644 --- a/tests/lang/foreachLoopIteratorAggregate.002.phpt +++ b/tests/lang/foreachLoopIteratorAggregate.002.phpt @@ -45,7 +45,7 @@ f("bad4"); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- 30: Objects returned by bad1::getIterator() must be traversable or implement interface Iterator 30: Objects returned by bad2::getIterator() must be traversable or implement interface Iterator 30: Objects returned by bad3::getIterator() must be traversable or implement interface Iterator diff --git a/tests/lang/foreachLoopIteratorAggregate.003.phpt b/tests/lang/foreachLoopIteratorAggregate.003.phpt index b2f853dd1a..adc8fe5351 100644 --- a/tests/lang/foreachLoopIteratorAggregate.003.phpt +++ b/tests/lang/foreachLoopIteratorAggregate.003.phpt @@ -73,7 +73,7 @@ foreach (new A3 as $k=>$v) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- -----( A1: )----- --> EnglishMealIterator::rewind (0) --> EnglishMealIterator::valid (0) diff --git a/tests/lang/foreachLoopObjects.001.phpt b/tests/lang/foreachLoopObjects.001.phpt index 36bc1d9925..7e8a40438e 100644 --- a/tests/lang/foreachLoopObjects.001.phpt +++ b/tests/lang/foreachLoopObjects.001.phpt @@ -34,7 +34,7 @@ foreach (new C as $k => $v) { echo "\nCheck key and value after the loop.\n"; var_dump($k, $v); ?> ---EXPECTF-- +--EXPECT-- Simple loop. string(10) "Original a" string(10) "Original b" diff --git a/tests/lang/func_get_arg.005.phpt b/tests/lang/func_get_arg.005.phpt index 0d52ab8764..5dd5468721 100644 --- a/tests/lang/func_get_arg.005.phpt +++ b/tests/lang/func_get_arg.005.phpt @@ -14,6 +14,6 @@ $a = "original.a"; $ref =& $a; refVal($a); ?> ---EXPECTF-- +--EXPECT-- string(10) "original.a" string(10) "original.a" diff --git a/tests/lang/func_get_arg_variation.phpt b/tests/lang/func_get_arg_variation.phpt index b0a2a57ff3..741b6604c0 100644 --- a/tests/lang/func_get_arg_variation.phpt +++ b/tests/lang/func_get_arg_variation.phpt @@ -20,7 +20,7 @@ Warning: func_get_arg() expects exactly 1 parameter, 0 given in %s on line %d Warning: func_get_arg() expects exactly 1 parameter, 2 given in %s on line %d -Warning: func_get_arg() expects parameter 1 to be integer, string given in %s on line %d +Warning: func_get_arg() expects parameter 1 to be int, string given in %s on line %d Warning: func_get_arg(): The argument number should be >= 0 in %s on line %d diff --git a/tests/lang/func_get_args.004.phpt b/tests/lang/func_get_args.004.phpt index f6ed974d86..6e98c763b2 100644 --- a/tests/lang/func_get_args.004.phpt +++ b/tests/lang/func_get_args.004.phpt @@ -29,7 +29,7 @@ $b = 'original.b'; refVal($b, $b); var_dump($b); ?> ---EXPECTF-- +--EXPECT-- -- Val, Ref -- string(10) "original.a" string(10) "original.a" diff --git a/tests/lang/func_num_args.004.phpt b/tests/lang/func_num_args.004.phpt index 412e65d019..7924a85a68 100644 --- a/tests/lang/func_num_args.004.phpt +++ b/tests/lang/func_num_args.004.phpt @@ -29,7 +29,7 @@ $b = 'original.b'; refVal($b, $b); var_dump($b); ?> ---EXPECTF-- +--EXPECT-- -- Val, Ref -- string(10) "original.a" string(10) "original.a" diff --git a/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt b/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt index 5e7dfb4e2a..db9c5be060 100644 --- a/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt +++ b/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt @@ -1,9 +1,5 @@ --TEST-- Test << operator : various numbers as strings ---SKIPIF-- -<?php -if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); -?> --FILE-- <?php diff --git a/tests/lang/operators/operator_gt_variation.phpt b/tests/lang/operators/operator_gt_variation.phpt index d40062435d..4c56ec5e6a 100644 --- a/tests/lang/operators/operator_gt_variation.phpt +++ b/tests/lang/operators/operator_gt_variation.phpt @@ -1,9 +1,5 @@ --TEST-- Test > operator : max int 32bit range ---SKIPIF-- -<?php -if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); -?> --FILE-- <?php diff --git a/tests/lang/operators/operator_identical_recusion-01.phpt b/tests/lang/operators/operator_identical_recusion-01.phpt new file mode 100644 index 0000000000..70a7605bae --- /dev/null +++ b/tests/lang/operators/operator_identical_recusion-01.phpt @@ -0,0 +1,10 @@ +--TEST-- +Test === operator : False recursion detection +--FILE-- +<?php +$n = 0; +$a = [[$n]]; +$b = [&$a]; +var_dump($a === $b); +--EXPECT-- +bool(false) diff --git a/tests/lang/operators/operator_lt_variation.phpt b/tests/lang/operators/operator_lt_variation.phpt index 47dab39c99..18a6631665 100644 --- a/tests/lang/operators/operator_lt_variation.phpt +++ b/tests/lang/operators/operator_lt_variation.phpt @@ -1,9 +1,5 @@ --TEST-- Test < operator : max int 32bit range ---SKIPIF-- -<?php -if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); -?> --FILE-- <?php diff --git a/tests/lang/passByReference_008.phpt b/tests/lang/passByReference_008.phpt index 6ac5c78d63..5042b72e4b 100644 --- a/tests/lang/passByReference_008.phpt +++ b/tests/lang/passByReference_008.phpt @@ -25,7 +25,7 @@ $b = 'original.b'; refVal($b, $b); var_dump($b); ?> ---EXPECTF-- +--EXPECT-- -- Val, Ref -- string(10) "original.a" string(10) "original.a" diff --git a/tests/lang/passByReference_009.phpt b/tests/lang/passByReference_009.phpt index 78e22f5f62..7b723d552e 100644 --- a/tests/lang/passByReference_009.phpt +++ b/tests/lang/passByReference_009.phpt @@ -20,5 +20,5 @@ Assignement as argument foo2($x, $x, $x = 1); echo $x; // 2 ?> ---EXPECTF-- +--EXPECT-- 1012 diff --git a/tests/lang/passByReference_012.phpt b/tests/lang/passByReference_012.phpt index f3e943e284..3bc60a484e 100644 --- a/tests/lang/passByReference_012.phpt +++ b/tests/lang/passByReference_012.phpt @@ -2,8 +2,6 @@ Test pass by reference semantics --FILE-- <?php -error_reporting(E_ALL | E_STRICT | E_NOTICE); - // Simplified array_shift_variation5.phpt // Showing warning: // "Only variables should be passed by reference in %s on line %d" diff --git a/tests/lang/returnByReference.006.phpt b/tests/lang/returnByReference.006.phpt index d2c7041be8..d7a6c580a0 100644 --- a/tests/lang/returnByReference.006.phpt +++ b/tests/lang/returnByReference.006.phpt @@ -1,7 +1,5 @@ --TEST-- Returning a reference from a function via another function ---INI-- -error_reporting = E_ALL & ~E_STRICT --FILE-- <?php function returnConstantByValue() { diff --git a/tests/lang/returnByReference.007.phpt b/tests/lang/returnByReference.007.phpt index 8cc32b51f1..b38dfa0cb1 100644 --- a/tests/lang/returnByReference.007.phpt +++ b/tests/lang/returnByReference.007.phpt @@ -1,7 +1,5 @@ --TEST-- Returning a reference from a static method via another static method ---INI-- -error_reporting = E_ALL & ~E_STRICT --FILE-- <?php class C { diff --git a/tests/lang/returnByReference.008.phpt b/tests/lang/returnByReference.008.phpt index 228ed8a7a7..360df577c2 100644 --- a/tests/lang/returnByReference.008.phpt +++ b/tests/lang/returnByReference.008.phpt @@ -1,7 +1,5 @@ --TEST-- Returning a reference from a non-static method via another non-static method ---INI-- -error_reporting = E_ALL & ~E_STRICT --FILE-- <?php class C { diff --git a/tests/lang/static_variation_001.phpt b/tests/lang/static_variation_001.phpt index e7727a3a72..d8ebfd2ea1 100644 --- a/tests/lang/static_variation_001.phpt +++ b/tests/lang/static_variation_001.phpt @@ -45,7 +45,7 @@ eval(' function f3() { static $c = array(1,2,3); var_dump($c); }'); f3(); ?> ---EXPECTF-- +--EXPECT-- array(3) { [0]=> int(1) diff --git a/tests/lang/static_variation_002.phpt b/tests/lang/static_variation_002.phpt index 9a33b9d040..abb359c1d4 100644 --- a/tests/lang/static_variation_002.phpt +++ b/tests/lang/static_variation_002.phpt @@ -33,7 +33,7 @@ $e = new E; $e->f(); ?> ---EXPECTF-- +--EXPECT-- array(3) { [0]=> int(1) diff --git a/tests/lang/string/unicode_escape_legacy.phpt b/tests/lang/string/unicode_escape_legacy.phpt index f17d160dd1..c5cac68669 100644 --- a/tests/lang/string/unicode_escape_legacy.phpt +++ b/tests/lang/string/unicode_escape_legacy.phpt @@ -7,7 +7,7 @@ Tolerated Unicode escape sequences: Legacy compatibility var_dump("\u"); var_dump("\u202e"); var_dump("\ufoobar"); ---EXPECTF-- +--EXPECT-- string(2) "\u" string(6) "\u202e" string(8) "\ufoobar" diff --git a/tests/lang/string_decimals_001.phpt b/tests/lang/string_decimals_001.phpt index 5ba3c974fa..2bd3ef62a2 100644 --- a/tests/lang/string_decimals_001.phpt +++ b/tests/lang/string_decimals_001.phpt @@ -16,7 +16,7 @@ test("9.9."); test("9.9.9"); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- --> Testing ..9: int(0) float(0) diff --git a/tests/output/ob_010.phpt b/tests/output/ob_010.phpt index 7e362cabe1..c5581a860e 100644 --- a/tests/output/ob_010.phpt +++ b/tests/output/ob_010.phpt @@ -9,5 +9,5 @@ function obh($s) ob_start("obh"); echo "foo\n"; ?> ---EXPECTF-- +--EXPECT-- foo diff --git a/tests/output/ob_get_clean_basic_001.phpt b/tests/output/ob_get_clean_basic_001.phpt index 2f55af4101..2ccf490485 100644 --- a/tests/output/ob_get_clean_basic_001.phpt +++ b/tests/output/ob_get_clean_basic_001.phpt @@ -13,6 +13,6 @@ ob_start(); echo "Hello World"; var_dump(ob_get_clean()); ?> ---EXPECTF-- +--EXPECT-- bool(false) string(11) "Hello World" diff --git a/tests/output/ob_get_contents_basic_001.phpt b/tests/output/ob_get_contents_basic_001.phpt index 3b9593339b..cdf301281e 100644 --- a/tests/output/ob_get_contents_basic_001.phpt +++ b/tests/output/ob_get_contents_basic_001.phpt @@ -49,7 +49,7 @@ var_dump(ob_get_contents()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ob_get_contents() : basic functionality *** -- Testing ob_get_contents() function with Zero arguments -- diff --git a/tests/output/ob_get_length_basic_001.phpt b/tests/output/ob_get_length_basic_001.phpt index 43fafcbbf9..892d106719 100644 --- a/tests/output/ob_get_length_basic_001.phpt +++ b/tests/output/ob_get_length_basic_001.phpt @@ -25,7 +25,7 @@ ob_end_flush(); echo "No output buffers\n"; var_dump(ob_get_length()); ?> ---EXPECTF-- +--EXPECT-- No output buffers bool(false) int(0) diff --git a/tests/output/ob_implicit_flush_basic_001.phpt b/tests/output/ob_implicit_flush_basic_001.phpt index 3f06715cac..780eb6dfbb 100644 --- a/tests/output/ob_implicit_flush_basic_001.phpt +++ b/tests/output/ob_implicit_flush_basic_001.phpt @@ -16,7 +16,7 @@ var_dump(ob_implicit_flush(false)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ob_implicit_flush() : check return value *** NULL NULL diff --git a/tests/output/ob_implicit_flush_basic_002.phpt b/tests/output/ob_implicit_flush_basic_002.phpt index e301beb23c..37d10ba640 100644 --- a/tests/output/ob_implicit_flush_basic_002.phpt +++ b/tests/output/ob_implicit_flush_basic_002.phpt @@ -24,6 +24,6 @@ ob_end_clean(); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ob_implicit_flush() : ensure implicit flushing does not apply to user buffers. *** Done diff --git a/tests/output/ob_implicit_flush_variation_001.phpt b/tests/output/ob_implicit_flush_variation_001.phpt index cc4cfa2eb1..d6d3a45e01 100644 --- a/tests/output/ob_implicit_flush_variation_001.phpt +++ b/tests/output/ob_implicit_flush_variation_001.phpt @@ -122,19 +122,19 @@ NULL NULL --empty array-- -Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, array given, %s(97) +Error: 2 - ob_implicit_flush() expects parameter 1 to be int, array given, %s(97) NULL --int indexed array-- -Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, array given, %s(97) +Error: 2 - ob_implicit_flush() expects parameter 1 to be int, array given, %s(97) NULL --associative array-- -Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, array given, %s(97) +Error: 2 - ob_implicit_flush() expects parameter 1 to be int, array given, %s(97) NULL --nested arrays-- -Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, array given, %s(97) +Error: 2 - ob_implicit_flush() expects parameter 1 to be int, array given, %s(97) NULL --uppercase NULL-- @@ -156,35 +156,35 @@ NULL NULL --empty string DQ-- -Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, string given, %s(97) +Error: 2 - ob_implicit_flush() expects parameter 1 to be int, string given, %s(97) NULL --empty string SQ-- -Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, string given, %s(97) +Error: 2 - ob_implicit_flush() expects parameter 1 to be int, string given, %s(97) NULL --string DQ-- -Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, string given, %s(97) +Error: 2 - ob_implicit_flush() expects parameter 1 to be int, string given, %s(97) NULL --string SQ-- -Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, string given, %s(97) +Error: 2 - ob_implicit_flush() expects parameter 1 to be int, string given, %s(97) NULL --mixed case string-- -Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, string given, %s(97) +Error: 2 - ob_implicit_flush() expects parameter 1 to be int, string given, %s(97) NULL --heredoc-- -Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, string given, %s(97) +Error: 2 - ob_implicit_flush() expects parameter 1 to be int, string given, %s(97) NULL --instance of classWithToString-- -Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, object given, %s(97) +Error: 2 - ob_implicit_flush() expects parameter 1 to be int, object given, %s(97) NULL --instance of classWithoutToString-- -Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, object given, %s(97) +Error: 2 - ob_implicit_flush() expects parameter 1 to be int, object given, %s(97) NULL --undefined var-- diff --git a/tests/output/ob_start_basic_002.phpt b/tests/output/ob_start_basic_002.phpt index eac69aa8a6..2412ae57f0 100644 --- a/tests/output/ob_start_basic_002.phpt +++ b/tests/output/ob_start_basic_002.phpt @@ -36,7 +36,7 @@ foreach ($callbacks as $callback) { ?> ==DONE== ---EXPECTF-- +--EXPECT-- --> Use callback 'return_empty_string': diff --git a/tests/output/ob_start_basic_003.phpt b/tests/output/ob_start_basic_003.phpt index 6fd7fe798c..23f0bfb274 100644 --- a/tests/output/ob_start_basic_003.phpt +++ b/tests/output/ob_start_basic_003.phpt @@ -14,5 +14,5 @@ ob_end_flush(); echo "done (you shouldn't see this)"; ?> ---EXPECTF-- +--EXPECT-- I have stolen your output diff --git a/tests/output/ob_start_basic_004.phpt b/tests/output/ob_start_basic_004.phpt index c942768432..ba75c16de9 100644 --- a/tests/output/ob_start_basic_004.phpt +++ b/tests/output/ob_start_basic_004.phpt @@ -33,7 +33,7 @@ for ($cs=-1; $cs<10; $cs++) { } ?> ---EXPECTF-- +--EXPECT-- ----( chunk_size: -1, output append size: 1 )---- f[call:1; len:8]12345678 diff --git a/tests/output/ob_start_basic_unerasable_001.phpt b/tests/output/ob_start_basic_unerasable_001.phpt index 229ba084cf..e97fd45420 100644 --- a/tests/output/ob_start_basic_unerasable_001.phpt +++ b/tests/output/ob_start_basic_unerasable_001.phpt @@ -15,7 +15,7 @@ $str = ob_get_contents(); var_dump($str); ?> ==DONE== ---EXPECTF-- +--EXPECT-- [callback:1]This call will obtain the content: string(35) "This call will obtain the content: " diff --git a/tests/output/ob_start_error_001.phpt b/tests/output/ob_start_error_001.phpt index 9a3dce003c..29288e2028 100644 --- a/tests/output/ob_start_error_001.phpt +++ b/tests/output/ob_start_error_001.phpt @@ -44,10 +44,10 @@ bool(false) - Arg 2 wrong type -Warning: ob_start() expects parameter 2 to be integer, string given in %s on line 23 +Warning: ob_start() expects parameter 2 to be int, string given in %s on line 23 NULL - Arg 3 wrong type -Warning: ob_start() expects parameter 3 to be integer, string given in %s on line 26 +Warning: ob_start() expects parameter 3 to be int, string given in %s on line 26 NULL diff --git a/tests/run-test/bug75042-2.phpt b/tests/run-test/bug75042-2.phpt index 25f6d08e61..2c5718a9a0 100644 --- a/tests/run-test/bug75042-2.phpt +++ b/tests/run-test/bug75042-2.phpt @@ -1,15 +1,10 @@ --TEST-- phpt EXTENSIONS directive with static module ---SKIPIF-- -<?php -$php = getenv('TEST_PHP_EXECUTABLE'); -if (false === stripos(`$php -n -m`, 'spl')) { - die('skip spl is NOT built static'); -} --EXTENSIONS-- SPL --FILE-- <?php var_dump(extension_loaded('spl')); +?> --EXPECT-- bool(true) diff --git a/tests/run-test/bug75042-3.phpt b/tests/run-test/bug75042-3.phpt index 0e46d1e40f..dc2f5a0f55 100644 --- a/tests/run-test/bug75042-3.phpt +++ b/tests/run-test/bug75042-3.phpt @@ -1,5 +1,9 @@ --TEST-- phpt EXTENSIONS directive with nonexistent shared module +--INI-- +error_log= +display_startup_errors=1 +display_errors=1 --EXTENSIONS-- nonexistentsharedmodule --FILE-- diff --git a/tests/run-test/test009.phpt b/tests/run-test/test009.phpt index 650686f690..f3d0491e7c 100644 --- a/tests/run-test/test009.phpt +++ b/tests/run-test/test009.phpt @@ -6,7 +6,7 @@ class Foo {} $foo = new Foo; print_r($foo); ?> ---EXPECTF-- +--EXPECT-- Foo Object ( ) diff --git a/tests/strings/offsets_chaining_1.phpt b/tests/strings/offsets_chaining_1.phpt index e701dec8be..0c3c0074b1 100644 --- a/tests/strings/offsets_chaining_1.phpt +++ b/tests/strings/offsets_chaining_1.phpt @@ -7,5 +7,5 @@ error_reporting=E_ALL | E_DEPRECATED $string = "foobar"; var_dump($string[0][0][0][0]); ?> ---EXPECTF-- +--EXPECT-- string(1) "f" diff --git a/tests/strings/offsets_chaining_2.phpt b/tests/strings/offsets_chaining_2.phpt index ba9039fd05..bbc170a6e6 100644 --- a/tests/strings/offsets_chaining_2.phpt +++ b/tests/strings/offsets_chaining_2.phpt @@ -7,5 +7,5 @@ error_reporting=E_ALL | E_DEPRECATED $string = "foobar"; var_dump($string{0}{0}[0][0]); ?> ---EXPECTF-- +--EXPECT-- string(1) "f" diff --git a/tests/strings/offsets_chaining_3.phpt b/tests/strings/offsets_chaining_3.phpt index 689436d13c..fc11b8d797 100644 --- a/tests/strings/offsets_chaining_3.phpt +++ b/tests/strings/offsets_chaining_3.phpt @@ -7,5 +7,5 @@ error_reporting=E_ALL | E_DEPRECATED $string = "foobar"; var_dump(isset($string[0][0][0][0])); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/tests/strings/offsets_chaining_4.phpt b/tests/strings/offsets_chaining_4.phpt index e5caa7862c..d1f3de26af 100644 --- a/tests/strings/offsets_chaining_4.phpt +++ b/tests/strings/offsets_chaining_4.phpt @@ -7,5 +7,5 @@ error_reporting=E_ALL | E_DEPRECATED $string = "foobar"; var_dump(isset($string{0}{0}[0][0])); ?> ---EXPECTF-- +--EXPECT-- bool(true) |