diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2018-10-15 04:33:09 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2018-10-15 04:33:09 +0200 |
| commit | d679f02295ea079338f029b7f5f4cb65b37f190c (patch) | |
| tree | 53c519e1f829913a54d9dcea004721a3714cea26 /Zend/tests | |
| parent | e84662c35cffaa95ead4322bfe9d61815c185722 (diff) | |
| download | php-git-d679f02295ea079338f029b7f5f4cb65b37f190c.tar.gz | |
Sync leading and final newlines in *.phpt sections
This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines in all
*.phpt sections.
According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.
C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."
Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.
[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
Diffstat (limited to 'Zend/tests')
399 files changed, 131 insertions, 511 deletions
diff --git a/Zend/tests/033.phpt b/Zend/tests/033.phpt index b506f9172e..a76a322ccf 100644 --- a/Zend/tests/033.phpt +++ b/Zend/tests/033.phpt @@ -17,7 +17,6 @@ $arr[][]->bar = 2; ?> --EXPECTF-- - Notice: Undefined variable: arr in %s on line %d Notice: Undefined variable: arr in %s on line %d diff --git a/Zend/tests/abstract-static.phpt b/Zend/tests/abstract-static.phpt index 1742d4b408..2f9bc9a1fd 100644 --- a/Zend/tests/abstract-static.phpt +++ b/Zend/tests/abstract-static.phpt @@ -9,5 +9,4 @@ abstract class TestClass ?> ===DONE=== --EXPECT-- - ===DONE=== diff --git a/Zend/tests/add_006.phpt b/Zend/tests/add_006.phpt index c1124e026c..2e7f76b4ee 100644 --- a/Zend/tests/add_006.phpt +++ b/Zend/tests/add_006.phpt @@ -38,7 +38,6 @@ var_dump($c); echo "Done\n"; ?> --EXPECTF-- - Warning: A non-numeric value encountered in %s on line %d int(75636) diff --git a/Zend/tests/add_007.phpt b/Zend/tests/add_007.phpt index 6d9af8a9f5..3b24a1c99c 100644 --- a/Zend/tests/add_007.phpt +++ b/Zend/tests/add_007.phpt @@ -19,7 +19,6 @@ var_dump($c); echo "Done\n"; ?> --EXPECTF-- - Warning: A non-numeric value encountered in %s on line %d Exception: Unsupported operand types diff --git a/Zend/tests/anon/001.phpt b/Zend/tests/anon/001.phpt index 75589550a8..65ba15148b 100644 --- a/Zend/tests/anon/001.phpt +++ b/Zend/tests/anon/001.phpt @@ -6,5 +6,3 @@ var_dump(new class{}); --EXPECTF-- object(class@%s)#%d (0) { } - - diff --git a/Zend/tests/anon/002.phpt b/Zend/tests/anon/002.phpt index fdb8915267..80a91eed78 100644 --- a/Zend/tests/anon/002.phpt +++ b/Zend/tests/anon/002.phpt @@ -18,4 +18,3 @@ var_dump($a instanceof A, $a instanceof B); --EXPECT-- bool(true) bool(true) - diff --git a/Zend/tests/anon/003.phpt b/Zend/tests/anon/003.phpt index ac023f43a5..7c95e86632 100644 --- a/Zend/tests/anon/003.phpt +++ b/Zend/tests/anon/003.phpt @@ -51,4 +51,3 @@ object(class@%s)#1 (1) { ["i"]=> int(10) } - diff --git a/Zend/tests/anon/006.phpt b/Zend/tests/anon/006.phpt index 2b8888c497..0be1c33317 100644 --- a/Zend/tests/anon/006.phpt +++ b/Zend/tests/anon/006.phpt @@ -12,4 +12,3 @@ namespace { --EXPECTF-- object(class@%s)#1 (0) { } - diff --git a/Zend/tests/anon/007.phpt b/Zend/tests/anon/007.phpt index 59d2441760..dbc86c593e 100644 --- a/Zend/tests/anon/007.phpt +++ b/Zend/tests/anon/007.phpt @@ -20,4 +20,3 @@ namespace lone { --EXPECTF-- object(class@%s)#2 (0) { } - diff --git a/Zend/tests/assert/expect_013.phpt b/Zend/tests/assert/expect_013.phpt index cf8fa1cd02..b5d037fea6 100644 --- a/Zend/tests/assert/expect_013.phpt +++ b/Zend/tests/assert/expect_013.phpt @@ -8,4 +8,4 @@ assert.exception=1 var_dump(assert(false)); ?> --EXPECT-- -bool(true)
\ No newline at end of file +bool(true) diff --git a/Zend/tests/assert/expect_014.phpt b/Zend/tests/assert/expect_014.phpt index 7cf4fb1931..def99402ec 100644 --- a/Zend/tests/assert/expect_014.phpt +++ b/Zend/tests/assert/expect_014.phpt @@ -9,4 +9,4 @@ assert(false); var_dump(true); ?> --EXPECT-- -bool(true)
\ No newline at end of file +bool(true) diff --git a/Zend/tests/bug26010.phpt b/Zend/tests/bug26010.phpt index a3c41faefc..9761700bb8 100644 --- a/Zend/tests/bug26010.phpt +++ b/Zend/tests/bug26010.phpt @@ -16,4 +16,3 @@ array(1) { ["public"]=> string(6) "public" } - diff --git a/Zend/tests/bug26696.phpt b/Zend/tests/bug26696.phpt index 62ceacda58..14083dfb9f 100644 --- a/Zend/tests/bug26696.phpt +++ b/Zend/tests/bug26696.phpt @@ -19,4 +19,4 @@ for ($i = 0; $i < $len; $i++) { ===DONE=== --EXPECT-- a-s-d-d-/-?+ -===DONE===
\ No newline at end of file +===DONE=== diff --git a/Zend/tests/bug29896.phpt b/Zend/tests/bug29896.phpt index 1e2eb0b067..35a92d459c 100644 --- a/Zend/tests/bug29896.phpt +++ b/Zend/tests/bug29896.phpt @@ -25,4 +25,3 @@ GenerateError2("Test2"); #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/Zend/tests/bug29944.phpt b/Zend/tests/bug29944.phpt index 6c0cf1ec7a..41a8159d52 100644 --- a/Zend/tests/bug29944.phpt +++ b/Zend/tests/bug29944.phpt @@ -13,4 +13,3 @@ switch ($a) { ?> --EXPECT-- ok - diff --git a/Zend/tests/bug30162.phpt b/Zend/tests/bug30162.phpt index 9cd3e9d524..55d26a3e3a 100644 --- a/Zend/tests/bug30162.phpt +++ b/Zend/tests/bug30162.phpt @@ -51,4 +51,4 @@ object(hariCow)#%d (2) { ["y"]=> string(1) "y" } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/Zend/tests/bug30519.phpt b/Zend/tests/bug30519.phpt index 7d70cba071..f633d11445 100644 --- a/Zend/tests/bug30519.phpt +++ b/Zend/tests/bug30519.phpt @@ -7,4 +7,3 @@ class test implements a { ?> --EXPECTF-- Fatal error: Interface 'a' not found in %sbug30519.php on line 2 - diff --git a/Zend/tests/bug32596.phpt b/Zend/tests/bug32596.phpt index 287495d150..40bd70382b 100644 --- a/Zend/tests/bug32596.phpt +++ b/Zend/tests/bug32596.phpt @@ -24,4 +24,3 @@ echo "this is still executed\n"; BUG please fix this thing, it wasted a nice part of my life! this is still executed - diff --git a/Zend/tests/bug33318.phpt b/Zend/tests/bug33318.phpt index 74ac9552bc..3b79588757 100644 --- a/Zend/tests/bug33318.phpt +++ b/Zend/tests/bug33318.phpt @@ -8,4 +8,4 @@ throw 1; Fatal error: Uncaught Error: Can only throw objects in %sbug33318.php:2 Stack trace: #0 {main} - thrown in %sbug33318.php on line 2
\ No newline at end of file + thrown in %sbug33318.php on line 2 diff --git a/Zend/tests/bug33558.phpt b/Zend/tests/bug33558.phpt index 9c87fc6017..5c00ad7ca6 100644 --- a/Zend/tests/bug33558.phpt +++ b/Zend/tests/bug33558.phpt @@ -18,4 +18,3 @@ echo "$a\n"; ?> --EXPECT-- ok - diff --git a/Zend/tests/bug34062.phpt b/Zend/tests/bug34062.phpt index bcb4ad8c64..f1c0e477a9 100644 --- a/Zend/tests/bug34062.phpt +++ b/Zend/tests/bug34062.phpt @@ -21,4 +21,3 @@ try { ((( here ))) - diff --git a/Zend/tests/bug34064.phpt b/Zend/tests/bug34064.phpt index 1b61f34775..83c6902803 100644 --- a/Zend/tests/bug34064.phpt +++ b/Zend/tests/bug34064.phpt @@ -36,4 +36,3 @@ Stack trace: #0 %s(%d): XmlTest->run() #1 {main} thrown in %sbug34064.php on line 18 - diff --git a/Zend/tests/bug34199.phpt b/Zend/tests/bug34199.phpt index 3012d808fa..d9b8e43c39 100644 --- a/Zend/tests/bug34199.phpt +++ b/Zend/tests/bug34199.phpt @@ -15,4 +15,3 @@ if(!$kids) echo "ok\n"; else echo "bug\n"; bool(false) ok ok - diff --git a/Zend/tests/bug34879.phpt b/Zend/tests/bug34879.phpt index 606142bde7..6c422ca268 100644 --- a/Zend/tests/bug34879.phpt +++ b/Zend/tests/bug34879.phpt @@ -8,4 +8,4 @@ print_r(str_replace('a', 'b', array(-1 =>-1))); Array ( [-1] => -1 -)
\ No newline at end of file +) diff --git a/Zend/tests/bug36071.phpt b/Zend/tests/bug36071.phpt index 31179ea3f9..945118fef3 100644 --- a/Zend/tests/bug36071.phpt +++ b/Zend/tests/bug36071.phpt @@ -11,4 +11,4 @@ $a[0]->b = 0; Fatal error: Uncaught Error: __clone method called on non-object in %sbug36071.php:2 Stack trace: #0 {main} - thrown in %sbug36071.php on line 2
\ No newline at end of file + thrown in %sbug36071.php on line 2 diff --git a/Zend/tests/bug37138.phpt b/Zend/tests/bug37138.phpt index e39ad199a1..4a084d4bb1 100644 --- a/Zend/tests/bug37138.phpt +++ b/Zend/tests/bug37138.phpt @@ -18,4 +18,3 @@ stch::g (); EHLO EHLO EHLO - diff --git a/Zend/tests/bug37707.phpt b/Zend/tests/bug37707.phpt index 1964958526..ac2dfb8777 100644 --- a/Zend/tests/bug37707.phpt +++ b/Zend/tests/bug37707.phpt @@ -13,4 +13,3 @@ echo "NO LEAK\n"; --EXPECT-- clonned NO LEAK - diff --git a/Zend/tests/bug38808.phpt b/Zend/tests/bug38808.phpt index 0fc4bfecdc..487a569b6d 100644 --- a/Zend/tests/bug38808.phpt +++ b/Zend/tests/bug38808.phpt @@ -14,4 +14,4 @@ echo $current($a)."\n"; ?> --EXPECT-- one -two
\ No newline at end of file +two diff --git a/Zend/tests/bug41401.phpt b/Zend/tests/bug41401.phpt index 50d2109cac..096091e439 100644 --- a/Zend/tests/bug41401.phpt +++ b/Zend/tests/bug41401.phpt @@ -7,4 +7,4 @@ echo "\n"; echo 6/+2*-3; --EXPECT-- -2.5 --9
\ No newline at end of file +-9 diff --git a/Zend/tests/bug42143.phpt b/Zend/tests/bug42143.phpt index 8a73d41bf8..87c48f0859 100644 --- a/Zend/tests/bug42143.phpt +++ b/Zend/tests/bug42143.phpt @@ -35,4 +35,3 @@ bool(false) bool(true) bool(true) bool(false) - diff --git a/Zend/tests/bug42818.phpt b/Zend/tests/bug42818.phpt index 4ebe9cc35d..b37ce13fd1 100644 --- a/Zend/tests/bug42818.phpt +++ b/Zend/tests/bug42818.phpt @@ -9,4 +9,3 @@ Fatal error: Uncaught Error: __clone method called on non-object in %sbug42818.p Stack trace: #0 {main} thrown in %sbug42818.php on line 2 - diff --git a/Zend/tests/bug42820.phpt b/Zend/tests/bug42820.phpt index 921f0090a9..a53ed1af68 100644 --- a/Zend/tests/bug42820.phpt +++ b/Zend/tests/bug42820.phpt @@ -28,4 +28,3 @@ bool(true) bool(false) bool(false) bool(false) - diff --git a/Zend/tests/bug43183.phpt b/Zend/tests/bug43183.phpt index a8ca698e9f..88641e862a 100644 --- a/Zend/tests/bug43183.phpt +++ b/Zend/tests/bug43183.phpt @@ -9,4 +9,4 @@ class Bar {} use Test\Bar; echo "ok\n"; --EXPECT-- -ok
\ No newline at end of file +ok diff --git a/Zend/tests/bug43200.phpt b/Zend/tests/bug43200.phpt index 7a995aab3e..35b96b1ba1 100644 --- a/Zend/tests/bug43200.phpt +++ b/Zend/tests/bug43200.phpt @@ -48,4 +48,3 @@ Class [ <user> class x extends c implements a, b ] { } } } - diff --git a/Zend/tests/bug45180.phpt b/Zend/tests/bug45180.phpt index f1ca434272..285543aaf0 100644 --- a/Zend/tests/bug45180.phpt +++ b/Zend/tests/bug45180.phpt @@ -58,4 +58,4 @@ string(1) "C" __callstatic: string(3) "FOO" __callstatic: -string(3) "FOO"
\ No newline at end of file +string(3) "FOO" diff --git a/Zend/tests/bug45862.phpt b/Zend/tests/bug45862.phpt index f70c14234c..734a498eba 100644 --- a/Zend/tests/bug45862.phpt +++ b/Zend/tests/bug45862.phpt @@ -28,7 +28,6 @@ $child->test(); ?> --EXPECT-- - From parent scope array(1) { ["prot"]=> diff --git a/Zend/tests/bug46811.phpt b/Zend/tests/bug46811.phpt index 06e10d78fa..88a9001e47 100644 --- a/Zend/tests/bug46811.phpt +++ b/Zend/tests/bug46811.phpt @@ -10,4 +10,3 @@ var_dump(ini_get("arg_separator.output")); --EXPECT-- bool(false) string(1) "&" - diff --git a/Zend/tests/bug47109.phpt b/Zend/tests/bug47109.phpt index 4d157345b2..0b86a2bcd3 100644 --- a/Zend/tests/bug47109.phpt +++ b/Zend/tests/bug47109.phpt @@ -8,4 +8,3 @@ $a->{"a"."b"}; Notice: Undefined variable: a in %sbug47109.php on line 2 Notice: Trying to get property 'ab' of non-object in %sbug47109.php on line 2 - diff --git a/Zend/tests/bug48228.phpt b/Zend/tests/bug48228.phpt index 9be02aa4d8..d91ded28be 100644 --- a/Zend/tests/bug48228.phpt +++ b/Zend/tests/bug48228.phpt @@ -23,7 +23,6 @@ $l_aa=new aa(); $l_aa->dosome(); ?> --EXPECTF-- - Fatal error: Uncaught Exception in %s Stack trace: #0 %s(%d): do_throw() diff --git a/Zend/tests/bug48408.phpt b/Zend/tests/bug48408.phpt index 7ae32a5d48..3315f40962 100644 --- a/Zend/tests/bug48408.phpt +++ b/Zend/tests/bug48408.phpt @@ -22,7 +22,6 @@ catch(Exception $e){ } ?> --EXPECTF-- - Fatal error: Uncaught Exception in %s Stack trace: #0 %s(%d): C->generate(0) diff --git a/Zend/tests/bug50394.phpt b/Zend/tests/bug50394.phpt index 4e6c9761dd..60b9d34582 100644 --- a/Zend/tests/bug50394.phpt +++ b/Zend/tests/bug50394.phpt @@ -21,4 +21,3 @@ var_dump($arg); bar called! bar called! int(3) - diff --git a/Zend/tests/bug51176.phpt b/Zend/tests/bug51176.phpt index 272ba1286f..c5185cc5fa 100644 --- a/Zend/tests/bug51176.phpt +++ b/Zend/tests/bug51176.phpt @@ -29,4 +29,4 @@ $foo->start(); --EXPECT-- instance instance -instance
\ No newline at end of file +instance diff --git a/Zend/tests/bug52237.phpt b/Zend/tests/bug52237.phpt index 47d39f8e9d..44f8f3f688 100644 --- a/Zend/tests/bug52237.phpt +++ b/Zend/tests/bug52237.phpt @@ -7,6 +7,5 @@ preg_match('//', '', $data->info); var_dump($data); ?> --EXPECTF-- - Warning: Attempt to modify property 'info' of non-object in %sbug52237.php on line 3 string(4) "test" diff --git a/Zend/tests/bug52361.phpt b/Zend/tests/bug52361.phpt index 4159ac0b8c..74ed8a8d17 100644 --- a/Zend/tests/bug52361.phpt +++ b/Zend/tests/bug52361.phpt @@ -32,4 +32,3 @@ Stack trace: Stack trace: #0 %sbug52361.php(16): bbb() #1 {main} - diff --git a/Zend/tests/bug53971.phpt b/Zend/tests/bug53971.phpt index a1e66cc51e..60e9c3d81f 100644 --- a/Zend/tests/bug53971.phpt +++ b/Zend/tests/bug53971.phpt @@ -7,5 +7,3 @@ var_dump(isset($s[0][0])); ?> --EXPECT-- bool(false) - - diff --git a/Zend/tests/bug54265.phpt b/Zend/tests/bug54265.phpt index 43db028a2a..417e1b5564 100644 --- a/Zend/tests/bug54265.phpt +++ b/Zend/tests/bug54265.phpt @@ -14,4 +14,3 @@ echo "ok\n"; --EXPECT-- EROOR: Creating default object from empty value ok - diff --git a/Zend/tests/bug60536_001.phpt b/Zend/tests/bug60536_001.phpt index 37a5a6d813..0847b81d40 100644 --- a/Zend/tests/bug60536_001.phpt +++ b/Zend/tests/bug60536_001.phpt @@ -22,6 +22,5 @@ $a->__construct(); echo "DONE"; ?> --EXPECTF-- - Notice: Undefined property: Z::$x in %s on line 14 DONE diff --git a/Zend/tests/bug60738_variation.phpt b/Zend/tests/bug60738_variation.phpt index f9e2e73458..cf2ea607a0 100644 --- a/Zend/tests/bug60738_variation.phpt +++ b/Zend/tests/bug60738_variation.phpt @@ -20,4 +20,3 @@ Fatal error: Uncaught Exception: Exception! in %s:%d Stack trace: #0 {main} thrown in %s on line %d - diff --git a/Zend/tests/bug60833.phpt b/Zend/tests/bug60833.phpt index deb6c0f691..fee6d01362 100644 --- a/Zend/tests/bug60833.phpt +++ b/Zend/tests/bug60833.phpt @@ -37,4 +37,3 @@ object(B)#%d (4) { ["v4"]=> string(1) "B" } - diff --git a/Zend/tests/bug61970_1.phpt b/Zend/tests/bug61970_1.phpt index 978884adba..15dc781385 100644 --- a/Zend/tests/bug61970_1.phpt +++ b/Zend/tests/bug61970_1.phpt @@ -10,6 +10,5 @@ abstract class Foo { class Bar extends Foo { protected function __construct(){} } - --EXPECTF-- Fatal error: Access level to Bar::__construct() must be public (as in class Foo) in %s diff --git a/Zend/tests/bug61970_2.phpt b/Zend/tests/bug61970_2.phpt index 56203f7685..d1e11e9407 100644 --- a/Zend/tests/bug61970_2.phpt +++ b/Zend/tests/bug61970_2.phpt @@ -14,6 +14,5 @@ class Bar extends Foo { class Baz extends Bar { protected function __construct(){} } - --EXPECTF-- Fatal error: Access level to Baz::__construct() must be public (as in class Bar) in %s diff --git a/Zend/tests/bug62441.phpt b/Zend/tests/bug62441.phpt index fba76cb290..581c0dad68 100644 --- a/Zend/tests/bug62441.phpt +++ b/Zend/tests/bug62441.phpt @@ -17,4 +17,3 @@ namespace ns { ?> --EXPECTF-- Fatal error: Declaration of ns\Foo::method(ns\stdClass $o) must be compatible with Iface::method(stdClass $o) in %s on line %d - diff --git a/Zend/tests/bug63111.phpt b/Zend/tests/bug63111.phpt index 3ac4618aea..077e350bc2 100644 --- a/Zend/tests/bug63111.phpt +++ b/Zend/tests/bug63111.phpt @@ -35,4 +35,3 @@ Fatal error: Uncaught Error: Cannot call abstract method Foo::bar() in %sbug6311 Stack trace: #0 {main} thrown in %sbug63111.php on line 20 - diff --git a/Zend/tests/bug63462.phpt b/Zend/tests/bug63462.phpt index 6e60d12d43..45c9507bba 100644 --- a/Zend/tests/bug63462.phpt +++ b/Zend/tests/bug63462.phpt @@ -49,7 +49,6 @@ $test->protectedProperty = 'value'; $test->privateProperty = 'value'; ?> - --EXPECTF-- __get nonExisting @@ -71,4 +70,3 @@ __set nonExisting __set publicProperty __set protectedProperty __set privateProperty - diff --git a/Zend/tests/bug63468.phpt b/Zend/tests/bug63468.phpt index 00b5a41c90..02c3c06c17 100644 --- a/Zend/tests/bug63468.phpt +++ b/Zend/tests/bug63468.phpt @@ -27,4 +27,3 @@ $x = new Bar; var_dump($x->run()); --EXPECT-- string(3) "Bar" - diff --git a/Zend/tests/bug63762.phpt b/Zend/tests/bug63762.phpt index 8de177dcf8..d848b74f55 100644 --- a/Zend/tests/bug63762.phpt +++ b/Zend/tests/bug63762.phpt @@ -50,4 +50,3 @@ Warning: Value for function is no string in %s on line %d Warning: args element is no array in %s on line %d string(60) "#0 [unknown function][unknown][unknown][unknown]() #1 {main}" - diff --git a/Zend/tests/bug64417.phpt b/Zend/tests/bug64417.phpt index f3ef740b43..9b192f31b5 100644 --- a/Zend/tests/bug64417.phpt +++ b/Zend/tests/bug64417.phpt @@ -36,4 +36,3 @@ $o['x'] = 1; echo $o['x'], "\n"; --EXPECT-- 2 - diff --git a/Zend/tests/bug64660.phpt b/Zend/tests/bug64660.phpt index e2b89da1cd..f8611ae9d9 100644 --- a/Zend/tests/bug64660.phpt +++ b/Zend/tests/bug64660.phpt @@ -7,5 +7,4 @@ function a() { } echo "Done\n"; --EXPECTF-- - Parse error: memory exhausted in %s on line %d diff --git a/Zend/tests/bug65419.phpt b/Zend/tests/bug65419.phpt index c10a518376..0472f64de7 100644 --- a/Zend/tests/bug65419.phpt +++ b/Zend/tests/bug65419.phpt @@ -20,4 +20,4 @@ ghi::def(); ?> --EXPECT-- ghi -ghi
\ No newline at end of file +ghi diff --git a/Zend/tests/bug67436/bug67436.phpt b/Zend/tests/bug67436/bug67436.phpt index 2bd06a0745..0ef339dc47 100644 --- a/Zend/tests/bug67436/bug67436.phpt +++ b/Zend/tests/bug67436/bug67436.phpt @@ -1,9 +1,7 @@ --TEST-- bug67436: Autoloader isn't called if user defined error handler is present - --INI-- error_reporting=-1 - --FILE-- <?php @@ -20,7 +18,6 @@ a::staticTest(); $b = new b(); $b->test(); - --EXPECT-- b::test() a::test(c::TESTCONSTANT) diff --git a/Zend/tests/bug67436/bug67436_nohandler.phpt b/Zend/tests/bug67436/bug67436_nohandler.phpt index 088761e00b..74ea394f5d 100644 --- a/Zend/tests/bug67436/bug67436_nohandler.phpt +++ b/Zend/tests/bug67436/bug67436_nohandler.phpt @@ -13,7 +13,6 @@ a::staticTest(); $b = new b(); $b->test(); - --EXPECTF-- Warning: Declaration of b::test() should be compatible with a::test($arg = c::TESTCONSTANT) in %s%ebug67436%eb.inc on line %d b::test() diff --git a/Zend/tests/bug68446.phpt b/Zend/tests/bug68446.phpt index 994699e5de..9648966691 100644 --- a/Zend/tests/bug68446.phpt +++ b/Zend/tests/bug68446.phpt @@ -37,4 +37,3 @@ Stack trace: #0 %s(%d): a(NULL) #1 {main} thrown in %s on line %d - diff --git a/Zend/tests/bug69092.2.phpt b/Zend/tests/bug69092.2.phpt index b3f4bff175..d19116c598 100644 --- a/Zend/tests/bug69092.2.phpt +++ b/Zend/tests/bug69092.2.phpt @@ -15,4 +15,4 @@ echo "Bye" --EXPECTF-- Warning: declare(encoding=...) ignored because Zend multibyte feature is turned off by settings in %s on line %d -Fatal error: Encoding declaration pragma must be the very first statement in the script in %s on line %d
\ No newline at end of file +Fatal error: Encoding declaration pragma must be the very first statement in the script in %s on line %d diff --git a/Zend/tests/bug69092.phpt b/Zend/tests/bug69092.phpt index 1963d7be02..d80954b16f 100644 --- a/Zend/tests/bug69092.phpt +++ b/Zend/tests/bug69092.phpt @@ -19,4 +19,4 @@ function foo() { echo "Bye" ?> --EXPECTF-- -Fatal error: Encoding declaration pragma must be the very first statement in the script in %s on line %d
\ No newline at end of file +Fatal error: Encoding declaration pragma must be the very first statement in the script in %s on line %d diff --git a/Zend/tests/bug69315.phpt b/Zend/tests/bug69315.phpt index 71dac4298f..296e3bb9c6 100644 --- a/Zend/tests/bug69315.phpt +++ b/Zend/tests/bug69315.phpt @@ -12,7 +12,6 @@ var_dump(defined("PHP_VERSION")); var_dump(constant("PHP_VERSION")); var_dump(call_user_func("strlen")); var_dump(is_string("xxx")); - --EXPECTF-- bool(false) bool(true) diff --git a/Zend/tests/bug69537.phpt b/Zend/tests/bug69537.phpt index 3151c35081..e2c79b9afe 100644 --- a/Zend/tests/bug69537.phpt +++ b/Zend/tests/bug69537.phpt @@ -16,4 +16,3 @@ object(Foo)#%d (%d) { [""]=> int(1) } - diff --git a/Zend/tests/bug69732.phpt b/Zend/tests/bug69732.phpt index 06dd5389dd..f5571627fe 100644 --- a/Zend/tests/bug69732.phpt +++ b/Zend/tests/bug69732.phpt @@ -28,4 +28,3 @@ Fatal error: Uncaught Error: Cannot assign by reference to overloaded object in Stack trace: #0 {main} thrown in %s on line %d - diff --git a/Zend/tests/bug69825.phpt b/Zend/tests/bug69825.phpt index 1349dee5ae..18bd9cc5d7 100644 --- a/Zend/tests/bug69825.phpt +++ b/Zend/tests/bug69825.phpt @@ -27,4 +27,3 @@ bool(true) bool(false) bool(true) bool(true) - diff --git a/Zend/tests/bug69832.phpt b/Zend/tests/bug69832.phpt index 2617c7b24d..5ad88d94bc 100644 --- a/Zend/tests/bug69832.phpt +++ b/Zend/tests/bug69832.phpt @@ -29,4 +29,3 @@ string(4) "Test" bool(true) int(1) string(4) "Test" - diff --git a/Zend/tests/bug69889.phpt b/Zend/tests/bug69889.phpt index 8aae7c16f7..dd555ab407 100644 --- a/Zend/tests/bug69889.phpt +++ b/Zend/tests/bug69889.phpt @@ -19,4 +19,3 @@ string(7) "default" string(7) "default" string(7) "default" string(7) "default" - diff --git a/Zend/tests/bug69957.phpt b/Zend/tests/bug69957.phpt index d578f9c8d2..01b024e778 100644 --- a/Zend/tests/bug69957.phpt +++ b/Zend/tests/bug69957.phpt @@ -81,4 +81,3 @@ float(INF) Double mod Type: DivisionByZeroError Message: Modulo by zero - diff --git a/Zend/tests/bug70083.phpt b/Zend/tests/bug70083.phpt index 0391ea2327..6b20eabb39 100644 --- a/Zend/tests/bug70083.phpt +++ b/Zend/tests/bug70083.phpt @@ -18,9 +18,7 @@ var_dump($foo); ?> --EXPECTF-- - Fatal error: Uncaught Error: Cannot assign by reference to overloaded object in %s:%d Stack trace: #0 {main} thrown in %s on line %d - diff --git a/Zend/tests/bug71428.1.phpt b/Zend/tests/bug71428.1.phpt index e4d3a22f67..2e9a52d3d0 100644 --- a/Zend/tests/bug71428.1.phpt +++ b/Zend/tests/bug71428.1.phpt @@ -10,4 +10,3 @@ class B extends A { } --EXPECTF-- Warning: Declaration of B::m(array $a = Array) should be compatible with A::m(?array $a = NULL) in %sbug71428.1.php on line 7 - diff --git a/Zend/tests/bug71428.2.phpt b/Zend/tests/bug71428.2.phpt index 9a98ba7760..9fc15fc8c5 100644 --- a/Zend/tests/bug71428.2.phpt +++ b/Zend/tests/bug71428.2.phpt @@ -20,4 +20,3 @@ echo "ok"; ?> --EXPECT-- ok - diff --git a/Zend/tests/bug71428.3.phpt b/Zend/tests/bug71428.3.phpt index 558e87c56e..78fff6e70d 100644 --- a/Zend/tests/bug71428.3.phpt +++ b/Zend/tests/bug71428.3.phpt @@ -8,4 +8,3 @@ class C extends B { public function m(A $a , $n) { echo "C.m";} }; ?> --EXPECTF-- Warning: Declaration of C::m(A $a, $n) should be compatible with B::m(?A $a, $n) in %sbug71428.3.php on line 4 - diff --git a/Zend/tests/bug71539_6.phpt b/Zend/tests/bug71539_6.phpt index 2bf4f6b1e0..d690538595 100644 --- a/Zend/tests/bug71539_6.phpt +++ b/Zend/tests/bug71539_6.phpt @@ -12,4 +12,4 @@ for ($i = 0; $i < 100000; $i++) { ?> OK --EXPECT-- -OK
\ No newline at end of file +OK diff --git a/Zend/tests/bug71572.phpt b/Zend/tests/bug71572.phpt index 4a823ec72f..4eb16246a1 100644 --- a/Zend/tests/bug71572.phpt +++ b/Zend/tests/bug71572.phpt @@ -24,4 +24,4 @@ NULL Warning: Cannot assign an empty string to a string offset in %s on line %d NULL string(3) "abc" -==DONE==
\ No newline at end of file +==DONE== diff --git a/Zend/tests/bug72038.phpt b/Zend/tests/bug72038.phpt index 1e32af4c18..9ce82268c1 100644 --- a/Zend/tests/bug72038.phpt +++ b/Zend/tests/bug72038.phpt @@ -16,7 +16,6 @@ function test(&$param) { ?> --EXPECTF-- - Notice: Only variables should be passed by reference in %s on line %d object(stdClass)#1 (0) { } @@ -24,4 +23,3 @@ object(stdClass)#1 (0) { Notice: Only variables should be passed by reference in %s on line %d int(2) int(1) - diff --git a/Zend/tests/bug72057.phpt b/Zend/tests/bug72057.phpt index e1a129bbc2..406efe3efc 100644 --- a/Zend/tests/bug72057.phpt +++ b/Zend/tests/bug72057.phpt @@ -10,9 +10,7 @@ set_error_handler( ); (function (int $i) { bar(); })("7as"); - --EXPECTF-- - Fatal error: Uncaught Exception: My custom error in %s:%d Stack trace: #0 %s(%d): {closure}(8, 'A non well form...', '%s', %d, Array) diff --git a/Zend/tests/bug72119.phpt b/Zend/tests/bug72119.phpt index 064381ada0..7afac3cd5b 100644 --- a/Zend/tests/bug72119.phpt +++ b/Zend/tests/bug72119.phpt @@ -16,4 +16,3 @@ echo "OK\n"; ?> --EXPECTF-- Fatal error: Declaration of Hello::bar(array $baz = Array) must be compatible with Foo::bar(?array $baz = NULL) in %s on line %d - diff --git a/Zend/tests/bug73998.phpt b/Zend/tests/bug73998.phpt index 41813269d1..72d1e59924 100644 --- a/Zend/tests/bug73998.phpt +++ b/Zend/tests/bug73998.phpt @@ -16,4 +16,3 @@ echo "Value: {$properties[1234]}\n"; --EXPECT-- bool(true) Value: Numeric - diff --git a/Zend/tests/bug74657.phpt b/Zend/tests/bug74657.phpt index 41e28ce58b..4c84bde7bd 100644 --- a/Zend/tests/bug74657.phpt +++ b/Zend/tests/bug74657.phpt @@ -23,4 +23,3 @@ Fatal error: Uncaught Error: Undefined class constant 'I::FOO' in %sbug74657.php Stack trace: #0 {main} thrown in %sbug74657.php on line %d - diff --git a/Zend/tests/bug75290.phpt b/Zend/tests/bug75290.phpt index 416af065c6..3b28e621d2 100644 --- a/Zend/tests/bug75290.phpt +++ b/Zend/tests/bug75290.phpt @@ -23,4 +23,3 @@ object(Closure)#2 (1) { string(10) "<required>" } } - diff --git a/Zend/tests/bug75420.2.phpt b/Zend/tests/bug75420.2.phpt index 3e7a63ffed..994327d195 100644 --- a/Zend/tests/bug75420.2.phpt +++ b/Zend/tests/bug75420.2.phpt @@ -17,4 +17,3 @@ var_dump($name); string(6) "foofoo" int(42) int(24) - diff --git a/Zend/tests/call_static.phpt b/Zend/tests/call_static.phpt index c37bc72230..355a1570f3 100644 --- a/Zend/tests/call_static.phpt +++ b/Zend/tests/call_static.phpt @@ -13,7 +13,6 @@ class Test call_user_func("Test::Two", 'A', 'B'); call_user_func(array("Test", "Three"), NULL, 0, false); Test::Four(5, 6, 7, 8); - --EXPECT-- Two() called with 2 arguments Three() called with 3 arguments diff --git a/Zend/tests/class_alias_004.phpt b/Zend/tests/class_alias_004.phpt index f99152c96a..ea3501ed57 100644 --- a/Zend/tests/class_alias_004.phpt +++ b/Zend/tests/class_alias_004.phpt @@ -12,4 +12,4 @@ class_alias('foo', 'test'); ?> --EXPECTF-- -Warning: Cannot declare class test, because the name is already in use in %s on line %d
\ No newline at end of file +Warning: Cannot declare class test, because the name is already in use in %s on line %d diff --git a/Zend/tests/closure_012.phpt b/Zend/tests/closure_012.phpt index 7e1b7a2793..bae8f56878 100644 --- a/Zend/tests/closure_012.phpt +++ b/Zend/tests/closure_012.phpt @@ -21,4 +21,3 @@ Notice: Undefined variable: i in %sclosure_012.php on line 2 Notice: Undefined variable: i in %sclosure_012.php on line 7 NULL int(2) - diff --git a/Zend/tests/closure_022.phpt b/Zend/tests/closure_022.phpt index b1ffebc0b4..8977e963df 100644 --- a/Zend/tests/closure_022.phpt +++ b/Zend/tests/closure_022.phpt @@ -12,4 +12,3 @@ Fatal error: Uncaught Error: Closure object cannot have properties in %sclosure_ Stack trace: #0 {main} thrown in %sclosure_022.php on line 5 - diff --git a/Zend/tests/closure_023.phpt b/Zend/tests/closure_023.phpt index 634fb6dd50..a91d357c06 100644 --- a/Zend/tests/closure_023.phpt +++ b/Zend/tests/closure_023.phpt @@ -11,4 +11,3 @@ class foo { foo::bar(); --EXPECT-- Done - diff --git a/Zend/tests/closure_024.phpt b/Zend/tests/closure_024.phpt index 68fd29c687..39f0062fec 100644 --- a/Zend/tests/closure_024.phpt +++ b/Zend/tests/closure_024.phpt @@ -23,4 +23,4 @@ echo "Done.\n"; 11 12 12 -Done.
\ No newline at end of file +Done. diff --git a/Zend/tests/closure_031.phpt b/Zend/tests/closure_031.phpt index 241ddb42cd..042bf8c145 100644 --- a/Zend/tests/closure_031.phpt +++ b/Zend/tests/closure_031.phpt @@ -16,4 +16,3 @@ try { ?> --EXPECT-- Error: Closure object cannot have properties - diff --git a/Zend/tests/closure_032.phpt b/Zend/tests/closure_032.phpt index 412a923a38..601db15989 100644 --- a/Zend/tests/closure_032.phpt +++ b/Zend/tests/closure_032.phpt @@ -67,4 +67,3 @@ Array ) #0 {closure}(23) called at [%s:%d] #1 test(Closure Object ()) called at [%s:%d] - diff --git a/Zend/tests/closure_036.phpt b/Zend/tests/closure_036.phpt index f71188cd08..9123a1ba47 100644 --- a/Zend/tests/closure_036.phpt +++ b/Zend/tests/closure_036.phpt @@ -30,4 +30,4 @@ var_dump($cb2()); --EXPECT-- int(1) int(11) -int(12)
\ No newline at end of file +int(12) diff --git a/Zend/tests/closure_037.phpt b/Zend/tests/closure_037.phpt index cabd99bfac..1257d6bc7e 100644 --- a/Zend/tests/closure_037.phpt +++ b/Zend/tests/closure_037.phpt @@ -44,4 +44,4 @@ Done. 1 42 forty two -Done.
\ No newline at end of file +Done. diff --git a/Zend/tests/closure_041.phpt b/Zend/tests/closure_041.phpt index a7e9eab482..33cf03b14c 100644 --- a/Zend/tests/closure_041.phpt +++ b/Zend/tests/closure_041.phpt @@ -63,7 +63,6 @@ $d = $nonstaticUnscoped->bindTo(new B); $d(); echo " (should be scoped to dummy $d = $nonstaticScoped->bindTo(new B); $d(); echo "\n"; echo "Done.\n"; - --EXPECTF-- Before binding scoped to A: bool(false) diff --git a/Zend/tests/closure_043.phpt b/Zend/tests/closure_043.phpt index 92b96575b5..2390aa153b 100644 --- a/Zend/tests/closure_043.phpt +++ b/Zend/tests/closure_043.phpt @@ -38,7 +38,6 @@ $d = $staticUnscoped->bindTo(new A, 'A'); $d = $staticScoped->bindTo(new A, 'A'); echo "Done.\n"; - --EXPECTF-- Before binding bool(false) diff --git a/Zend/tests/closure_044.phpt b/Zend/tests/closure_044.phpt index b8da50049a..c71204b130 100644 --- a/Zend/tests/closure_044.phpt +++ b/Zend/tests/closure_044.phpt @@ -38,7 +38,6 @@ $d = $nonstaticUnscoped->bindTo(new A, 'A'); $d(); echo "\n"; $d = $nonstaticScoped->bindTo(new A, 'A'); $d(); echo "\n"; echo "Done.\n"; - --EXPECT-- Before binding bool(false) diff --git a/Zend/tests/closure_045.phpt b/Zend/tests/closure_045.phpt index c309e3c533..2b99476678 100644 --- a/Zend/tests/closure_045.phpt +++ b/Zend/tests/closure_045.phpt @@ -13,6 +13,5 @@ $a = A::foo(); $a->bindTo(new A); echo "Done.\n"; - --EXPECT-- Done. diff --git a/Zend/tests/closure_046.phpt b/Zend/tests/closure_046.phpt index 4e2542b7c0..ef8aff4bbc 100644 --- a/Zend/tests/closure_046.phpt +++ b/Zend/tests/closure_046.phpt @@ -38,7 +38,6 @@ echo "After binding, with different instance for the bound one", "\n"; $d = $nonstaticScoped->bindTo(new B, "static"); $d(); echo "\n"; echo "Done.\n"; - --EXPECT-- Before binding bool(false) diff --git a/Zend/tests/closure_049.phpt b/Zend/tests/closure_049.phpt index 684b33d564..c5ed917f16 100644 --- a/Zend/tests/closure_049.phpt +++ b/Zend/tests/closure_049.phpt @@ -1,6 +1,5 @@ --TEST-- Closure 049: static::class in static closure in non-static method. - --FILE-- <?php diff --git a/Zend/tests/closure_050.phpt b/Zend/tests/closure_050.phpt index d43f325ef1..1ab0c3fa58 100644 --- a/Zend/tests/closure_050.phpt +++ b/Zend/tests/closure_050.phpt @@ -1,6 +1,5 @@ --TEST-- Closure 050: static::class in non-static closure in non-static method. - --FILE-- <?php @@ -17,6 +16,5 @@ class B extends A {} $b = new B; var_dump($b->foo()); - --EXPECT-- string(1) "B" diff --git a/Zend/tests/closure_051.phpt b/Zend/tests/closure_051.phpt index 78b28d74a3..ab514123c0 100644 --- a/Zend/tests/closure_051.phpt +++ b/Zend/tests/closure_051.phpt @@ -1,6 +1,5 @@ --TEST-- Closure 051: static::class in static closure in static method. - --FILE-- <?php @@ -16,6 +15,5 @@ class A { class B extends A {} var_dump(B::foo()); - --EXPECT-- string(1) "B" diff --git a/Zend/tests/closure_052.phpt b/Zend/tests/closure_052.phpt index f878515a82..5550cc92dc 100644 --- a/Zend/tests/closure_052.phpt +++ b/Zend/tests/closure_052.phpt @@ -1,6 +1,5 @@ --TEST-- Closure 052: static::class in non-static closure in static method. - --FILE-- <?php @@ -16,6 +15,5 @@ class A { class B extends A {} var_dump(B::foo()); - --EXPECT-- string(1) "B" diff --git a/Zend/tests/closure_053.phpt b/Zend/tests/closure_053.phpt index b1d76a2561..65c65ae08a 100644 --- a/Zend/tests/closure_053.phpt +++ b/Zend/tests/closure_053.phpt @@ -1,6 +1,5 @@ --TEST-- Closure 053: self::class in static closure in non-static method. - --FILE-- <?php @@ -17,6 +16,5 @@ class B extends A {} $b = new B; var_dump($b->foo()); - --EXPECT-- string(1) "A" diff --git a/Zend/tests/closure_054.phpt b/Zend/tests/closure_054.phpt index b2f87d1d61..87c46d7a19 100644 --- a/Zend/tests/closure_054.phpt +++ b/Zend/tests/closure_054.phpt @@ -1,6 +1,5 @@ --TEST-- Closure 054: self::class in non-static closure in non-static method. - --FILE-- <?php @@ -17,6 +16,5 @@ class B extends A {} $b = new B; var_dump($b->foo()); - --EXPECT-- string(1) "A" diff --git a/Zend/tests/closure_055.phpt b/Zend/tests/closure_055.phpt index 047d72a89b..2dc1d47103 100644 --- a/Zend/tests/closure_055.phpt +++ b/Zend/tests/closure_055.phpt @@ -1,6 +1,5 @@ --TEST-- Closure 055: self::class in static closure in static method. - --FILE-- <?php @@ -16,6 +15,5 @@ class A { class B extends A {} var_dump(B::foo()); - --EXPECT-- string(1) "A" diff --git a/Zend/tests/closure_056.phpt b/Zend/tests/closure_056.phpt index 566de10d83..d1fa848ee6 100644 --- a/Zend/tests/closure_056.phpt +++ b/Zend/tests/closure_056.phpt @@ -1,6 +1,5 @@ --TEST-- Closure 056: self::class in non-static closure in static method. - --FILE-- <?php @@ -16,6 +15,5 @@ class A { class B extends A {} var_dump(B::foo()); - --EXPECT-- string(1) "A" diff --git a/Zend/tests/closure_bug66622.phpt b/Zend/tests/closure_bug66622.phpt index 1c9577d688..44bbcbaa8d 100644 --- a/Zend/tests/closure_bug66622.phpt +++ b/Zend/tests/closure_bug66622.phpt @@ -1,6 +1,5 @@ --TEST-- Bug 66622: Closures do not correctly capture the late bound class (static::) in some cases - --FILE-- <?php class A { @@ -29,7 +28,6 @@ function test() { B::baz(); } test(); - --EXPECT-- B vs B B vs B diff --git a/Zend/tests/closures/closure_from_callable_basic.phpt b/Zend/tests/closures/closure_from_callable_basic.phpt index 2561bbfaa6..0aacaf2ff5 100644 --- a/Zend/tests/closures/closure_from_callable_basic.phpt +++ b/Zend/tests/closures/closure_from_callable_basic.phpt @@ -98,7 +98,6 @@ echo $fn(" OK".PHP_EOL); ?> ===DONE=== --EXPECT-- - Access public static function OK Access public static function with different case OK Access public static function with colon scheme OK diff --git a/Zend/tests/closures/closure_from_callable_error.phpt b/Zend/tests/closures/closure_from_callable_error.phpt index d9db90bcad..c6e4a7e0bb 100644 --- a/Zend/tests/closures/closure_from_callable_error.phpt +++ b/Zend/tests/closures/closure_from_callable_error.phpt @@ -195,7 +195,6 @@ echo "OK\n"; ?> ===DONE=== --EXPECT-- - Cannot access privateInstance method statically Cannot access privateInstance method statically with colon scheme Cannot access privateInstance method diff --git a/Zend/tests/concat_001.phpt b/Zend/tests/concat_001.phpt index 805478a0cf..1e657954a9 100644 --- a/Zend/tests/concat_001.phpt +++ b/Zend/tests/concat_001.phpt @@ -50,7 +50,6 @@ var_dump($d.$d); echo "Done\n"; ?> --EXPECTF-- - Notice: Array to string conversion in %sconcat_001.php on line %d string(24) "Arraythis is test object" diff --git a/Zend/tests/concat_002.phpt b/Zend/tests/concat_002.phpt index 4ec4f1fb32..c9f749518d 100644 --- a/Zend/tests/concat_002.phpt +++ b/Zend/tests/concat_002.phpt @@ -21,4 +21,3 @@ echo "Done\n"; --EXPECT-- int(33554432) Done - diff --git a/Zend/tests/const_dereference_002.phpt b/Zend/tests/const_dereference_002.phpt index ff89519755..1320029baa 100644 --- a/Zend/tests/const_dereference_002.phpt +++ b/Zend/tests/const_dereference_002.phpt @@ -7,7 +7,6 @@ error_reporting(E_ALL); var_dump("foobar"[3]); var_dump("foobar"[2][0]); var_dump("foobar"["foo"]["bar"]); - --EXPECTF-- string(1) "b" string(1) "o" diff --git a/Zend/tests/constant_arrays.phpt b/Zend/tests/constant_arrays.phpt index 9e099e33fc..06d911328c 100644 --- a/Zend/tests/constant_arrays.phpt +++ b/Zend/tests/constant_arrays.phpt @@ -30,7 +30,6 @@ var_dump(define('ELEPHPANT', [new StdClass])); $recursive = []; $recursive[0] = &$recursive; var_dump(define('RECURSION', $recursive)); - --EXPECTF-- array(4) { [0]=> diff --git a/Zend/tests/constant_expressions_coalesce_empty_dim.phpt b/Zend/tests/constant_expressions_coalesce_empty_dim.phpt index 56ee43b789..b69637c98d 100644 --- a/Zend/tests/constant_expressions_coalesce_empty_dim.phpt +++ b/Zend/tests/constant_expressions_coalesce_empty_dim.phpt @@ -8,4 +8,3 @@ const A = [][] ?? 1; ?> --EXPECTF-- Fatal error: Cannot use [] for reading in %s.php on line %d - diff --git a/Zend/tests/constant_expressions_dynamic.phpt b/Zend/tests/constant_expressions_dynamic.phpt index 686dcc1d11..79f8c772e3 100644 --- a/Zend/tests/constant_expressions_dynamic.phpt +++ b/Zend/tests/constant_expressions_dynamic.phpt @@ -45,7 +45,6 @@ var_dump( ?> --EXPECTF-- - Warning: A non-numeric value encountered in %s on line %d int(3) string(4) "1foo" diff --git a/Zend/tests/constant_expressions_self_referencing_array.phpt b/Zend/tests/constant_expressions_self_referencing_array.phpt index c584b5d503..daa7250641 100644 --- a/Zend/tests/constant_expressions_self_referencing_array.phpt +++ b/Zend/tests/constant_expressions_self_referencing_array.phpt @@ -13,4 +13,3 @@ Fatal error: Uncaught Error: Cannot declare self-referencing constant 'self::BAR Stack trace: #0 {main} thrown in %s on line %d - diff --git a/Zend/tests/debug_backtrace_with_include_and_this.phpt b/Zend/tests/debug_backtrace_with_include_and_this.phpt index 7cc868105a..5d58279eb5 100644 --- a/Zend/tests/debug_backtrace_with_include_and_this.phpt +++ b/Zend/tests/debug_backtrace_with_include_and_this.phpt @@ -36,4 +36,3 @@ Stack trace: #0 %s(%d): CL->load('class://non.exi...') #1 {main} thrown in %s on line %d - diff --git a/Zend/tests/declare_006.phpt b/Zend/tests/declare_006.phpt index af86c5b165..6d41c0d7d6 100644 --- a/Zend/tests/declare_006.phpt +++ b/Zend/tests/declare_006.phpt @@ -6,5 +6,4 @@ declare(ticks = UNKNOWN_CONST) { echo 'Done'; } --EXPECTF-- - Fatal error: declare(ticks) value must be a literal in %sdeclare_006.php on line 2 diff --git a/Zend/tests/errmsg_018.phpt b/Zend/tests/errmsg_018.phpt index b803499e50..fd34c8031e 100644 --- a/Zend/tests/errmsg_018.phpt +++ b/Zend/tests/errmsg_018.phpt @@ -10,5 +10,4 @@ class test { echo "Done\n"; ?> --EXPECTF-- - Fatal error: Class test contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (test::foo) in %s on line %d diff --git a/Zend/tests/exception_003.phpt b/Zend/tests/exception_003.phpt index 813246c5dd..b8efa94be0 100644 --- a/Zend/tests/exception_003.phpt +++ b/Zend/tests/exception_003.phpt @@ -7,7 +7,6 @@ throw new Exception(1); ?> --EXPECTF-- - Fatal error: Uncaught Exception: 1 in %s:%d Stack trace: #0 {main} diff --git a/Zend/tests/flexible-heredoc-error1.phpt b/Zend/tests/flexible-heredoc-error1.phpt index dc56d4f8ed..237386834b 100644 --- a/Zend/tests/flexible-heredoc-error1.phpt +++ b/Zend/tests/flexible-heredoc-error1.phpt @@ -11,4 +11,4 @@ echo <<<END ?> --EXPECTF-- -Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d
\ No newline at end of file +Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d diff --git a/Zend/tests/flexible-heredoc-error10.phpt b/Zend/tests/flexible-heredoc-error10.phpt index 6b7fe9ee77..51be4562f1 100644 --- a/Zend/tests/flexible-heredoc-error10.phpt +++ b/Zend/tests/flexible-heredoc-error10.phpt @@ -10,4 +10,4 @@ $var ?> --EXPECTF-- -Parse error: Invalid body indentation level (expecting an indentation level of at least 1) in %s on line %d
\ No newline at end of file +Parse error: Invalid body indentation level (expecting an indentation level of at least 1) in %s on line %d diff --git a/Zend/tests/flexible-heredoc-error11.phpt b/Zend/tests/flexible-heredoc-error11.phpt index 3e71cbd684..cd952a73f2 100644 --- a/Zend/tests/flexible-heredoc-error11.phpt +++ b/Zend/tests/flexible-heredoc-error11.phpt @@ -10,4 +10,4 @@ $a ?> --EXPECTF-- -Parse error: Invalid body indentation level (expecting an indentation level of at least 1) in %s on line 5
\ No newline at end of file +Parse error: Invalid body indentation level (expecting an indentation level of at least 1) in %s on line 5 diff --git a/Zend/tests/flexible-heredoc-error12.phpt b/Zend/tests/flexible-heredoc-error12.phpt index 022c0811aa..05b71b36b2 100644 --- a/Zend/tests/flexible-heredoc-error12.phpt +++ b/Zend/tests/flexible-heredoc-error12.phpt @@ -10,4 +10,4 @@ echo <<<END ?> --EXPECTF-- -Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line 5
\ No newline at end of file +Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line 5 diff --git a/Zend/tests/flexible-heredoc-error13.phpt b/Zend/tests/flexible-heredoc-error13.phpt index f26b04e460..46d6371b21 100644 --- a/Zend/tests/flexible-heredoc-error13.phpt +++ b/Zend/tests/flexible-heredoc-error13.phpt @@ -10,4 +10,4 @@ b ?> --EXPECTF-- -Parse error: Invalid body indentation level (expecting an indentation level of at least 1) in %s on line 5
\ No newline at end of file +Parse error: Invalid body indentation level (expecting an indentation level of at least 1) in %s on line 5 diff --git a/Zend/tests/flexible-heredoc-error2.phpt b/Zend/tests/flexible-heredoc-error2.phpt index 28e4d74a10..ad410d6b2a 100644 --- a/Zend/tests/flexible-heredoc-error2.phpt +++ b/Zend/tests/flexible-heredoc-error2.phpt @@ -11,4 +11,4 @@ echo <<<END ?> --EXPECTF-- -Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d
\ No newline at end of file +Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d diff --git a/Zend/tests/flexible-heredoc-error3.phpt b/Zend/tests/flexible-heredoc-error3.phpt index 751f6b7926..e0303f1924 100644 --- a/Zend/tests/flexible-heredoc-error3.phpt +++ b/Zend/tests/flexible-heredoc-error3.phpt @@ -11,4 +11,4 @@ echo <<<END ?> --EXPECTF-- -Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d
\ No newline at end of file +Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d diff --git a/Zend/tests/flexible-heredoc-error4.phpt b/Zend/tests/flexible-heredoc-error4.phpt index 4542b015b8..db3454c9c0 100644 --- a/Zend/tests/flexible-heredoc-error4.phpt +++ b/Zend/tests/flexible-heredoc-error4.phpt @@ -11,4 +11,4 @@ echo <<<END ?> --EXPECTF-- -Parse error: Invalid body indentation level (expecting an indentation level of at least 5) in %s on line %d
\ No newline at end of file +Parse error: Invalid body indentation level (expecting an indentation level of at least 5) in %s on line %d diff --git a/Zend/tests/flexible-heredoc-error5.phpt b/Zend/tests/flexible-heredoc-error5.phpt index fdd6e5c950..79102d76a4 100644 --- a/Zend/tests/flexible-heredoc-error5.phpt +++ b/Zend/tests/flexible-heredoc-error5.phpt @@ -8,4 +8,4 @@ echo <<<END ?> --EXPECTF-- -Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d
\ No newline at end of file +Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d diff --git a/Zend/tests/flexible-heredoc-error6.phpt b/Zend/tests/flexible-heredoc-error6.phpt index c2daa72207..42fb36ddc9 100644 --- a/Zend/tests/flexible-heredoc-error6.phpt +++ b/Zend/tests/flexible-heredoc-error6.phpt @@ -7,4 +7,4 @@ Note: the closing ?> has been deliberately elided. echo <<<END --EXPECTF-- -Parse error: syntax error, unexpected end of file in %s on line %d
\ No newline at end of file +Parse error: syntax error, unexpected end of file in %s on line %d diff --git a/Zend/tests/flexible-heredoc-error7.phpt b/Zend/tests/flexible-heredoc-error7.phpt index a8016547b1..ef52490305 100644 --- a/Zend/tests/flexible-heredoc-error7.phpt +++ b/Zend/tests/flexible-heredoc-error7.phpt @@ -6,6 +6,5 @@ Note: the closing ?> has been deliberately elided. <?php echo <<<END - --EXPECTF-- -Parse error: syntax error, unexpected end of file, expecting variable (T_VARIABLE) or heredoc end (T_END_HEREDOC) or ${ (T_DOLLAR_OPEN_CURLY_BRACES) or {$ (T_CURLY_OPEN) in %s on line %d
\ No newline at end of file +Parse error: syntax error, unexpected end of file, expecting variable (T_VARIABLE) or heredoc end (T_END_HEREDOC) or ${ (T_DOLLAR_OPEN_CURLY_BRACES) or {$ (T_CURLY_OPEN) in %s on line %d diff --git a/Zend/tests/flexible-heredoc-error8.phpt b/Zend/tests/flexible-heredoc-error8.phpt index 47e4457637..6140e273f4 100644 --- a/Zend/tests/flexible-heredoc-error8.phpt +++ b/Zend/tests/flexible-heredoc-error8.phpt @@ -9,4 +9,4 @@ Flexible heredoc syntax error 8: don't interpret \t as indentation ?> --EXPECTF-- -Parse error: Invalid body indentation level (expecting an indentation level of at least 1) in %s on line %d
\ No newline at end of file +Parse error: Invalid body indentation level (expecting an indentation level of at least 1) in %s on line %d diff --git a/Zend/tests/flexible-heredoc-error9.phpt b/Zend/tests/flexible-heredoc-error9.phpt index 70777f26d1..c98cc996c5 100644 --- a/Zend/tests/flexible-heredoc-error9.phpt +++ b/Zend/tests/flexible-heredoc-error9.phpt @@ -11,4 +11,4 @@ $var ?> --EXPECTF-- -Parse error: Invalid body indentation level (expecting an indentation level of at least 2) in %s on line %d
\ No newline at end of file +Parse error: Invalid body indentation level (expecting an indentation level of at least 2) in %s on line %d diff --git a/Zend/tests/flexible-heredoc-nowdoc.phpt b/Zend/tests/flexible-heredoc-nowdoc.phpt index 9f4e19a34b..15d42a5be9 100644 --- a/Zend/tests/flexible-heredoc-nowdoc.phpt +++ b/Zend/tests/flexible-heredoc-nowdoc.phpt @@ -125,4 +125,4 @@ e e string(3) "Bar" string(4) " -Bar"
\ No newline at end of file +Bar" diff --git a/Zend/tests/flexible-nowdoc-error1.phpt b/Zend/tests/flexible-nowdoc-error1.phpt index 5c086d2abd..95627c0937 100644 --- a/Zend/tests/flexible-nowdoc-error1.phpt +++ b/Zend/tests/flexible-nowdoc-error1.phpt @@ -11,4 +11,4 @@ echo <<<'END' ?> --EXPECTF-- -Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d
\ No newline at end of file +Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d diff --git a/Zend/tests/flexible-nowdoc-error2.phpt b/Zend/tests/flexible-nowdoc-error2.phpt index e6bd544341..0cc7330464 100644 --- a/Zend/tests/flexible-nowdoc-error2.phpt +++ b/Zend/tests/flexible-nowdoc-error2.phpt @@ -11,4 +11,4 @@ echo <<<'END' ?> --EXPECTF-- -Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d
\ No newline at end of file +Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d diff --git a/Zend/tests/flexible-nowdoc-error3.phpt b/Zend/tests/flexible-nowdoc-error3.phpt index c50dd4fa4a..8d888df9ba 100644 --- a/Zend/tests/flexible-nowdoc-error3.phpt +++ b/Zend/tests/flexible-nowdoc-error3.phpt @@ -11,4 +11,4 @@ echo <<<'END' ?> --EXPECTF-- -Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d
\ No newline at end of file +Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d diff --git a/Zend/tests/flexible-nowdoc-error4.phpt b/Zend/tests/flexible-nowdoc-error4.phpt index 650a9a94f7..f8155656fc 100644 --- a/Zend/tests/flexible-nowdoc-error4.phpt +++ b/Zend/tests/flexible-nowdoc-error4.phpt @@ -11,4 +11,4 @@ echo <<<'END' ?> --EXPECTF-- -Parse error: Invalid body indentation level (expecting an indentation level of at least 5) in %s on line %d
\ No newline at end of file +Parse error: Invalid body indentation level (expecting an indentation level of at least 5) in %s on line %d diff --git a/Zend/tests/flexible-nowdoc-error5.phpt b/Zend/tests/flexible-nowdoc-error5.phpt index 7579c10b72..08c8fde79b 100644 --- a/Zend/tests/flexible-nowdoc-error5.phpt +++ b/Zend/tests/flexible-nowdoc-error5.phpt @@ -8,4 +8,4 @@ echo <<<'END' ?> --EXPECTF-- -Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d
\ No newline at end of file +Parse error: Invalid indentation - tabs and spaces cannot be mixed in %s on line %d diff --git a/Zend/tests/flexible-nowdoc-error6.phpt b/Zend/tests/flexible-nowdoc-error6.phpt index e4f9ded844..4c4dc7f078 100644 --- a/Zend/tests/flexible-nowdoc-error6.phpt +++ b/Zend/tests/flexible-nowdoc-error6.phpt @@ -7,4 +7,4 @@ Note: the closing ?> has been deliberately elided. echo <<<'END' --EXPECTF-- -Parse error: syntax error, unexpected end of file in %s on line %d
\ No newline at end of file +Parse error: syntax error, unexpected end of file in %s on line %d diff --git a/Zend/tests/flexible-nowdoc-error7.phpt b/Zend/tests/flexible-nowdoc-error7.phpt index d2cdc86713..d68dab85b6 100644 --- a/Zend/tests/flexible-nowdoc-error7.phpt +++ b/Zend/tests/flexible-nowdoc-error7.phpt @@ -6,6 +6,5 @@ Note: the closing ?> has been deliberately elided. <?php echo <<<'END' - --EXPECTF-- -Parse error: syntax error, unexpected end of file, expecting variable (T_VARIABLE) or heredoc end (T_END_HEREDOC) or ${ (T_DOLLAR_OPEN_CURLY_BRACES) or {$ (T_CURLY_OPEN) in %s on line %d
\ No newline at end of file +Parse error: syntax error, unexpected end of file, expecting variable (T_VARIABLE) or heredoc end (T_END_HEREDOC) or ${ (T_DOLLAR_OPEN_CURLY_BRACES) or {$ (T_CURLY_OPEN) in %s on line %d diff --git a/Zend/tests/flexible-nowdoc-error8.phpt b/Zend/tests/flexible-nowdoc-error8.phpt index 300b3b8d55..ba6a2b85d8 100644 --- a/Zend/tests/flexible-nowdoc-error8.phpt +++ b/Zend/tests/flexible-nowdoc-error8.phpt @@ -8,4 +8,4 @@ eval('<<<\'end\' ?> --EXPECTF-- -Parse error: syntax error, unexpected end of file, expecting variable (T_VARIABLE) or heredoc end (T_END_HEREDOC) or ${ (T_DOLLAR_OPEN_CURLY_BRACES) or {$ (T_CURLY_OPEN) in %s on line %d
\ No newline at end of file +Parse error: syntax error, unexpected end of file, expecting variable (T_VARIABLE) or heredoc end (T_END_HEREDOC) or ${ (T_DOLLAR_OPEN_CURLY_BRACES) or {$ (T_CURLY_OPEN) in %s on line %d diff --git a/Zend/tests/foreach_012.phpt b/Zend/tests/foreach_012.phpt index 5e5538cd4d..517e0ac943 100644 --- a/Zend/tests/foreach_012.phpt +++ b/Zend/tests/foreach_012.phpt @@ -15,4 +15,4 @@ foreach($a as &$v) { 2 3 14 -15
\ No newline at end of file +15 diff --git a/Zend/tests/foreach_015.phpt b/Zend/tests/foreach_015.phpt index adc8085f34..b7482b66a0 100644 --- a/Zend/tests/foreach_015.phpt +++ b/Zend/tests/foreach_015.phpt @@ -15,4 +15,4 @@ var_dump($a); 3 4 array(0) { -}
\ No newline at end of file +} diff --git a/Zend/tests/function_arguments/argument_count_correct.phpt b/Zend/tests/function_arguments/argument_count_correct.phpt index 44a87b8ba8..9c73b93520 100644 --- a/Zend/tests/function_arguments/argument_count_correct.phpt +++ b/Zend/tests/function_arguments/argument_count_correct.phpt @@ -17,4 +17,4 @@ fclose($fp); echo "done"; --EXPECT-- -done
\ No newline at end of file +done diff --git a/Zend/tests/function_arguments/argument_count_correct_strict.phpt b/Zend/tests/function_arguments/argument_count_correct_strict.phpt index bfce61f0c9..feed8b5964 100644 --- a/Zend/tests/function_arguments/argument_count_correct_strict.phpt +++ b/Zend/tests/function_arguments/argument_count_correct_strict.phpt @@ -17,4 +17,4 @@ fclose($fp); echo "done"; --EXPECT-- -done
\ No newline at end of file +done diff --git a/Zend/tests/function_arguments/argument_count_incorrect_internal.phpt b/Zend/tests/function_arguments/argument_count_incorrect_internal.phpt index 9d8d8bb7db..a8ba71c0bf 100644 --- a/Zend/tests/function_arguments/argument_count_incorrect_internal.phpt +++ b/Zend/tests/function_arguments/argument_count_incorrect_internal.phpt @@ -7,4 +7,4 @@ array_diff([]); --EXPECTF-- Warning: substr() expects at least 2 parameters, 1 given in %s -Warning: array_diff(): at least 2 parameters are required, 1 given in %s
\ No newline at end of file +Warning: array_diff(): at least 2 parameters are required, 1 given in %s diff --git a/Zend/tests/function_arguments/argument_count_incorrect_internal_strict.phpt b/Zend/tests/function_arguments/argument_count_incorrect_internal_strict.phpt index 33748649da..8775bece88 100644 --- a/Zend/tests/function_arguments/argument_count_incorrect_internal_strict.phpt +++ b/Zend/tests/function_arguments/argument_count_incorrect_internal_strict.phpt @@ -15,4 +15,4 @@ array_diff([]); ArgumentCountError substr() expects at least 2 parameters, 1 given -Warning: array_diff(): at least 2 parameters are required, 1 given in %s
\ No newline at end of file +Warning: array_diff(): at least 2 parameters are required, 1 given in %s diff --git a/Zend/tests/function_arguments/argument_count_incorrect_userland.phpt b/Zend/tests/function_arguments/argument_count_incorrect_userland.phpt index 97faa4eb5c..94525c85b7 100644 --- a/Zend/tests/function_arguments/argument_count_incorrect_userland.phpt +++ b/Zend/tests/function_arguments/argument_count_incorrect_userland.phpt @@ -41,4 +41,4 @@ Too few arguments to function bar(), 1 passed in %s and exactly 2 expected ArgumentCountError Too few arguments to function bat(), 1 passed in %s and exactly 2 expected ArgumentCountError -Too few arguments to function bat(), 1 passed in %s and exactly 2 expected
\ No newline at end of file +Too few arguments to function bat(), 1 passed in %s and exactly 2 expected diff --git a/Zend/tests/function_arguments_001.phpt b/Zend/tests/function_arguments_001.phpt index 8e3d34d31d..14f71afc0e 100644 --- a/Zend/tests/function_arguments_001.phpt +++ b/Zend/tests/function_arguments_001.phpt @@ -6,4 +6,3 @@ function foo($arg1 string) {} ?> --EXPECTF-- Parse error: %s error, %s)%s in %sfunction_arguments_001.php on line %d - diff --git a/Zend/tests/function_arguments_002.phpt b/Zend/tests/function_arguments_002.phpt index 1b5b7bd908..c9e5a6ec4a 100644 --- a/Zend/tests/function_arguments_002.phpt +++ b/Zend/tests/function_arguments_002.phpt @@ -6,4 +6,3 @@ function foo($arg1/) {} ?> --EXPECTF-- Parse error: %s error, %s)%s in %sfunction_arguments_002.php on line %d - diff --git a/Zend/tests/function_exists_error.phpt b/Zend/tests/function_exists_error.phpt index 8ce8a92885..f07ac53148 100644 --- a/Zend/tests/function_exists_error.phpt +++ b/Zend/tests/function_exists_error.phpt @@ -33,4 +33,3 @@ Too few arguments Warning: function_exists() expects exactly 1 parameter, 0 given in %s on line %d NULL ===Done=== - diff --git a/Zend/tests/function_exists_variation1.phpt b/Zend/tests/function_exists_variation1.phpt index fc26f1e80e..bd74e2f762 100644 --- a/Zend/tests/function_exists_variation1.phpt +++ b/Zend/tests/function_exists_variation1.phpt @@ -135,4 +135,4 @@ bool(false) -- Iteration 22 -- bool(false) ===Done=== -
\ No newline at end of file + diff --git a/Zend/tests/gc_038.phpt b/Zend/tests/gc_038.phpt index 7bb7b7a08e..737025ae2d 100644 --- a/Zend/tests/gc_038.phpt +++ b/Zend/tests/gc_038.phpt @@ -130,4 +130,3 @@ test_concat(); ^= 1 **= 1 .= 1 - diff --git a/Zend/tests/generators/basic_yield_from_exception_handling.phpt b/Zend/tests/generators/basic_yield_from_exception_handling.phpt index c696f6486d..6b622847cd 100644 --- a/Zend/tests/generators/basic_yield_from_exception_handling.phpt +++ b/Zend/tests/generators/basic_yield_from_exception_handling.phpt @@ -56,4 +56,3 @@ Exception: 4 in %s:%d Stack trace: #0 {main} bool(false) - diff --git a/Zend/tests/generators/bug71013.phpt b/Zend/tests/generators/bug71013.phpt index 6ede86e3ba..1b7bdd7935 100644 --- a/Zend/tests/generators/bug71013.phpt +++ b/Zend/tests/generators/bug71013.phpt @@ -46,4 +46,3 @@ Destructing FooBar NULL Unsetting $x Finishing bar() - diff --git a/Zend/tests/generators/bug71441.phpt b/Zend/tests/generators/bug71441.phpt index 3a103888b0..14395d2402 100644 --- a/Zend/tests/generators/bug71441.phpt +++ b/Zend/tests/generators/bug71441.phpt @@ -26,4 +26,3 @@ var_dump($gen->getReturn()); int(2002) Ok string(7) "Success" - diff --git a/Zend/tests/generators/bug71601.phpt b/Zend/tests/generators/bug71601.phpt index e3f21692e7..09da2a5077 100644 --- a/Zend/tests/generators/bug71601.phpt +++ b/Zend/tests/generators/bug71601.phpt @@ -37,4 +37,3 @@ int(1) Inner finally Finally Done - diff --git a/Zend/tests/generators/errors/non_ref_generator_iterated_by_ref_error.phpt b/Zend/tests/generators/errors/non_ref_generator_iterated_by_ref_error.phpt index 4ea1b6505c..e7fc2647be 100644 --- a/Zend/tests/generators/errors/non_ref_generator_iterated_by_ref_error.phpt +++ b/Zend/tests/generators/errors/non_ref_generator_iterated_by_ref_error.phpt @@ -14,4 +14,3 @@ Fatal error: Uncaught Exception: You can only iterate a generator by-reference i Stack trace: #0 {main} thrown in %s on line %d - diff --git a/Zend/tests/generators/generator_closure_unused.phpt b/Zend/tests/generators/generator_closure_unused.phpt index 9acf8f9d93..6466c4c2e9 100644 --- a/Zend/tests/generators/generator_closure_unused.phpt +++ b/Zend/tests/generators/generator_closure_unused.phpt @@ -6,4 +6,4 @@ Closures can be unused generators echo "ok\n"; ?> --EXPECT-- -ok
\ No newline at end of file +ok diff --git a/Zend/tests/generators/generator_return_without_value.phpt b/Zend/tests/generators/generator_return_without_value.phpt index dfea5aa78d..c507ebeb9c 100644 --- a/Zend/tests/generators/generator_return_without_value.phpt +++ b/Zend/tests/generators/generator_return_without_value.phpt @@ -40,4 +40,4 @@ object(Generator)#%d (0) { object(Generator)#%d (0) { } object(Generator)#%d (0) { -}
\ No newline at end of file +} diff --git a/Zend/tests/generators/generator_throwing_in_foreach.phpt b/Zend/tests/generators/generator_throwing_in_foreach.phpt index 44a867404f..a407b01920 100644 --- a/Zend/tests/generators/generator_throwing_in_foreach.phpt +++ b/Zend/tests/generators/generator_throwing_in_foreach.phpt @@ -17,4 +17,3 @@ Stack trace: #0 %s(%d): gen() #1 {main} thrown in %s on line %d - diff --git a/Zend/tests/generators/generator_with_arg_unpacking.phpt b/Zend/tests/generators/generator_with_arg_unpacking.phpt index edf0bafd31..316fc490df 100644 --- a/Zend/tests/generators/generator_with_arg_unpacking.phpt +++ b/Zend/tests/generators/generator_with_arg_unpacking.phpt @@ -9,4 +9,4 @@ $g = call_user_func_array(function() { yield; }, range(1, 16384)); echo "OK\n"; ?> --EXPECT-- -OK
\ No newline at end of file +OK diff --git a/Zend/tests/generators/multiple_yield_from_on_same_generator.phpt b/Zend/tests/generators/multiple_yield_from_on_same_generator.phpt index f56a325684..52dbea89b2 100644 --- a/Zend/tests/generators/multiple_yield_from_on_same_generator.phpt +++ b/Zend/tests/generators/multiple_yield_from_on_same_generator.phpt @@ -41,4 +41,3 @@ int(3) int(5) NULL bool(false) - diff --git a/Zend/tests/generators/recursive_yield_from.phpt b/Zend/tests/generators/recursive_yield_from.phpt index dbf2c948ea..2fc1e0a591 100644 --- a/Zend/tests/generators/recursive_yield_from.phpt +++ b/Zend/tests/generators/recursive_yield_from.phpt @@ -31,4 +31,3 @@ int(5) int(7) int(8) int(2) - diff --git a/Zend/tests/generators/throw_rethrow.phpt b/Zend/tests/generators/throw_rethrow.phpt index f9e3f78f48..8fbc6743b8 100644 --- a/Zend/tests/generators/throw_rethrow.phpt +++ b/Zend/tests/generators/throw_rethrow.phpt @@ -31,4 +31,3 @@ Stack trace: #1 %s(%d): Generator->throw(Object(RuntimeException)) #2 {main} thrown in %s on line %d - diff --git a/Zend/tests/generators/yield_from_backtrace.phpt b/Zend/tests/generators/yield_from_backtrace.phpt index 18781e7551..e5d79723e7 100644 --- a/Zend/tests/generators/yield_from_backtrace.phpt +++ b/Zend/tests/generators/yield_from_backtrace.phpt @@ -46,4 +46,3 @@ int(2) int(3) #0 gen() #1 Generator->next() called at [%s:%d] - diff --git a/Zend/tests/generators/yield_from_multi_tree.phpt b/Zend/tests/generators/yield_from_multi_tree.phpt index 91ae80e909..9bec138149 100644 --- a/Zend/tests/generators/yield_from_multi_tree.phpt +++ b/Zend/tests/generators/yield_from_multi_tree.phpt @@ -329,4 +329,3 @@ int(125) int(126) int(127) int(128) - diff --git a/Zend/tests/generators/yield_from_multi_tree_exception.phpt b/Zend/tests/generators/yield_from_multi_tree_exception.phpt index 2bdeedba7d..4ff2e4e41f 100644 --- a/Zend/tests/generators/yield_from_multi_tree_exception.phpt +++ b/Zend/tests/generators/yield_from_multi_tree_exception.phpt @@ -75,4 +75,3 @@ Stack trace: #0 [internal function]: gen(Object(Generator), 1) #1 %s(%d): Generator->current() #2 {main} - diff --git a/Zend/tests/generators/yield_unary_precedence.phpt b/Zend/tests/generators/yield_unary_precedence.phpt index 9357168c80..54eb0feb5f 100644 --- a/Zend/tests/generators/yield_unary_precedence.phpt +++ b/Zend/tests/generators/yield_unary_precedence.phpt @@ -14,7 +14,6 @@ for ($gen = gen(); $gen->valid(); $gen->send(1)) { } ?> --EXPECT-- - int(1) int(1) @@ -23,4 +22,3 @@ int(1) NULL int(-1) - diff --git a/Zend/tests/grammar/regression_001.phpt b/Zend/tests/grammar/regression_001.phpt index 727e11cc45..657b36b853 100644 --- a/Zend/tests/grammar/regression_001.phpt +++ b/Zend/tests/grammar/regression_001.phpt @@ -22,9 +22,7 @@ Foo:: ); echo "\nDone\n"; - --EXPECT-- - Foo::function Foo::function Foo::function diff --git a/Zend/tests/grammar/regression_002.phpt b/Zend/tests/grammar/regression_002.phpt index 06bce25d70..52ca62d6ba 100644 --- a/Zend/tests/grammar/regression_002.phpt +++ b/Zend/tests/grammar/regression_002.phpt @@ -14,7 +14,6 @@ var_dump(Foo:: CLASS); var_dump(Foo:: CLASS); - --EXPECT-- string(3) "Foo" string(3) "Foo" diff --git a/Zend/tests/grammar/regression_004.phpt b/Zend/tests/grammar/regression_004.phpt index edb32032ea..f032fc882d 100644 --- a/Zend/tests/grammar/regression_004.phpt +++ b/Zend/tests/grammar/regression_004.phpt @@ -10,6 +10,5 @@ class Obj } function echo(){} // not valid - --EXPECTF-- Parse error: syntax error, unexpected 'echo' (T_ECHO), expecting %s in %s on line 9 diff --git a/Zend/tests/grammar/regression_005.phpt b/Zend/tests/grammar/regression_005.phpt index 7704375d6e..ad83ee717d 100644 --- a/Zend/tests/grammar/regression_005.phpt +++ b/Zend/tests/grammar/regression_005.phpt @@ -9,6 +9,5 @@ class Obj } const return = 'nope'; - --EXPECTF-- Parse error: syntax error, unexpected 'return' (T_RETURN), expecting identifier (T_STRING) in %s on line 8 diff --git a/Zend/tests/grammar/regression_006.phpt b/Zend/tests/grammar/regression_006.phpt index 036ffa7445..072148ca56 100644 --- a/Zend/tests/grammar/regression_006.phpt +++ b/Zend/tests/grammar/regression_006.phpt @@ -19,7 +19,6 @@ echo Obj:: USE, PHP_EOL; echo "\nDone\n"; - --EXPECT-- declare return diff --git a/Zend/tests/grammar/regression_007.phpt b/Zend/tests/grammar/regression_007.phpt index d75670c7ec..b691ccaef9 100644 --- a/Zend/tests/grammar/regression_007.phpt +++ b/Zend/tests/grammar/regression_007.phpt @@ -28,7 +28,6 @@ Foo::{'new'}(); var_dump(Foo::use); echo "\nDone\n"; - --EXPECT-- Foo::new Foo::new diff --git a/Zend/tests/grammar/regression_008.phpt b/Zend/tests/grammar/regression_008.phpt index e4259649eb..57ae510722 100644 --- a/Zend/tests/grammar/regression_008.phpt +++ b/Zend/tests/grammar/regression_008.phpt @@ -12,10 +12,7 @@ $friday = new Friday; echo "$friday->require ($friday->require) {$friday->require}", PHP_EOL; echo "\nDone\n"; - - --EXPECT-- - fun (fun) fun Done diff --git a/Zend/tests/grammar/regression_009.phpt b/Zend/tests/grammar/regression_009.phpt index 6b14c33081..45fc81bcb8 100644 --- a/Zend/tests/grammar/regression_009.phpt +++ b/Zend/tests/grammar/regression_009.phpt @@ -12,7 +12,5 @@ class Foo } echo PHP_EOL, "Done", PHP_EOL; - --EXPECT-- - Done diff --git a/Zend/tests/grammar/regression_010.phpt b/Zend/tests/grammar/regression_010.phpt index 90b864f79b..e5e65e3a85 100644 --- a/Zend/tests/grammar/regression_010.phpt +++ b/Zend/tests/grammar/regression_010.phpt @@ -8,7 +8,5 @@ interface A{} class B implements\A {} echo "Done", PHP_EOL; - --EXPECT-- - Done diff --git a/Zend/tests/grammar/regression_012.phpt b/Zend/tests/grammar/regression_012.phpt index 3b4925afa6..817f337a5c 100644 --- a/Zend/tests/grammar/regression_012.phpt +++ b/Zend/tests/grammar/regression_012.phpt @@ -9,5 +9,4 @@ class A { ?> --EXPECTF-- - Parse error: syntax error, unexpected 'FOREACH' (T_FOREACH), expecting ']' in %s on line %d diff --git a/Zend/tests/grammar/regression_013.phpt b/Zend/tests/grammar/regression_013.phpt index 0379dd26e3..9f5b3e16f1 100644 --- a/Zend/tests/grammar/regression_013.phpt +++ b/Zend/tests/grammar/regression_013.phpt @@ -9,5 +9,4 @@ echo "Done", PHP_EOL; ?> --EXPECT-- - Done diff --git a/Zend/tests/grammar/semi_reserved_001.phpt b/Zend/tests/grammar/semi_reserved_001.phpt index 3abb3a2507..68b35d3f22 100644 --- a/Zend/tests/grammar/semi_reserved_001.phpt +++ b/Zend/tests/grammar/semi_reserved_001.phpt @@ -161,7 +161,6 @@ $obj->__DIR__(); $obj->__NAMESPACE__(); echo "\nDone\n"; - --EXPECT-- Obj::empty Obj::callable diff --git a/Zend/tests/grammar/semi_reserved_002.phpt b/Zend/tests/grammar/semi_reserved_002.phpt index 6a7dc79b74..4aa0f27e5e 100644 --- a/Zend/tests/grammar/semi_reserved_002.phpt +++ b/Zend/tests/grammar/semi_reserved_002.phpt @@ -159,7 +159,6 @@ Obj::__DIR__(); Obj::__NAMESPACE__(); echo "\nDone\n"; - --EXPECT-- Obj::empty Obj::callable diff --git a/Zend/tests/grammar/semi_reserved_004.phpt b/Zend/tests/grammar/semi_reserved_004.phpt index b3889b0bae..5a625a608b 100644 --- a/Zend/tests/grammar/semi_reserved_004.phpt +++ b/Zend/tests/grammar/semi_reserved_004.phpt @@ -161,7 +161,6 @@ echo Obj::$__NAMESPACE__, PHP_EOL; echo Obj::$__halt_compiler, PHP_EOL; echo "\nDone\n"; - --EXPECT-- empty callable diff --git a/Zend/tests/grammar/semi_reserved_005.phpt b/Zend/tests/grammar/semi_reserved_005.phpt index 5330828633..2cf7709b15 100644 --- a/Zend/tests/grammar/semi_reserved_005.phpt +++ b/Zend/tests/grammar/semi_reserved_005.phpt @@ -157,7 +157,6 @@ echo Obj::__DIR__, PHP_EOL; echo Obj::__NAMESPACE__, PHP_EOL; echo "\nDone\n"; - --EXPECT-- empty callable diff --git a/Zend/tests/grammar/semi_reserved_006.phpt b/Zend/tests/grammar/semi_reserved_006.phpt index 8205435a5f..634ba51285 100644 --- a/Zend/tests/grammar/semi_reserved_006.phpt +++ b/Zend/tests/grammar/semi_reserved_006.phpt @@ -58,7 +58,6 @@ Foo::byebye(); Foo::farewell(); echo "\nDone\n"; - --EXPECT-- TraitA::catch TraitA::list diff --git a/Zend/tests/grammar/semi_reserved_007.phpt b/Zend/tests/grammar/semi_reserved_007.phpt index b1d6daeb9d..64e55a8e2a 100644 --- a/Zend/tests/grammar/semi_reserved_007.phpt +++ b/Zend/tests/grammar/semi_reserved_007.phpt @@ -25,7 +25,6 @@ class Bar extends Foo { new Bar; echo "\nDone\n"; - --EXPECT-- From Foo::__construct: self @@ -34,4 +33,4 @@ From Bar::__construct: self parent -Done
\ No newline at end of file +Done diff --git a/Zend/tests/grammar/semi_reserved_008.phpt b/Zend/tests/grammar/semi_reserved_008.phpt index c10f96b6de..fe478323f8 100644 --- a/Zend/tests/grammar/semi_reserved_008.phpt +++ b/Zend/tests/grammar/semi_reserved_008.phpt @@ -61,7 +61,6 @@ Foo /**/ attempt(); echo PHP_EOL, "Done", PHP_EOL; - --EXPECT-- TraitB::try diff --git a/Zend/tests/grammar/semi_reserved_009.phpt b/Zend/tests/grammar/semi_reserved_009.phpt index 05830f80ed..98ff4ee8f0 100644 --- a/Zend/tests/grammar/semi_reserved_009.phpt +++ b/Zend/tests/grammar/semi_reserved_009.phpt @@ -18,7 +18,6 @@ class Foo Foo::try(); echo PHP_EOL, "Done", PHP_EOL; - --EXPECT-- TraitA::as diff --git a/Zend/tests/grammar/semi_reserved_010.phpt b/Zend/tests/grammar/semi_reserved_010.phpt index ad92fcfddc..951db73b85 100644 --- a/Zend/tests/grammar/semi_reserved_010.phpt +++ b/Zend/tests/grammar/semi_reserved_010.phpt @@ -24,7 +24,6 @@ class Foo Foo::insteadof(); echo PHP_EOL, "Done", PHP_EOL; - --EXPECT-- TraitB::insteadof diff --git a/Zend/tests/halt_compiler1.phpt b/Zend/tests/halt_compiler1.phpt index 4987b29b2c..77b3696f22 100644 --- a/Zend/tests/halt_compiler1.phpt +++ b/Zend/tests/halt_compiler1.phpt @@ -5,4 +5,4 @@ __HALT_COMPILER(); ?> ===DONE=== --EXPECT-- -testint(73)
\ No newline at end of file +testint(73) diff --git a/Zend/tests/halt_compiler2.phpt b/Zend/tests/halt_compiler2.phpt index 0ced2142cd..da8ac6cae9 100644 --- a/Zend/tests/halt_compiler2.phpt +++ b/Zend/tests/halt_compiler2.phpt @@ -20,4 +20,4 @@ unlink(dirname(__FILE__) . '/test2.php'); --EXPECT-- testint(73) test2int(74) -==DONE==
\ No newline at end of file +==DONE== diff --git a/Zend/tests/halt_compiler3.phpt b/Zend/tests/halt_compiler3.phpt index 6ee16f79b9..7bd7410c73 100644 --- a/Zend/tests/halt_compiler3.phpt +++ b/Zend/tests/halt_compiler3.phpt @@ -7,4 +7,4 @@ define ('__COMPILER_HALT_OFFSET__', 1); ==DONE== --EXPECTF-- Notice: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d -==DONE==
\ No newline at end of file +==DONE== diff --git a/Zend/tests/halt_compiler4.phpt b/Zend/tests/halt_compiler4.phpt index 43e532ce7d..53a4fc76f9 100644 --- a/Zend/tests/halt_compiler4.phpt +++ b/Zend/tests/halt_compiler4.phpt @@ -7,4 +7,4 @@ __HALT_COMPILER(); ?> ==DONE== --EXPECTF-- -Notice: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d
\ No newline at end of file +Notice: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d diff --git a/Zend/tests/indirect_call_array_003.phpt b/Zend/tests/indirect_call_array_003.phpt index f1dde491f6..b4b713ff64 100644 --- a/Zend/tests/indirect_call_array_003.phpt +++ b/Zend/tests/indirect_call_array_003.phpt @@ -36,4 +36,3 @@ From foo::__call: string(3) "abc" object(foo)#%d (0) { } - diff --git a/Zend/tests/int_special_values.phpt b/Zend/tests/int_special_values.phpt index e1a50b6ecb..eedb9ab2c0 100644 --- a/Zend/tests/int_special_values.phpt +++ b/Zend/tests/int_special_values.phpt @@ -34,4 +34,4 @@ float(-0) int(0) float(NAN) -int(0)
\ No newline at end of file +int(0) diff --git a/Zend/tests/int_static_prop_name.phpt b/Zend/tests/int_static_prop_name.phpt index bfdfc42052..cb47bb6d0a 100644 --- a/Zend/tests/int_static_prop_name.phpt +++ b/Zend/tests/int_static_prop_name.phpt @@ -40,4 +40,3 @@ int(24) Access to undeclared static property: Foo::$42 Access to undeclared static property: Foo::$42 Access to undeclared static property: Foo::$42 - diff --git a/Zend/tests/list_keyed_undefined.phpt b/Zend/tests/list_keyed_undefined.phpt index a18e3b4d20..3d1939c5ac 100644 --- a/Zend/tests/list_keyed_undefined.phpt +++ b/Zend/tests/list_keyed_undefined.phpt @@ -14,7 +14,6 @@ var_dump($five, $duke); ?> --EXPECTF-- - Notice: Undefined offset: 5 in %s on line %d Notice: Undefined index: duke in %s on line %d diff --git a/Zend/tests/lsb_006.phpt b/Zend/tests/lsb_006.phpt index 84cd22a995..b10b742463 100644 --- a/Zend/tests/lsb_006.phpt +++ b/Zend/tests/lsb_006.phpt @@ -10,4 +10,3 @@ class Foo extends static { ==DONE== --EXPECTF-- Parse error: %s error,%sexpecting %s in %s on line %d - diff --git a/Zend/tests/lsb_007.phpt b/Zend/tests/lsb_007.phpt index 607f8efeb4..c28e815be0 100644 --- a/Zend/tests/lsb_007.phpt +++ b/Zend/tests/lsb_007.phpt @@ -10,4 +10,3 @@ class Foo implements static { ==DONE== --EXPECTF-- Parse error: %s error,%sexpecting %s in %s on line %d - diff --git a/Zend/tests/lsb_008.phpt b/Zend/tests/lsb_008.phpt index b700e2df94..79f906bd7e 100644 --- a/Zend/tests/lsb_008.phpt +++ b/Zend/tests/lsb_008.phpt @@ -6,4 +6,3 @@ class static { } --EXPECTF-- Parse error: %s error,%sexpecting %s in %s on line %d - diff --git a/Zend/tests/lsb_009.phpt b/Zend/tests/lsb_009.phpt index d8d41817c8..9b1686391b 100644 --- a/Zend/tests/lsb_009.phpt +++ b/Zend/tests/lsb_009.phpt @@ -6,4 +6,3 @@ interface static { } --EXPECTF-- Parse error: %s error,%sexpecting %s in %s on line %d - diff --git a/Zend/tests/methods-on-non-objects-call-user-func.phpt b/Zend/tests/methods-on-non-objects-call-user-func.phpt index f76b7d43a0..027aa64c20 100644 --- a/Zend/tests/methods-on-non-objects-call-user-func.phpt +++ b/Zend/tests/methods-on-non-objects-call-user-func.phpt @@ -10,4 +10,3 @@ echo "Alive\n"; Warning: call_user_func() expects parameter 1 to be a valid callback, first array member is not a valid class name or object in %s on line %d NULL Alive - diff --git a/Zend/tests/methods-on-non-objects-catch.phpt b/Zend/tests/methods-on-non-objects-catch.phpt index 083ae75e49..a52d3a722a 100644 --- a/Zend/tests/methods-on-non-objects-catch.phpt +++ b/Zend/tests/methods-on-non-objects-catch.phpt @@ -15,7 +15,6 @@ try { echo "Alive\n"; ?> --EXPECTF-- - int(0) string(%d) "Call to a member function method() on null" Alive diff --git a/Zend/tests/methods-on-non-objects.phpt b/Zend/tests/methods-on-non-objects.phpt index 13002c94a3..0fd93fcecc 100644 --- a/Zend/tests/methods-on-non-objects.phpt +++ b/Zend/tests/methods-on-non-objects.phpt @@ -8,7 +8,6 @@ $x->method(); echo "Should not get here!\n"; ?> --EXPECTF-- - Fatal error: Uncaught Error: Call to a member function method() on null in %s:%d Stack trace: #0 {main} diff --git a/Zend/tests/multibyte/multibyte_encoding_006.phpt b/Zend/tests/multibyte/multibyte_encoding_006.phpt Binary files differindex b87b434fe4..d518c29e3e 100644 --- a/Zend/tests/multibyte/multibyte_encoding_006.phpt +++ b/Zend/tests/multibyte/multibyte_encoding_006.phpt diff --git a/Zend/tests/nested_method_and_function.phpt b/Zend/tests/nested_method_and_function.phpt index 3fa1b18da1..c63c601eaf 100644 --- a/Zend/tests/nested_method_and_function.phpt +++ b/Zend/tests/nested_method_and_function.phpt @@ -36,4 +36,4 @@ string(12) "Baz\Foo::bar" string(7) "Baz\Foo" string(13) "Baz\{closure}" string(13) "Baz\{closure}" -string(7) "Baz\Foo"
\ No newline at end of file +string(7) "Baz\Foo" diff --git a/Zend/tests/ns_004.phpt b/Zend/tests/ns_004.phpt index 44b618cd70..f04f662e0a 100644 --- a/Zend/tests/ns_004.phpt +++ b/Zend/tests/ns_004.phpt @@ -9,4 +9,4 @@ echo get_class(new Exception()),"\n"; Fatal error: Uncaught Error: Class 'test\ns1\Exception' not found in %sns_004.php:%d Stack trace: #0 {main} - thrown in %sns_004.php on line %d
\ No newline at end of file + thrown in %sns_004.php on line %d diff --git a/Zend/tests/ns_011.phpt b/Zend/tests/ns_011.phpt index 9ee6888a65..7aa6270a1c 100644 --- a/Zend/tests/ns_011.phpt +++ b/Zend/tests/ns_011.phpt @@ -16,7 +16,6 @@ bar(); function bar() { echo __FUNCTION__,"\n"; } - --EXPECT-- test\ns1\foo test\ns1\foo diff --git a/Zend/tests/ns_012.phpt b/Zend/tests/ns_012.phpt index 034f124924..210cba9065 100644 --- a/Zend/tests/ns_012.phpt +++ b/Zend/tests/ns_012.phpt @@ -23,7 +23,6 @@ ns3\ns1\bar(); function bar() { echo __FUNCTION__,"\n"; } - --EXPECT-- test\ns1\foo test\ns1\bar diff --git a/Zend/tests/ns_015.phpt b/Zend/tests/ns_015.phpt index ae2c818345..405d3e4518 100644 --- a/Zend/tests/ns_015.phpt +++ b/Zend/tests/ns_015.phpt @@ -11,4 +11,3 @@ function strlen($x) { echo \strlen("Hello"),"\n"; --EXPECT-- 5 - diff --git a/Zend/tests/ns_017.phpt b/Zend/tests/ns_017.phpt index 888d8e5ef4..d48afd5f01 100644 --- a/Zend/tests/ns_017.phpt +++ b/Zend/tests/ns_017.phpt @@ -11,4 +11,4 @@ function strlen($x) { $x = "strlen"; echo $x("Hello"),"\n"; --EXPECT-- -5
\ No newline at end of file +5 diff --git a/Zend/tests/ns_026.phpt b/Zend/tests/ns_026.phpt index b8f8c3f83d..530e135230 100644 --- a/Zend/tests/ns_026.phpt +++ b/Zend/tests/ns_026.phpt @@ -35,4 +35,4 @@ Func - Foo\Bar Fatal error: Uncaught Error: Call to undefined function Foo\Foo\Bar() in %sns_026.php:%d Stack trace: #0 {main} - thrown in %sns_026.php on line %d
\ No newline at end of file + thrown in %sns_026.php on line %d diff --git a/Zend/tests/ns_038.phpt b/Zend/tests/ns_038.phpt index 9cef33d82b..f514de77c9 100644 --- a/Zend/tests/ns_038.phpt +++ b/Zend/tests/ns_038.phpt @@ -15,4 +15,3 @@ Fatal error: Uncaught Error: Call to undefined method Exception::bar() in %sns_0 Stack trace: #0 {main} thrown in %sns_038.php on line 7 - diff --git a/Zend/tests/ns_041.phpt b/Zend/tests/ns_041.phpt index e1f0ba3a97..bd9dfbd093 100644 --- a/Zend/tests/ns_041.phpt +++ b/Zend/tests/ns_041.phpt @@ -12,7 +12,6 @@ echo(\test\ns1\FOO); echo(BAR); const BAR = "ok\n"; - --EXPECTF-- ok ok diff --git a/Zend/tests/ns_053.phpt b/Zend/tests/ns_053.phpt index bc5ab12cdb..dd3ff76693 100644 --- a/Zend/tests/ns_053.phpt +++ b/Zend/tests/ns_053.phpt @@ -10,4 +10,3 @@ echo \test\ns1\NAME."\n"; --EXPECT-- ns_053.php ns_053.php - diff --git a/Zend/tests/ns_057.phpt b/Zend/tests/ns_057.phpt index 639687ee0a..6c7a72f86e 100644 --- a/Zend/tests/ns_057.phpt +++ b/Zend/tests/ns_057.phpt @@ -59,4 +59,4 @@ ok Fatal error: Uncaught Error: Undefined constant 'Test\ns1\unknown' in %sns_057.php:%d Stack trace: #0 {main} - thrown in %sns_057.php on line %d
\ No newline at end of file + thrown in %sns_057.php on line %d diff --git a/Zend/tests/ns_068.phpt b/Zend/tests/ns_068.phpt index b6dc258fd3..09075f6c76 100644 --- a/Zend/tests/ns_068.phpt +++ b/Zend/tests/ns_068.phpt @@ -10,5 +10,4 @@ echo __NAMESPACE__ . "\n"; ?> ===DONE=== --EXPECTF-- - Fatal error: Namespace declaration statement has to be the very first statement or after any declare call in the script in %sns_068.php on line %d diff --git a/Zend/tests/ns_080.phpt b/Zend/tests/ns_080.phpt index 9c81c0d4c8..ce0ac07e7f 100644 --- a/Zend/tests/ns_080.phpt +++ b/Zend/tests/ns_080.phpt @@ -12,4 +12,4 @@ echo "should not echo\n"; ?> ===DONE=== --EXPECT-- -hi
\ No newline at end of file +hi diff --git a/Zend/tests/ns_082.phpt b/Zend/tests/ns_082.phpt index 3220974047..7fa770576e 100644 --- a/Zend/tests/ns_082.phpt +++ b/Zend/tests/ns_082.phpt @@ -9,4 +9,4 @@ echo "ok\n"; } ?> --EXPECT-- -ok
\ No newline at end of file +ok diff --git a/Zend/tests/ns_085.phpt b/Zend/tests/ns_085.phpt index 377da6a8dc..7755d809e3 100644 --- a/Zend/tests/ns_085.phpt +++ b/Zend/tests/ns_085.phpt @@ -24,4 +24,4 @@ foo::__construct foo\bar::__construct foo\bar::__construct foo::__construct -===DONE===
\ No newline at end of file +===DONE=== diff --git a/Zend/tests/ns_086.phpt b/Zend/tests/ns_086.phpt index 00657f6bde..ed4b8a238c 100644 --- a/Zend/tests/ns_086.phpt +++ b/Zend/tests/ns_086.phpt @@ -33,4 +33,4 @@ foo::__construct foo\bar::__construct foo\bar::__construct foo::__construct -===DONE===
\ No newline at end of file +===DONE=== diff --git a/Zend/tests/ns_089.phpt b/Zend/tests/ns_089.phpt index bb83ae7361..71c6b74a9b 100644 --- a/Zend/tests/ns_089.phpt +++ b/Zend/tests/ns_089.phpt @@ -42,7 +42,6 @@ namespace Fiz\Biz\Buz { var_dump(BOZ); var_dump(BAR); } - --EXPECT-- Foo\Bar\Baz\A::__construct Foo\Bar\Baz\B::__construct diff --git a/Zend/tests/ns_090.phpt b/Zend/tests/ns_090.phpt index 8511f1c803..166828c8cb 100644 --- a/Zend/tests/ns_090.phpt +++ b/Zend/tests/ns_090.phpt @@ -33,7 +33,6 @@ namespace Fiz\Biz\Buz { var_dump(BOZ); var_dump(BAR); } - --EXPECT-- Foo\Bar\Baz\A::__construct Foo\Bar\Baz\B::__construct diff --git a/Zend/tests/ns_091.phpt b/Zend/tests/ns_091.phpt index 5732e7e50e..ee979025d2 100644 --- a/Zend/tests/ns_091.phpt +++ b/Zend/tests/ns_091.phpt @@ -14,7 +14,6 @@ namespace Fiz\Biz\Buz { new A; new B; } - --EXPECT-- Foo\Bar\A::__construct -Foo\Bar\Baz\B::__construct
\ No newline at end of file +Foo\Bar\Baz\B::__construct diff --git a/Zend/tests/ns_092.phpt b/Zend/tests/ns_092.phpt index 21a1dd916a..5618080022 100644 --- a/Zend/tests/ns_092.phpt +++ b/Zend/tests/ns_092.phpt @@ -47,7 +47,6 @@ namespace Fiz\Biz\Buz { boz(); A(); } - --EXPECTF-- ==== MIXED ==== Foo\Bar\A::__construct diff --git a/Zend/tests/ns_093.phpt b/Zend/tests/ns_093.phpt index 6e0b937963..4452a6e175 100644 --- a/Zend/tests/ns_093.phpt +++ b/Zend/tests/ns_093.phpt @@ -20,8 +20,5 @@ use Foo\Bar\ }; echo "\nDone\n"; - - --EXPECT-- - -Done
\ No newline at end of file +Done diff --git a/Zend/tests/ns_094.phpt b/Zend/tests/ns_094.phpt index f33bf560a9..a809437a1b 100644 --- a/Zend/tests/ns_094.phpt +++ b/Zend/tests/ns_094.phpt @@ -10,6 +10,5 @@ use const Foo\Bar\{ const B, function C }; - --EXPECTF-- Parse error: syntax error, unexpected 'const' (T_CONST), expecting '}' in %s on line 7 diff --git a/Zend/tests/ns_095.phpt b/Zend/tests/ns_095.phpt index 2e1c0e229e..521926330d 100644 --- a/Zend/tests/ns_095.phpt +++ b/Zend/tests/ns_095.phpt @@ -37,7 +37,6 @@ namespace Baz { } ?> --EXPECT-- - string(14) "Foo\Bar\ClassA" string(14) "Foo\Bar\ClassB" string(14) "Foo\Bar\ClassC" diff --git a/Zend/tests/ns_trailing_comma_error_01.phpt b/Zend/tests/ns_trailing_comma_error_01.phpt index 6ada1f7bf2..1b226036cf 100644 --- a/Zend/tests/ns_trailing_comma_error_01.phpt +++ b/Zend/tests/ns_trailing_comma_error_01.phpt @@ -5,4 +5,4 @@ Group use declarations mustn't be empty use Baz\{}; ?> --EXPECTF-- -Parse error: syntax error, unexpected '}', expecting identifier (T_STRING) or function (T_FUNCTION) or const (T_CONST) in %s on line %d
\ No newline at end of file +Parse error: syntax error, unexpected '}', expecting identifier (T_STRING) or function (T_FUNCTION) or const (T_CONST) in %s on line %d diff --git a/Zend/tests/ns_trailing_comma_error_02.phpt b/Zend/tests/ns_trailing_comma_error_02.phpt index c9d0d92dee..c2123a85f5 100644 --- a/Zend/tests/ns_trailing_comma_error_02.phpt +++ b/Zend/tests/ns_trailing_comma_error_02.phpt @@ -5,4 +5,4 @@ Group use declarations mustn't contain just a comma use Baz\{,}; ?> --EXPECTF-- -Parse error: syntax error, unexpected ',', expecting identifier (T_STRING) or function (T_FUNCTION) or const (T_CONST) in %s on line %d
\ No newline at end of file +Parse error: syntax error, unexpected ',', expecting identifier (T_STRING) or function (T_FUNCTION) or const (T_CONST) in %s on line %d diff --git a/Zend/tests/ns_trailing_comma_error_03.phpt b/Zend/tests/ns_trailing_comma_error_03.phpt index 9d10c47dcc..a07720becc 100644 --- a/Zend/tests/ns_trailing_comma_error_03.phpt +++ b/Zend/tests/ns_trailing_comma_error_03.phpt @@ -5,4 +5,4 @@ Group use declarations mustn't allow more than one comma use Baz\{Foo,,}; ?> --EXPECTF-- -Parse error: syntax error, unexpected ',', expecting '}' in %s on line %d
\ No newline at end of file +Parse error: syntax error, unexpected ',', expecting '}' in %s on line %d diff --git a/Zend/tests/ns_trailing_comma_error_04.phpt b/Zend/tests/ns_trailing_comma_error_04.phpt index d04b1af272..09d7ebf349 100644 --- a/Zend/tests/ns_trailing_comma_error_04.phpt +++ b/Zend/tests/ns_trailing_comma_error_04.phpt @@ -5,4 +5,4 @@ Group use declarations mustn't begin with a comma use Baz\{,Foo}; ?> --EXPECTF-- -Parse error: syntax error, unexpected ',', expecting identifier (T_STRING) or function (T_FUNCTION) or const (T_CONST) in %s on line %d
\ No newline at end of file +Parse error: syntax error, unexpected ',', expecting identifier (T_STRING) or function (T_FUNCTION) or const (T_CONST) in %s on line %d diff --git a/Zend/tests/ns_trailing_comma_error_05.phpt b/Zend/tests/ns_trailing_comma_error_05.phpt index 1d43e8fe32..d748747a03 100644 --- a/Zend/tests/ns_trailing_comma_error_05.phpt +++ b/Zend/tests/ns_trailing_comma_error_05.phpt @@ -5,4 +5,4 @@ Group use declarations mustn't contain two commas mid-list use Baz\{Foo,,Bar}; ?> --EXPECTF-- -Parse error: syntax error, unexpected ',', expecting '}' in %s on line %d
\ No newline at end of file +Parse error: syntax error, unexpected ',', expecting '}' in %s on line %d diff --git a/Zend/tests/ns_trailing_comma_error_06.phpt b/Zend/tests/ns_trailing_comma_error_06.phpt index 2f2738e204..8d8b759a5a 100644 --- a/Zend/tests/ns_trailing_comma_error_06.phpt +++ b/Zend/tests/ns_trailing_comma_error_06.phpt @@ -5,4 +5,4 @@ Unmixed group use declarations mustn't allow more than one comma use const Baz\{Foo,,}; ?> --EXPECTF-- -Parse error: syntax error, unexpected ',', expecting '}' in %s on line %d
\ No newline at end of file +Parse error: syntax error, unexpected ',', expecting '}' in %s on line %d diff --git a/Zend/tests/ns_trailing_comma_error_07.phpt b/Zend/tests/ns_trailing_comma_error_07.phpt index c60dd6a4b0..e925a60de8 100644 --- a/Zend/tests/ns_trailing_comma_error_07.phpt +++ b/Zend/tests/ns_trailing_comma_error_07.phpt @@ -5,4 +5,4 @@ Unmixed group use declarations mustn't begin with a comma use function Baz\{,Foo}; ?> --EXPECTF-- -Parse error: syntax error, unexpected ',', expecting identifier (T_STRING) in %s on line %d
\ No newline at end of file +Parse error: syntax error, unexpected ',', expecting identifier (T_STRING) in %s on line %d diff --git a/Zend/tests/ns_trailing_comma_error_08.phpt b/Zend/tests/ns_trailing_comma_error_08.phpt index b23446301d..b3804aeb76 100644 --- a/Zend/tests/ns_trailing_comma_error_08.phpt +++ b/Zend/tests/ns_trailing_comma_error_08.phpt @@ -5,4 +5,4 @@ Unmixed group use declarations mustn't contain two commas mid-list use const Baz\{Foo,,Bar}; ?> --EXPECTF-- -Parse error: syntax error, unexpected ',', expecting '}' in %s on line %d
\ No newline at end of file +Parse error: syntax error, unexpected ',', expecting '}' in %s on line %d diff --git a/Zend/tests/nullable_types/array.phpt b/Zend/tests/nullable_types/array.phpt index 7b0a2ed4d5..6ee89b3962 100644 --- a/Zend/tests/nullable_types/array.phpt +++ b/Zend/tests/nullable_types/array.phpt @@ -9,9 +9,7 @@ function _array_(?array $v): ?array { var_dump(_array_(null)); var_dump(_array_([])); - --EXPECT-- NULL array(0) { } - diff --git a/Zend/tests/nullable_types/contravariant_nullable_param_succeeds.phpt b/Zend/tests/nullable_types/contravariant_nullable_param_succeeds.phpt index f4d1e315fc..a618ed2073 100644 --- a/Zend/tests/nullable_types/contravariant_nullable_param_succeeds.phpt +++ b/Zend/tests/nullable_types/contravariant_nullable_param_succeeds.phpt @@ -1,6 +1,5 @@ --TEST-- Subtype can add nullability to a parameter (contravariance) - --FILE-- <?php @@ -14,6 +13,4 @@ class B implements A { $b = new B(); $b->method(null); - --EXPECT-- - diff --git a/Zend/tests/nullable_types/contravariant_nullable_return_fails.phpt b/Zend/tests/nullable_types/contravariant_nullable_return_fails.phpt index c9be479ead..fe6ebc5654 100644 --- a/Zend/tests/nullable_types/contravariant_nullable_return_fails.phpt +++ b/Zend/tests/nullable_types/contravariant_nullable_return_fails.phpt @@ -1,6 +1,5 @@ --TEST-- Return type cannot add nullability (contravariance) - --FILE-- <?php @@ -11,7 +10,5 @@ interface A { interface B extends A { function method(): ?int; } - --EXPECTF-- Fatal error: Declaration of B::method(): ?int must be compatible with A::method(): int in %s on line %d - diff --git a/Zend/tests/nullable_types/covariant_nullable_param_fails.phpt b/Zend/tests/nullable_types/covariant_nullable_param_fails.phpt index 65b2858e6b..015f540ac0 100644 --- a/Zend/tests/nullable_types/covariant_nullable_param_fails.phpt +++ b/Zend/tests/nullable_types/covariant_nullable_param_fails.phpt @@ -1,6 +1,5 @@ --TEST-- Subtype cannot remove nullable parameter (covariance) - --FILE-- <?php @@ -11,7 +10,5 @@ interface A { class B implements A { function method(int $p) { } } - --EXPECTF-- Fatal error: Declaration of B::method(int $p) must be compatible with A::method(?int $p) in %s on line %d - diff --git a/Zend/tests/nullable_types/covariant_nullable_return_succeds.phpt b/Zend/tests/nullable_types/covariant_nullable_return_succeds.phpt index 5776f9b99d..9251d3b4c1 100644 --- a/Zend/tests/nullable_types/covariant_nullable_return_succeds.phpt +++ b/Zend/tests/nullable_types/covariant_nullable_return_succeds.phpt @@ -1,6 +1,5 @@ --TEST-- Nullable covariant return types - --FILE-- <?php @@ -11,6 +10,4 @@ interface A { interface B extends A { function method(): int; } - --EXPECT-- - diff --git a/Zend/tests/nullable_types/float.phpt b/Zend/tests/nullable_types/float.phpt index 8e44524cf0..0c6602109f 100644 --- a/Zend/tests/nullable_types/float.phpt +++ b/Zend/tests/nullable_types/float.phpt @@ -9,8 +9,6 @@ function _float_(?float $v): ?float { var_dump(_float_(null)); var_dump(_float_(1.3)); - --EXPECT-- NULL float(1.3) - diff --git a/Zend/tests/nullable_types/int.phpt b/Zend/tests/nullable_types/int.phpt index ec75132edb..b5bafb0956 100644 --- a/Zend/tests/nullable_types/int.phpt +++ b/Zend/tests/nullable_types/int.phpt @@ -9,8 +9,6 @@ function _int_(?int $v): ?int { var_dump(_int_(null)); var_dump(_int_(1)); - --EXPECT-- NULL int(1) - diff --git a/Zend/tests/nullable_types/invariant_param_and_return_succeeds.phpt b/Zend/tests/nullable_types/invariant_param_and_return_succeeds.phpt index 0542e52c0f..6ddad67bb8 100644 --- a/Zend/tests/nullable_types/invariant_param_and_return_succeeds.phpt +++ b/Zend/tests/nullable_types/invariant_param_and_return_succeeds.phpt @@ -1,6 +1,5 @@ --TEST-- Invariant parameter and return types work with nullable types - --FILE-- <?php @@ -17,8 +16,6 @@ class B implements A { $b = new B(); var_dump($b->method(null)); var_dump($b->method(1)); - --EXPECT-- NULL int(1) - diff --git a/Zend/tests/nullable_types/nullable_type_parameters_do_not_have_default_value.phpt b/Zend/tests/nullable_types/nullable_type_parameters_do_not_have_default_value.phpt index 3050feed53..95442b96b4 100644 --- a/Zend/tests/nullable_types/nullable_type_parameters_do_not_have_default_value.phpt +++ b/Zend/tests/nullable_types/nullable_type_parameters_do_not_have_default_value.phpt @@ -1,17 +1,14 @@ --TEST-- Explicit nullable types do not imply a default value - --FILE-- <?php function f(?callable $p) {} f(); - --EXPECTF-- Fatal error: Uncaught ArgumentCountError: Too few arguments to function f(), 0 passed in %snullable_type_parameters_do_not_have_default_value.php on line %d and exactly 1 expected in %s:%d Stack trace: #%d %s #%d %s thrown in %s on line %d - diff --git a/Zend/tests/nullable_types/string.phpt b/Zend/tests/nullable_types/string.phpt index ffc6591b6b..ab469af808 100644 --- a/Zend/tests/nullable_types/string.phpt +++ b/Zend/tests/nullable_types/string.phpt @@ -9,8 +9,6 @@ function _string_(?string $v): ?string { var_dump(_string_(null)); var_dump(_string_("php")); - --EXPECT-- NULL string(3) "php" - diff --git a/Zend/tests/numeric_string_errors.phpt b/Zend/tests/numeric_string_errors.phpt index e98c58dda7..15dcd04461 100644 --- a/Zend/tests/numeric_string_errors.phpt +++ b/Zend/tests/numeric_string_errors.phpt @@ -52,7 +52,6 @@ var_dump(-"151 velit"); var_dump(-"esse"); ?> --EXPECTF-- - Notice: A non well formed numeric value encountered in %s on line %d Notice: A non well formed numeric value encountered in %s on line %d diff --git a/Zend/tests/numeric_string_errors_assign.phpt b/Zend/tests/numeric_string_errors_assign.phpt index 31cc8a3631..b13a7ec717 100644 --- a/Zend/tests/numeric_string_errors_assign.phpt +++ b/Zend/tests/numeric_string_errors_assign.phpt @@ -107,7 +107,6 @@ $a ^= "reprehenderit"; var_dump($a); ?> --EXPECTF-- - Notice: A non well formed numeric value encountered in %s on line %d Notice: A non well formed numeric value encountered in %s on line %d diff --git a/Zend/tests/object_types/missing_return_type_inheritance_in_class.phpt b/Zend/tests/object_types/missing_return_type_inheritance_in_class.phpt index 138ae1f5b5..023ae58634 100644 --- a/Zend/tests/object_types/missing_return_type_inheritance_in_class.phpt +++ b/Zend/tests/object_types/missing_return_type_inheritance_in_class.phpt @@ -10,6 +10,5 @@ class One { class Two extends One { public function a() {} } - --EXPECTF-- -Fatal error: Declaration of Two::a() must be compatible with One::a(): object in %s on line 9
\ No newline at end of file +Fatal error: Declaration of Two::a() must be compatible with One::a(): object in %s on line 9 diff --git a/Zend/tests/object_types/missing_return_type_inheritance_in_interface.phpt b/Zend/tests/object_types/missing_return_type_inheritance_in_interface.phpt index af9032949c..eb0e98b635 100644 --- a/Zend/tests/object_types/missing_return_type_inheritance_in_interface.phpt +++ b/Zend/tests/object_types/missing_return_type_inheritance_in_interface.phpt @@ -10,6 +10,5 @@ interface One { interface Two extends One { public function a(); } - --EXPECTF-- Fatal error: Declaration of Two::a() must be compatible with One::a(): object in %s on line %d diff --git a/Zend/tests/object_types/return_type_in_class.phpt b/Zend/tests/object_types/return_type_in_class.phpt index bef0421f8d..c4c1dc0516 100644 --- a/Zend/tests/object_types/return_type_in_class.phpt +++ b/Zend/tests/object_types/return_type_in_class.phpt @@ -18,7 +18,6 @@ $three = new class extends Two { }; $three->a(); --EXPECTF-- - Fatal error: Uncaught TypeError: Return value of class@anonymous::a() must be an object, int returned in %s:13 Stack trace: #0 %s(16): class@anonymous->a() diff --git a/Zend/tests/object_types/return_type_in_function.phpt b/Zend/tests/object_types/return_type_in_function.phpt index 5597e27b3f..dc7e0463fd 100644 --- a/Zend/tests/object_types/return_type_in_function.phpt +++ b/Zend/tests/object_types/return_type_in_function.phpt @@ -8,9 +8,8 @@ function a() : object { } a(); --EXPECTF-- - Fatal error: Uncaught TypeError: Return value of a() must be an object, int returned in %s:4 Stack trace: #0 %s(6): a() #1 {main} - thrown in %s on line 4
\ No newline at end of file + thrown in %s on line 4 diff --git a/Zend/tests/object_types/return_type_inheritance_in_class.phpt b/Zend/tests/object_types/return_type_inheritance_in_class.phpt index 9ecf3cab1c..a7316136fb 100644 --- a/Zend/tests/object_types/return_type_inheritance_in_class.phpt +++ b/Zend/tests/object_types/return_type_inheritance_in_class.phpt @@ -17,7 +17,6 @@ $three = new class extends Two { } }; $three->a(); - --EXPECTF-- Fatal error: Uncaught TypeError: Return value of class@anonymous::a() must be an object, int returned in %s:13 Stack trace: diff --git a/Zend/tests/object_types/return_type_inheritance_in_interface.phpt b/Zend/tests/object_types/return_type_inheritance_in_interface.phpt index eec1ba260b..4c8f6c08af 100644 --- a/Zend/tests/object_types/return_type_inheritance_in_interface.phpt +++ b/Zend/tests/object_types/return_type_inheritance_in_interface.phpt @@ -17,7 +17,6 @@ $three = new class implements Two { } }; $three->a(); - --EXPECTF-- Fatal error: Uncaught TypeError: Return value of class@anonymous::a() must be an object, int returned in %s:13 Stack trace: diff --git a/Zend/tests/object_types/return_type_reflection.phpt b/Zend/tests/object_types/return_type_reflection.phpt index 29dd54428b..bcb918287d 100644 --- a/Zend/tests/object_types/return_type_reflection.phpt +++ b/Zend/tests/object_types/return_type_reflection.phpt @@ -21,11 +21,10 @@ var_dump($returnTypeTwo->isBuiltin(), (string)$returnTypeTwo); $returnTypea = (new ReflectionFunction('a'))->getReturnType(); var_dump($returnTypea->isBuiltin(), (string)$returnTypea); - --EXPECT-- bool(true) string(6) "object" bool(true) string(6) "object" bool(true) -string(6) "object"
\ No newline at end of file +string(6) "object" diff --git a/Zend/tests/object_types/type_hint_in_class_method.phpt b/Zend/tests/object_types/type_hint_in_class_method.phpt index 4ea5216c4e..f8814e4bbb 100644 --- a/Zend/tests/object_types/type_hint_in_class_method.phpt +++ b/Zend/tests/object_types/type_hint_in_class_method.phpt @@ -11,9 +11,8 @@ $one = new One(); $one->a(new One()); $one->a(123); --EXPECTF-- - Fatal error: Uncaught TypeError: Argument 1 passed to One::a() must be an object, int given, called in %s:4 Stack trace: #0 %s(9): One->a(123) #1 {main} - thrown in %s on line 4
\ No newline at end of file + thrown in %s on line 4 diff --git a/Zend/tests/object_types/type_hint_in_function.phpt b/Zend/tests/object_types/type_hint_in_function.phpt index 3e923983d7..39e075efdb 100644 --- a/Zend/tests/object_types/type_hint_in_function.phpt +++ b/Zend/tests/object_types/type_hint_in_function.phpt @@ -9,9 +9,8 @@ function a(object $obj) {} a(new A()); a(123); --EXPECTF-- - Fatal error: Uncaught TypeError: Argument 1 passed to a() must be an object, int given, called in %s.php on line 7 and defined in %s:4 Stack trace: #0 %s(7): a(123) #1 {main} - thrown in %s on line 4
\ No newline at end of file + thrown in %s on line 4 diff --git a/Zend/tests/object_types/type_hint_reflection.phpt b/Zend/tests/object_types/type_hint_reflection.phpt index c0dcde3939..6a4f27d8c9 100644 --- a/Zend/tests/object_types/type_hint_reflection.phpt +++ b/Zend/tests/object_types/type_hint_reflection.phpt @@ -21,11 +21,10 @@ var_dump($typeHintTwo->isBuiltin(), (string)$typeHintTwo); $typeHinta = (new ReflectionFunction('a'))->getParameters()[0]->getType(); var_dump($typeHinta->isBuiltin(), (string)$typeHinta); - --EXPECT-- bool(true) string(6) "object" bool(true) string(6) "object" bool(true) -string(6) "object"
\ No newline at end of file +string(6) "object" diff --git a/Zend/tests/objects_024.phpt b/Zend/tests/objects_024.phpt index cbdb1cc202..50659f1604 100644 --- a/Zend/tests/objects_024.phpt +++ b/Zend/tests/objects_024.phpt @@ -50,4 +50,3 @@ object(foo)#%d (0) { int(3) object(foo)#%d (0) { } - diff --git a/Zend/tests/objects_027.phpt b/Zend/tests/objects_027.phpt index 1a13f2de0a..6ee7d5a491 100644 --- a/Zend/tests/objects_027.phpt +++ b/Zend/tests/objects_027.phpt @@ -40,5 +40,3 @@ Deprecated: %son-static method foo::test() should not be called statically in %s Deprecated: Non-static method bar::show() should not be called statically in %s on line %d object(foo)#%d (0) { } - - diff --git a/Zend/tests/offset_string.phpt b/Zend/tests/offset_string.phpt index f7cb81bb20..3ad48e7412 100644 --- a/Zend/tests/offset_string.phpt +++ b/Zend/tests/offset_string.phpt @@ -62,4 +62,4 @@ string(1) "%s" Warning: Illegal offset type in %s on line %d string(1) "i" -Done
\ No newline at end of file +Done diff --git a/Zend/tests/parent_class_name_without_parent.phpt b/Zend/tests/parent_class_name_without_parent.phpt index 622aefeab0..033b5ad4ec 100644 --- a/Zend/tests/parent_class_name_without_parent.phpt +++ b/Zend/tests/parent_class_name_without_parent.phpt @@ -22,4 +22,3 @@ Stack trace: #0 %s(%d): C->f() #1 {main} thrown in %s on line 5 - diff --git a/Zend/tests/result_unused.phpt b/Zend/tests/result_unused.phpt index 0db744d089..12892e8415 100644 --- a/Zend/tests/result_unused.phpt +++ b/Zend/tests/result_unused.phpt @@ -26,4 +26,3 @@ echo "ok\n"; --EXPECTF-- Notice: Uninitialized string offset: 3 in %sresult_unused.php on line %d ok - diff --git a/Zend/tests/return_types/001.phpt b/Zend/tests/return_types/001.phpt index 13bf93f4df..2b87a562f6 100644 --- a/Zend/tests/return_types/001.phpt +++ b/Zend/tests/return_types/001.phpt @@ -1,13 +1,11 @@ --TEST-- Returned nothing, expected array - --FILE-- <?php function test1() : array { } test1(); - --EXPECTF-- Fatal error: Uncaught TypeError: Return value of test1() must be of the type array, none returned in %s:%d Stack trace: diff --git a/Zend/tests/return_types/002.phpt b/Zend/tests/return_types/002.phpt index 5921634553..615317cf83 100644 --- a/Zend/tests/return_types/002.phpt +++ b/Zend/tests/return_types/002.phpt @@ -1,6 +1,5 @@ --TEST-- Returned null, expected array - --FILE-- <?php function test1() : array { @@ -8,7 +7,6 @@ function test1() : array { } test1(); - --EXPECTF-- Fatal error: Uncaught TypeError: Return value of test1() must be of the type array, null returned in %s:%d Stack trace: diff --git a/Zend/tests/return_types/003.phpt b/Zend/tests/return_types/003.phpt index f70500da9f..ed78d51823 100644 --- a/Zend/tests/return_types/003.phpt +++ b/Zend/tests/return_types/003.phpt @@ -1,13 +1,11 @@ --TEST-- Returned 1, expected array - --FILE-- <?php function test1() : array { return 1; } test1(); - --EXPECTF-- Fatal error: Uncaught TypeError: Return value of test1() must be of the type array, int returned in %s:%d Stack trace: diff --git a/Zend/tests/return_types/004.phpt b/Zend/tests/return_types/004.phpt index 7865eb9d4d..6098d51334 100644 --- a/Zend/tests/return_types/004.phpt +++ b/Zend/tests/return_types/004.phpt @@ -1,6 +1,5 @@ --TEST-- Returned string, expected array - --FILE-- <?php function test1() : array { @@ -8,7 +7,6 @@ function test1() : array { } test1(); - --EXPECTF-- Fatal error: Uncaught TypeError: Return value of test1() must be of the type array, string returned in %s:%d Stack trace: diff --git a/Zend/tests/return_types/005.phpt b/Zend/tests/return_types/005.phpt index a114b3ee93..f8d666fae5 100644 --- a/Zend/tests/return_types/005.phpt +++ b/Zend/tests/return_types/005.phpt @@ -1,6 +1,5 @@ --TEST-- Return value fails inheritance check in method - --FILE-- <?php class foo {} @@ -13,7 +12,6 @@ class qux { $qux = new qux(); $qux->foo(); - --EXPECTF-- Fatal error: Uncaught TypeError: Return value of qux::foo() must be an instance of foo, instance of qux returned in %s:%d Stack trace: diff --git a/Zend/tests/return_types/006.phpt b/Zend/tests/return_types/006.phpt index 359b25a28d..a4fcea1d25 100644 --- a/Zend/tests/return_types/006.phpt +++ b/Zend/tests/return_types/006.phpt @@ -1,6 +1,5 @@ --TEST-- Return type allowed in child when parent does not have return type - --FILE-- <?php class Comment {} @@ -15,7 +14,6 @@ $comments = new CommentsIterator([new Comment]); foreach ($comments as $comment) { var_dump($comment); } - --EXPECTF-- object(Comment)#%d (%d) { } diff --git a/Zend/tests/return_types/007.phpt b/Zend/tests/return_types/007.phpt index 0bbfb9fbba..21f7023518 100644 --- a/Zend/tests/return_types/007.phpt +++ b/Zend/tests/return_types/007.phpt @@ -1,6 +1,5 @@ --TEST-- Return value is subclass of return type - --FILE-- <?php class foo {} @@ -13,7 +12,6 @@ class qux extends foo { $qux = new qux(); var_dump($qux->foo()); - --EXPECTF-- object(qux)#%d (%d) { } diff --git a/Zend/tests/return_types/008.phpt b/Zend/tests/return_types/008.phpt index 47343d0564..f2e01299de 100644 --- a/Zend/tests/return_types/008.phpt +++ b/Zend/tests/return_types/008.phpt @@ -1,6 +1,5 @@ --TEST-- Return type covariance in interface implementation - --FILE-- <?php interface foo { @@ -16,6 +15,5 @@ class qux implements foo { $qux = new qux(); var_dump($qux->bar()); - --EXPECTF-- Fatal error: Declaration of qux::bar(): qux must be compatible with foo::bar(): foo in %s008.php on line 7 diff --git a/Zend/tests/return_types/009.phpt b/Zend/tests/return_types/009.phpt index b83703ede5..7eda8ce27b 100644 --- a/Zend/tests/return_types/009.phpt +++ b/Zend/tests/return_types/009.phpt @@ -1,6 +1,5 @@ --TEST-- Return type covariance error - --FILE-- <?php interface foo { @@ -14,6 +13,5 @@ class qux implements foo { return $this; } } - --EXPECTF-- Fatal error: Declaration of qux::bar(): biz must be compatible with foo::bar(): foo in %s on line %d diff --git a/Zend/tests/return_types/010.phpt b/Zend/tests/return_types/010.phpt index 1a117d0cbc..2cfe97dac2 100644 --- a/Zend/tests/return_types/010.phpt +++ b/Zend/tests/return_types/010.phpt @@ -1,6 +1,5 @@ --TEST-- Returned null, expected array reference - --FILE-- <?php function &foo(array &$in) : array { @@ -9,7 +8,6 @@ function &foo(array &$in) : array { $array = [1, 2, 3]; var_dump(foo($array)); - --EXPECTF-- Fatal error: Uncaught TypeError: Return value of foo() must be of the type array, null returned in %s:%d Stack trace: diff --git a/Zend/tests/return_types/011.phpt b/Zend/tests/return_types/011.phpt index f3b000a706..23dbc1cfdb 100644 --- a/Zend/tests/return_types/011.phpt +++ b/Zend/tests/return_types/011.phpt @@ -1,6 +1,5 @@ --TEST-- Function returned callable, expected callable - --FILE-- <?php function foo() : callable { @@ -8,7 +7,6 @@ function foo() : callable { } var_dump(foo()); - --EXPECTF-- object(Closure)#%d (%d) { } diff --git a/Zend/tests/return_types/012.phpt b/Zend/tests/return_types/012.phpt index 39fa8e0ec6..b4c02a8ec1 100644 --- a/Zend/tests/return_types/012.phpt +++ b/Zend/tests/return_types/012.phpt @@ -1,6 +1,5 @@ --TEST-- Method returned callable, expected callable - --FILE-- <?php class foo { @@ -14,7 +13,6 @@ class foo { $baz = new foo(); var_dump($baz->bar()); - --EXPECT-- object(Closure)#2 (2) { ["static"]=> diff --git a/Zend/tests/return_types/013.phpt b/Zend/tests/return_types/013.phpt index 673a8f9dbc..5b2c06748d 100644 --- a/Zend/tests/return_types/013.phpt +++ b/Zend/tests/return_types/013.phpt @@ -1,6 +1,5 @@ --TEST-- Closure inside method returned null, expected array - --FILE-- <?php class foo { @@ -14,7 +13,6 @@ class foo { $baz = new foo(); var_dump($func=$baz->bar(), $func()); - --EXPECTF-- Fatal error: Uncaught TypeError: Return value of foo::{closure}() must be of the type array, null returned in %s:%d Stack trace: diff --git a/Zend/tests/return_types/014.phpt b/Zend/tests/return_types/014.phpt index 3974eb67fa..655c5a9cc6 100644 --- a/Zend/tests/return_types/014.phpt +++ b/Zend/tests/return_types/014.phpt @@ -1,12 +1,10 @@ --TEST-- Constructors cannot declare a return type - --FILE-- <?php class Foo { function __construct() : Foo {} } - --EXPECTF-- Fatal error: Constructor %s::%s() cannot declare a return type in %s on line %d diff --git a/Zend/tests/return_types/015.phpt b/Zend/tests/return_types/015.phpt index 1c2cd564ff..973956b6bc 100644 --- a/Zend/tests/return_types/015.phpt +++ b/Zend/tests/return_types/015.phpt @@ -1,6 +1,5 @@ --TEST-- Return types allowed in namespace - --FILE-- <?php @@ -18,7 +17,6 @@ class Vector implements Collection { $v = new Vector; var_dump($v->values()); - --EXPECTF-- object(Collections\Vector)#%d (%d) { } diff --git a/Zend/tests/return_types/016.phpt b/Zend/tests/return_types/016.phpt index f3636751c1..cf31d96e6b 100644 --- a/Zend/tests/return_types/016.phpt +++ b/Zend/tests/return_types/016.phpt @@ -1,6 +1,5 @@ --TEST-- Fully qualified classes are allowed in return types - --FILE-- <?php @@ -14,7 +13,6 @@ class Foo { $foo = new Foo; var_dump($foo->foo(new \EmptyIterator())); - --EXPECTF-- object(EmptyIterator)#%d (0) { } diff --git a/Zend/tests/return_types/017.phpt b/Zend/tests/return_types/017.phpt index d44b26fc04..d45cb55d45 100644 --- a/Zend/tests/return_types/017.phpt +++ b/Zend/tests/return_types/017.phpt @@ -1,6 +1,5 @@ --TEST-- Fully qualified classes in trait return types - --FILE-- <?php @@ -18,7 +17,6 @@ class Foo { $foo = new Foo; var_dump($foo->foo([])); - --EXPECTF-- object(EmptyIterator)#%d (%d) { } diff --git a/Zend/tests/return_types/018.phpt b/Zend/tests/return_types/018.phpt index 6c243ac756..2512c6cf49 100644 --- a/Zend/tests/return_types/018.phpt +++ b/Zend/tests/return_types/018.phpt @@ -1,12 +1,10 @@ --TEST-- Destructors cannot declare a return type - --FILE-- <?php class Foo { function __destruct() : Foo {} } - --EXPECTF-- Fatal error: Destructor %s::%s() cannot declare a return type in %s on line %d diff --git a/Zend/tests/return_types/019.phpt b/Zend/tests/return_types/019.phpt index b5a83f3732..166b624563 100644 --- a/Zend/tests/return_types/019.phpt +++ b/Zend/tests/return_types/019.phpt @@ -1,12 +1,10 @@ --TEST-- __clone cannot declare a return type - --FILE-- <?php class Foo { function __clone() : Foo {} } - --EXPECTF-- Fatal error: %s::%s() cannot declare a return type in %s on line %d diff --git a/Zend/tests/return_types/020.phpt b/Zend/tests/return_types/020.phpt index 101de62dd7..57c93a8dcd 100644 --- a/Zend/tests/return_types/020.phpt +++ b/Zend/tests/return_types/020.phpt @@ -1,6 +1,5 @@ --TEST-- Exception thrown from function with return type - --FILE-- <?php function test() : array { @@ -8,7 +7,6 @@ function test() : array { } test(); - --EXPECTF-- Fatal error: Uncaught Exception in %s:%d Stack trace: diff --git a/Zend/tests/return_types/021.phpt b/Zend/tests/return_types/021.phpt index 051f7dce69..bd37df68f3 100644 --- a/Zend/tests/return_types/021.phpt +++ b/Zend/tests/return_types/021.phpt @@ -1,6 +1,5 @@ --TEST-- Return type allows self - --FILE-- <?php class Foo { @@ -13,7 +12,6 @@ class Bar extends Foo {} var_dump(Foo::getInstance()); var_dump(Bar::getInstance()); - --EXPECTF-- object(Foo)#%d (%d) { } diff --git a/Zend/tests/return_types/022.phpt b/Zend/tests/return_types/022.phpt index 8cf6f5164c..b0686ea8ab 100644 --- a/Zend/tests/return_types/022.phpt +++ b/Zend/tests/return_types/022.phpt @@ -1,6 +1,5 @@ --TEST-- Hint on closure with lexical vars - --FILE-- <?php $foo = "bar"; @@ -12,6 +11,5 @@ $test = function() use($foo) : Closure { $callable = $test(); var_dump($callable()); - --EXPECT-- string(3) "bar" diff --git a/Zend/tests/return_types/023.phpt b/Zend/tests/return_types/023.phpt index 04df2caf7b..e8e8732ef1 100644 --- a/Zend/tests/return_types/023.phpt +++ b/Zend/tests/return_types/023.phpt @@ -1,13 +1,11 @@ --TEST-- PHP 4 Constructors cannot declare a return type - --FILE-- <?php class Foo { function foo() : Foo {} } - --EXPECTF-- Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; Foo has a deprecated constructor in %s on line %d diff --git a/Zend/tests/return_types/024.phpt b/Zend/tests/return_types/024.phpt index 0579973fbc..45c8162335 100644 --- a/Zend/tests/return_types/024.phpt +++ b/Zend/tests/return_types/024.phpt @@ -1,10 +1,8 @@ --TEST-- Return type of self is not allowed in function - --FILE-- <?php function test(): self {} - --EXPECTF-- Fatal error: Cannot use "self" when no class scope is active in %s on line 3 diff --git a/Zend/tests/return_types/025.phpt b/Zend/tests/return_types/025.phpt index 148971250a..c9f0ffef4a 100644 --- a/Zend/tests/return_types/025.phpt +++ b/Zend/tests/return_types/025.phpt @@ -1,13 +1,11 @@ --TEST-- Return type of self is allowed in closure - --FILE-- <?php $c = function(): self { return $this; }; class Bar { } var_dump($c->call(new Bar)); - --EXPECT-- object(Bar)#2 (0) { } diff --git a/Zend/tests/return_types/026.phpt b/Zend/tests/return_types/026.phpt index 5693e95c7e..f08c527512 100644 --- a/Zend/tests/return_types/026.phpt +++ b/Zend/tests/return_types/026.phpt @@ -4,6 +4,5 @@ Return type of parent is not allowed in function <?php function test(): parent {} - --EXPECTF-- Fatal error: Cannot use "parent" when no class scope is active in %s on line %d diff --git a/Zend/tests/return_types/027.phpt b/Zend/tests/return_types/027.phpt index a5d2c321bf..33a9c7f94d 100644 --- a/Zend/tests/return_types/027.phpt +++ b/Zend/tests/return_types/027.phpt @@ -8,7 +8,6 @@ class B extends A {} $c = function(parent $x): parent { return $x; }; var_dump($c->bindTo(null, 'B')(new A)); - --EXPECTF-- object(A)#%d (0) { } diff --git a/Zend/tests/return_types/031.phpt b/Zend/tests/return_types/031.phpt index 91ee2f8ce4..6d0b71b23b 100644 --- a/Zend/tests/return_types/031.phpt +++ b/Zend/tests/return_types/031.phpt @@ -11,4 +11,4 @@ class B extends A { ?> DONE --EXPECTF-- -Fatal error: Declaration of B::foo(): ?int must be compatible with A::foo(): int in %s031.php on line 7
\ No newline at end of file +Fatal error: Declaration of B::foo(): ?int must be compatible with A::foo(): int in %s031.php on line 7 diff --git a/Zend/tests/return_types/generators001.phpt b/Zend/tests/return_types/generators001.phpt index f2ac88a7ad..9f89d71102 100644 --- a/Zend/tests/return_types/generators001.phpt +++ b/Zend/tests/return_types/generators001.phpt @@ -1,6 +1,5 @@ --TEST-- Valid generator return types - --FILE-- <?php function test1() : Generator { @@ -20,7 +19,6 @@ var_dump( test2(), test3() ); - --EXPECTF-- object(Generator)#%d (%d) { } diff --git a/Zend/tests/return_types/generators002.phpt b/Zend/tests/return_types/generators002.phpt index 519c97a962..90bada714b 100644 --- a/Zend/tests/return_types/generators002.phpt +++ b/Zend/tests/return_types/generators002.phpt @@ -1,11 +1,9 @@ --TEST-- Generator return type must be Generator, Iterator or Traversable - --FILE-- <?php function test1() : StdClass { yield 1; } - --EXPECTF-- Fatal error: Generators may only declare a return type of Generator, Iterator, Traversable, or iterable, StdClass is not permitted in %s on line %d diff --git a/Zend/tests/return_types/generators003.phpt b/Zend/tests/return_types/generators003.phpt index 0ff2524f47..5502318e98 100644 --- a/Zend/tests/return_types/generators003.phpt +++ b/Zend/tests/return_types/generators003.phpt @@ -1,6 +1,5 @@ --TEST-- Return type covariance works with generators - --FILE-- <?php interface Collection extends IteratorAggregate { @@ -17,6 +16,5 @@ class SomeCollection implements Collection { $some = new SomeCollection(); var_dump($some->getIterator()); - --EXPECTF-- Fatal error: Declaration of SomeCollection::getIterator(): Generator must be compatible with Collection::getIterator(): Iterator in %sgenerators003.php on line 6 diff --git a/Zend/tests/return_types/generators004.phpt b/Zend/tests/return_types/generators004.phpt index 74aa801638..4e9aa07f42 100644 --- a/Zend/tests/return_types/generators004.phpt +++ b/Zend/tests/return_types/generators004.phpt @@ -1,6 +1,5 @@ --TEST-- Generator with return type does not fail with empty return - --FILE-- <?php @@ -12,6 +11,5 @@ $a = function(): \Iterator { foreach($a() as $value) { echo $value; } - --EXPECT-- 1 diff --git a/Zend/tests/return_types/generators005.phpt b/Zend/tests/return_types/generators005.phpt index 21e6c4bef1..a7e3bda042 100644 --- a/Zend/tests/return_types/generators005.phpt +++ b/Zend/tests/return_types/generators005.phpt @@ -1,6 +1,5 @@ --TEST-- Return type covariance works with generators - --FILE-- <?php interface Collection extends IteratorAggregate { @@ -17,7 +16,6 @@ class SomeCollection implements Collection { $some = new SomeCollection(); var_dump($some->getIterator()); - --EXPECTF-- object(Generator)#%d (%d) { } diff --git a/Zend/tests/return_types/inheritance001.phpt b/Zend/tests/return_types/inheritance001.phpt index 8e0523eb70..5e154d0482 100644 --- a/Zend/tests/return_types/inheritance001.phpt +++ b/Zend/tests/return_types/inheritance001.phpt @@ -1,6 +1,5 @@ --TEST-- Return type covariance; extends class - --FILE-- <?php @@ -11,6 +10,5 @@ class A { class B extends A { function foo(): StdClass {} } - --EXPECTF-- Fatal error: Declaration of B::foo(): StdClass must be compatible with A::foo(): A in %s on line %d diff --git a/Zend/tests/return_types/inheritance002.phpt b/Zend/tests/return_types/inheritance002.phpt index 8cb63b6fc8..bb00b7e243 100644 --- a/Zend/tests/return_types/inheritance002.phpt +++ b/Zend/tests/return_types/inheritance002.phpt @@ -1,6 +1,5 @@ --TEST-- Return type covariance; extends abstract class - --FILE-- <?php @@ -11,6 +10,5 @@ abstract class A { class B extends A { function foo(): StdClass {} } - --EXPECTF-- Fatal error: Declaration of B::foo(): StdClass must be compatible with A::foo(): A in %s on line %d diff --git a/Zend/tests/return_types/inheritance003.phpt b/Zend/tests/return_types/inheritance003.phpt index 0b22dd55d4..e8ebe90cd1 100644 --- a/Zend/tests/return_types/inheritance003.phpt +++ b/Zend/tests/return_types/inheritance003.phpt @@ -1,6 +1,5 @@ --TEST-- Return type mismatch; implements interface - --FILE-- <?php @@ -11,6 +10,5 @@ interface A { class B implements A { function foo(): StdClass {} } - --EXPECTF-- Fatal error: Declaration of B::foo(): StdClass must be compatible with A::foo(): A in %s on line %d diff --git a/Zend/tests/return_types/inheritance004.phpt b/Zend/tests/return_types/inheritance004.phpt index 66d35564f7..1c8d685a63 100644 --- a/Zend/tests/return_types/inheritance004.phpt +++ b/Zend/tests/return_types/inheritance004.phpt @@ -1,6 +1,5 @@ --TEST-- Internal covariant return type of self - --FILE-- <?php class Foo { @@ -17,7 +16,6 @@ class Bar extends Foo { var_dump(Bar::test()); var_dump(Foo::test()); - --EXPECTF-- object(Bar)#%d (0) { } diff --git a/Zend/tests/return_types/inheritance005.phpt b/Zend/tests/return_types/inheritance005.phpt index 31e0e11dd8..7415a72b9f 100644 --- a/Zend/tests/return_types/inheritance005.phpt +++ b/Zend/tests/return_types/inheritance005.phpt @@ -1,6 +1,5 @@ --TEST-- Internal covariant return type of self - --FILE-- <?php class Foo { @@ -14,6 +13,5 @@ class Bar extends Foo { return new Bar; } } - --EXPECTF-- Fatal error: Declaration of Bar::test(): Bar must be compatible with Foo::test(): Foo in %sinheritance005.php on line 12 diff --git a/Zend/tests/return_types/inheritance006.phpt b/Zend/tests/return_types/inheritance006.phpt index 86c11aa57a..7d4bcbe57b 100644 --- a/Zend/tests/return_types/inheritance006.phpt +++ b/Zend/tests/return_types/inheritance006.phpt @@ -1,9 +1,7 @@ --TEST-- External covariant return type of self - --INI-- opcache.enable_cli=1 - --FILE-- <?php require __DIR__ . "/classes.php.inc"; @@ -19,6 +17,5 @@ class Bar extends Foo { return new B; } } - --EXPECTF-- Fatal error: Declaration of Bar::test(): B must be compatible with Foo::test(): A in %sinheritance006.php on line 14 diff --git a/Zend/tests/return_types/inheritance007.phpt b/Zend/tests/return_types/inheritance007.phpt index 86d0bd9d69..af1738f807 100644 --- a/Zend/tests/return_types/inheritance007.phpt +++ b/Zend/tests/return_types/inheritance007.phpt @@ -1,9 +1,7 @@ --TEST-- Inheritance Hinting Compile Checking Failure Internal Classes - --INI-- opcache.enable_cli=1 - --FILE-- <?php class Foo { @@ -17,6 +15,5 @@ class Bar extends Foo { return new ArrayObject([1, 2]); } } - --EXPECTF-- Fatal error: Declaration of Bar::test(): ArrayObject must be compatible with Foo::test(): Traversable in %sinheritance007.php on line 12 diff --git a/Zend/tests/return_types/inheritance008.phpt b/Zend/tests/return_types/inheritance008.phpt index 242c50dcf0..df353cda05 100644 --- a/Zend/tests/return_types/inheritance008.phpt +++ b/Zend/tests/return_types/inheritance008.phpt @@ -1,9 +1,7 @@ --TEST-- External covariant return type of self - --INI-- opcache.enable_cli=1 - --FILE-- <?php require __DIR__ . "/classes.php.inc"; @@ -22,7 +20,6 @@ class Bar extends Foo { var_dump(Bar::test()); var_dump(Foo::test()); - --EXPECTF-- object(B)#%d (0) { } diff --git a/Zend/tests/return_types/inheritance009.phpt b/Zend/tests/return_types/inheritance009.phpt index 382007e8f0..b7d5628e8d 100644 --- a/Zend/tests/return_types/inheritance009.phpt +++ b/Zend/tests/return_types/inheritance009.phpt @@ -1,9 +1,7 @@ --TEST-- Inheritance Hinting Compile Checking Failure Internal Classes - --INI-- opcache.enable_cli=1 - --FILE-- <?php class Foo { @@ -20,7 +18,6 @@ class Bar extends Foo { var_dump(Bar::test()); var_dump(Foo::test()); - --EXPECTF-- object(ArrayObject)#%d (1) { ["storage":"ArrayObject":private]=> diff --git a/Zend/tests/return_types/return_reference_separation.phpt b/Zend/tests/return_types/return_reference_separation.phpt index cbf3ed5fd3..0151e5ec31 100644 --- a/Zend/tests/return_types/return_reference_separation.phpt +++ b/Zend/tests/return_types/return_reference_separation.phpt @@ -1,6 +1,5 @@ --TEST-- Return value separation - --FILE-- <?php function test1(&$abc) : string { @@ -31,4 +30,4 @@ int(123) string(3) "123" int(123) string(3) "123" -string(3) "123"
\ No newline at end of file +string(3) "123" diff --git a/Zend/tests/return_types/rfc001.phpt b/Zend/tests/return_types/rfc001.phpt index 3c74acb923..3fdbf3443c 100644 --- a/Zend/tests/return_types/rfc001.phpt +++ b/Zend/tests/return_types/rfc001.phpt @@ -1,6 +1,5 @@ --TEST-- RFC example: returned type does not match the type declaration - --FILE-- <?php @@ -9,7 +8,6 @@ function get_config(): array { } get_config(); - --EXPECTF-- Fatal error: Uncaught TypeError: Return value of get_config() must be of the type array, int returned in %s:%d Stack trace: diff --git a/Zend/tests/return_types/rfc002.phpt b/Zend/tests/return_types/rfc002.phpt index 8d0ed0862f..a2c326c24a 100644 --- a/Zend/tests/return_types/rfc002.phpt +++ b/Zend/tests/return_types/rfc002.phpt @@ -1,6 +1,5 @@ --TEST-- RFC example: Scalar Types - --FILE-- <?php function answer(): int { @@ -8,6 +7,5 @@ function answer(): int { } var_dump(answer()); - --EXPECT-- int(42) diff --git a/Zend/tests/return_types/rfc003.phpt b/Zend/tests/return_types/rfc003.phpt index ae4c5b7f60..6b9cc81c69 100644 --- a/Zend/tests/return_types/rfc003.phpt +++ b/Zend/tests/return_types/rfc003.phpt @@ -1,6 +1,5 @@ --TEST-- RFC example: cannot return null with a return type declaration - --FILE-- <?php function foo(): DateTime { @@ -8,7 +7,6 @@ function foo(): DateTime { } foo(); - --EXPECTF-- Fatal error: Uncaught TypeError: Return value of foo() must be an instance of DateTime, null returned in %s:%d Stack trace: diff --git a/Zend/tests/return_types/rfc004.phpt b/Zend/tests/return_types/rfc004.phpt index 654fb92321..ed40e41b09 100644 --- a/Zend/tests/return_types/rfc004.phpt +++ b/Zend/tests/return_types/rfc004.phpt @@ -1,6 +1,5 @@ --TEST-- RFC example: missing return type on override - --FILE-- <?php @@ -16,6 +15,5 @@ class UserGateway_MySql implements UserGateway { return new User; } } - --EXPECTF-- Fatal error: Declaration of UserGateway_MySql::find($id) must be compatible with UserGateway::find($id): User in %s on line 9 diff --git a/Zend/tests/self_in_eval.phpt b/Zend/tests/self_in_eval.phpt index 41c2654062..efd81ad266 100644 --- a/Zend/tests/self_in_eval.phpt +++ b/Zend/tests/self_in_eval.phpt @@ -25,4 +25,3 @@ int(1) int(2) string(1) "C" string(1) "C" - diff --git a/Zend/tests/temporary_cleaning_016.phpt b/Zend/tests/temporary_cleaning_016.phpt index d7be78e1ff..cdc9bff0cb 100644 --- a/Zend/tests/temporary_cleaning_016.phpt +++ b/Zend/tests/temporary_cleaning_016.phpt @@ -13,4 +13,3 @@ try { DONE --EXPECT-- DONE - diff --git a/Zend/tests/this_in_eval.phpt b/Zend/tests/this_in_eval.phpt index ed3926cd66..8da70b76a3 100644 --- a/Zend/tests/this_in_eval.phpt +++ b/Zend/tests/this_in_eval.phpt @@ -15,4 +15,3 @@ object(C)#1 (0) { } object(C)#1 (0) { } - diff --git a/Zend/tests/throwable_001.phpt b/Zend/tests/throwable_001.phpt index afcdd7224c..306ed13784 100644 --- a/Zend/tests/throwable_001.phpt +++ b/Zend/tests/throwable_001.phpt @@ -7,7 +7,6 @@ Aaron Piotrowski <aaron@icicle.io> throw new Exception('Exception message', 0, new Error('Error message')); ?> --EXPECTF-- - Fatal error: Uncaught Error: Error message in %s:%d Stack trace: #0 {main} diff --git a/Zend/tests/throwable_002.phpt b/Zend/tests/throwable_002.phpt index 10fd82bea5..f51969c6c5 100644 --- a/Zend/tests/throwable_002.phpt +++ b/Zend/tests/throwable_002.phpt @@ -7,7 +7,6 @@ Aaron Piotrowski <aaron@icicle.io> throw new Error('Error message', 0, new Exception('Exception message')); ?> --EXPECTF-- - Fatal error: Uncaught Exception: Exception message in %s:%d Stack trace: #0 {main} diff --git a/Zend/tests/throwable_003.phpt b/Zend/tests/throwable_003.phpt index 19626a3186..3e65027c79 100644 --- a/Zend/tests/throwable_003.phpt +++ b/Zend/tests/throwable_003.phpt @@ -7,5 +7,4 @@ Aaron Piotrowski <aaron@icicle.io> class Failure implements Throwable {} ?> --EXPECTF-- - Fatal error: Class Failure cannot implement interface Throwable, extend Exception or Error instead in %s on line %d diff --git a/Zend/tests/traits/bug55554a.phpt b/Zend/tests/traits/bug55554a.phpt index b92a81f54f..dd844ba661 100644 --- a/Zend/tests/traits/bug55554a.phpt +++ b/Zend/tests/traits/bug55554a.phpt @@ -28,7 +28,6 @@ $o = new NewConstructor; echo "Legacy constructor: "; $o = new LegacyConstructor; - --EXPECT-- New constructor: ctor executed Legacy constructor: ctor executed diff --git a/Zend/tests/traits/bug55554b.phpt b/Zend/tests/traits/bug55554b.phpt index cf2eadf2f8..65ecb7adaf 100644 --- a/Zend/tests/traits/bug55554b.phpt +++ b/Zend/tests/traits/bug55554b.phpt @@ -46,8 +46,6 @@ class ReportCollision { echo "ReportCollision: "; $o = new ReportCollision; - - --EXPECTF-- OverridingIsSilent1 __construct @@ -55,4 +53,3 @@ Deprecated: Methods with the same name as their class will not be constructors i OverridingIsSilent2 OverridingIsSilent2 Fatal error: ReportCollision has colliding constructor definitions coming from traits in %s on line %d - diff --git a/Zend/tests/traits/bug55554c.phpt b/Zend/tests/traits/bug55554c.phpt index ff6f37d3c2..420689259e 100644 --- a/Zend/tests/traits/bug55554c.phpt +++ b/Zend/tests/traits/bug55554c.phpt @@ -40,7 +40,5 @@ class ReportCollision { echo "ReportCollision: "; $o = new ReportCollision; - - --EXPECT-- ReportCollision: New constructor executed diff --git a/Zend/tests/traits/bug55554d.phpt b/Zend/tests/traits/bug55554d.phpt index 10f2e2952d..88564a83c1 100644 --- a/Zend/tests/traits/bug55554d.phpt +++ b/Zend/tests/traits/bug55554d.phpt @@ -25,8 +25,5 @@ class ReportCollision { } $o = new ReportCollision; - --EXPECTF-- - Fatal error: ReportCollision has colliding constructor definitions coming from traits in %s on line %d - diff --git a/Zend/tests/traits/bug55554e.phpt b/Zend/tests/traits/bug55554e.phpt index 5db508fc85..ed1c324831 100644 --- a/Zend/tests/traits/bug55554e.phpt +++ b/Zend/tests/traits/bug55554e.phpt @@ -24,7 +24,5 @@ class ReportCollision { echo "ReportCollision: "; $o = new ReportCollision; - - --EXPECTF-- -Fatal error: Trait method ReportCollision has not been applied, because there are collisions with other trait methods on ReportCollision in %s on line %d
\ No newline at end of file +Fatal error: Trait method ReportCollision has not been applied, because there are collisions with other trait methods on ReportCollision in %s on line %d diff --git a/Zend/tests/traits/bug55554f.phpt b/Zend/tests/traits/bug55554f.phpt index 31f5f534c5..d7d4fc007d 100644 --- a/Zend/tests/traits/bug55554f.phpt +++ b/Zend/tests/traits/bug55554f.phpt @@ -23,7 +23,5 @@ class ReportCollision { echo "ReportCollision: "; $o = new ReportCollision; - - --EXPECTF-- -Fatal error: ReportCollision has colliding constructor definitions coming from traits in %s on line %d
\ No newline at end of file +Fatal error: ReportCollision has colliding constructor definitions coming from traits in %s on line %d diff --git a/Zend/tests/traits/bug55554g.phpt b/Zend/tests/traits/bug55554g.phpt index 662140cec0..d7de8216b0 100644 --- a/Zend/tests/traits/bug55554g.phpt +++ b/Zend/tests/traits/bug55554g.phpt @@ -23,7 +23,5 @@ class ReportCollision { echo "ReportCollision: "; $o = new ReportCollision; - - --EXPECTF-- -Fatal error: ReportCollision has colliding constructor definitions coming from traits in %s on line %d
\ No newline at end of file +Fatal error: ReportCollision has colliding constructor definitions coming from traits in %s on line %d diff --git a/Zend/tests/traits/bug60153.phpt b/Zend/tests/traits/bug60153.phpt index 8f01e72c2d..5dcc78a878 100644 --- a/Zend/tests/traits/bug60153.phpt +++ b/Zend/tests/traits/bug60153.phpt @@ -14,6 +14,5 @@ trait TFoo { class C implements IFoo { use TFoo; } - --EXPECTF-- Fatal error: Declaration of C::oneArgument() must be compatible with IFoo::oneArgument($a) in %s on line %d diff --git a/Zend/tests/traits/bug60165a.phpt b/Zend/tests/traits/bug60165a.phpt index 245bb94e97..6bc3352e21 100644 --- a/Zend/tests/traits/bug60165a.phpt +++ b/Zend/tests/traits/bug60165a.phpt @@ -12,6 +12,5 @@ class MyClass { nonExistent as barA; } } - --EXPECTF-- Fatal error: An alias (barA) was defined for method nonExistent(), but this method does not exist in %s on line %d diff --git a/Zend/tests/traits/bug60165b.phpt b/Zend/tests/traits/bug60165b.phpt index 7b4855a646..ac3f070bd8 100644 --- a/Zend/tests/traits/bug60165b.phpt +++ b/Zend/tests/traits/bug60165b.phpt @@ -12,6 +12,5 @@ class MyClass { A::nonExistent as barA; } } - --EXPECTF-- Fatal error: An alias was defined for A::nonExistent but this method does not exist in %s on line %d diff --git a/Zend/tests/traits/bug60165c.phpt b/Zend/tests/traits/bug60165c.phpt index d72491f030..9a8458d65d 100644 --- a/Zend/tests/traits/bug60165c.phpt +++ b/Zend/tests/traits/bug60165c.phpt @@ -17,6 +17,5 @@ class MyClass { baz as foobar; } } - --EXPECTF-- Fatal error: An alias (foobar) was defined for method baz(), but this method does not exist in %s on line %d diff --git a/Zend/tests/traits/bug60165d.phpt b/Zend/tests/traits/bug60165d.phpt index 26ac927a81..6b4a09d059 100644 --- a/Zend/tests/traits/bug60165d.phpt +++ b/Zend/tests/traits/bug60165d.phpt @@ -16,6 +16,5 @@ class MyClass { A::bar insteadof B; } } - --EXPECTF-- Fatal error: A precedence rule was defined for A::bar but this method does not exist in %s on line %d diff --git a/Zend/tests/traits/bug60173.phpt b/Zend/tests/traits/bug60173.phpt index f525a66aee..d4683a9921 100644 --- a/Zend/tests/traits/bug60173.phpt +++ b/Zend/tests/traits/bug60173.phpt @@ -7,7 +7,6 @@ trait foo { } $rc = new ReflectionClass('foo'); $rc->newInstance(); - --EXPECTF-- Fatal error: Uncaught Error: Cannot instantiate trait foo in %s:%d Stack trace: diff --git a/Zend/tests/traits/bug60217a.phpt b/Zend/tests/traits/bug60217a.phpt index da0d06cd25..20132370c1 100644 --- a/Zend/tests/traits/bug60217a.phpt +++ b/Zend/tests/traits/bug60217a.phpt @@ -21,6 +21,5 @@ class C { $o = new C; $o->foo(); - --EXPECT-- C::foo() works. diff --git a/Zend/tests/traits/bug60217b.phpt b/Zend/tests/traits/bug60217b.phpt index 8b2b64e534..b349cf2c54 100644 --- a/Zend/tests/traits/bug60217b.phpt +++ b/Zend/tests/traits/bug60217b.phpt @@ -21,6 +21,5 @@ class CBroken { $o = new CBroken; $o->foo(1); - --EXPECTF-- Fatal error: Declaration of TBroken1::foo($a) must be compatible with TBroken2::foo($a, $b = 0) in %s diff --git a/Zend/tests/traits/bug60217c.phpt b/Zend/tests/traits/bug60217c.phpt index baa4314a61..401444e978 100644 --- a/Zend/tests/traits/bug60217c.phpt +++ b/Zend/tests/traits/bug60217c.phpt @@ -21,6 +21,5 @@ class CBroken { $o = new CBroken; $o->foo(1); - --EXPECTF-- Fatal error: Declaration of TBroken2::foo($a) must be compatible with TBroken1::foo($a, $b = 0) in %s on line %d diff --git a/Zend/tests/traits/bug60369.phpt b/Zend/tests/traits/bug60369.phpt index bfc1ee303f..77a7067232 100644 --- a/Zend/tests/traits/bug60369.phpt +++ b/Zend/tests/traits/bug60369.phpt @@ -14,4 +14,4 @@ class Properties { ?> --EXPECTF-- -Fatal error: Properties and PropertiesTrait define the same property ($same) in the composition of Properties. However, the definition differs and is considered incompatible. Class was composed in %s on line %d
\ No newline at end of file +Fatal error: Properties and PropertiesTrait define the same property ($same) in the composition of Properties. However, the definition differs and is considered incompatible. Class was composed in %s on line %d diff --git a/Zend/tests/traits/bug60717.phpt b/Zend/tests/traits/bug60717.phpt index d4bf7ea6de..d38b1c0c24 100644 --- a/Zend/tests/traits/bug60717.phpt +++ b/Zend/tests/traits/bug60717.phpt @@ -68,6 +68,5 @@ namespace HTML $o = new HTMLHelper6; echo 'Done'; } - --EXPECT-- Done diff --git a/Zend/tests/traits/bug65576a.phpt b/Zend/tests/traits/bug65576a.phpt index d5a86578ab..51d2463808 100644 --- a/Zend/tests/traits/bug65576a.phpt +++ b/Zend/tests/traits/bug65576a.phpt @@ -25,7 +25,5 @@ class B extends A } new B(); - --EXPECT-- Trait constructor - diff --git a/Zend/tests/traits/bug65576b.phpt b/Zend/tests/traits/bug65576b.phpt index 857c582d80..c13ce8c2e1 100644 --- a/Zend/tests/traits/bug65576b.phpt +++ b/Zend/tests/traits/bug65576b.phpt @@ -26,8 +26,6 @@ class B extends A } new B(); - --EXPECT-- Parent constructor Trait constructor - diff --git a/Zend/tests/traits/bug76700.phpt b/Zend/tests/traits/bug76700.phpt index 5b746d5671..a9797f3c9e 100644 --- a/Zend/tests/traits/bug76700.phpt +++ b/Zend/tests/traits/bug76700.phpt @@ -26,6 +26,5 @@ class B extends A $b = new B(); $b->aa(); - --EXPECT-- 123 diff --git a/Zend/tests/traits/bug76773.phpt b/Zend/tests/traits/bug76773.phpt index 2601d1cdda..683952025d 100644 --- a/Zend/tests/traits/bug76773.phpt +++ b/Zend/tests/traits/bug76773.phpt @@ -27,7 +27,6 @@ class ChildClass extends ParentClass $c = new ChildClass(); $c->hello(); - --EXPECT-- ChildClass ParentClass diff --git a/Zend/tests/traits/bugs/abstract-methods01.phpt b/Zend/tests/traits/bugs/abstract-methods01.phpt index 5b90ae0f3d..23cdef3a89 100644 --- a/Zend/tests/traits/bugs/abstract-methods01.phpt +++ b/Zend/tests/traits/bugs/abstract-methods01.phpt @@ -16,4 +16,4 @@ $test = new TraitsTest(); $test->hello(); ?> --EXPECTF-- -Fatal error: Class %s contains %d abstract method and must therefore be declared abstract or implement the remaining methods (%s) in %s on line %d
\ No newline at end of file +Fatal error: Class %s contains %d abstract method and must therefore be declared abstract or implement the remaining methods (%s) in %s on line %d diff --git a/Zend/tests/traits/bugs/abstract-methods02.phpt b/Zend/tests/traits/bugs/abstract-methods02.phpt index 626df3d6eb..73bb65d179 100644 --- a/Zend/tests/traits/bugs/abstract-methods02.phpt +++ b/Zend/tests/traits/bugs/abstract-methods02.phpt @@ -23,4 +23,4 @@ $test = new TraitsTest(); $test->hello(); ?> --EXPECT-- -Hello
\ No newline at end of file +Hello diff --git a/Zend/tests/traits/bugs/abstract-methods03.phpt b/Zend/tests/traits/bugs/abstract-methods03.phpt index 44746578e0..b871bc8e4b 100644 --- a/Zend/tests/traits/bugs/abstract-methods03.phpt +++ b/Zend/tests/traits/bugs/abstract-methods03.phpt @@ -19,4 +19,4 @@ $test = new TraitsTest(); $test->hello(); ?> --EXPECT-- -Hello
\ No newline at end of file +Hello diff --git a/Zend/tests/traits/bugs/abstract-methods04.phpt b/Zend/tests/traits/bugs/abstract-methods04.phpt index 5cfc7d7d51..d15bdd9473 100644 --- a/Zend/tests/traits/bugs/abstract-methods04.phpt +++ b/Zend/tests/traits/bugs/abstract-methods04.phpt @@ -33,4 +33,4 @@ $test->hello(); ?> --EXPECT-- -HelloHello
\ No newline at end of file +HelloHello diff --git a/Zend/tests/traits/bugs/alias-semantics.phpt b/Zend/tests/traits/bugs/alias-semantics.phpt index a940ab0942..eec2de1aff 100644 --- a/Zend/tests/traits/bugs/alias-semantics.phpt +++ b/Zend/tests/traits/bugs/alias-semantics.phpt @@ -20,4 +20,4 @@ $test->b(); ?> --EXPECT-- -AA
\ No newline at end of file +AA diff --git a/Zend/tests/traits/bugs/alias-semantics02.phpt b/Zend/tests/traits/bugs/alias-semantics02.phpt index 5ce117ea76..bcd75d9cf9 100644 --- a/Zend/tests/traits/bugs/alias-semantics02.phpt +++ b/Zend/tests/traits/bugs/alias-semantics02.phpt @@ -22,4 +22,4 @@ $test->b(); ?> --EXPECT-- -AA
\ No newline at end of file +AA diff --git a/Zend/tests/traits/bugs/missing-trait.phpt b/Zend/tests/traits/bugs/missing-trait.phpt index 1cdd4f1cc6..d8ede9dfa7 100644 --- a/Zend/tests/traits/bugs/missing-trait.phpt +++ b/Zend/tests/traits/bugs/missing-trait.phpt @@ -12,4 +12,4 @@ $test = new TraitsTest(); ?> --EXPECTF-- -Fatal error: Trait 'THello' not found in %s on line %d
\ No newline at end of file +Fatal error: Trait 'THello' not found in %s on line %d diff --git a/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt b/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt index 9425b9215b..1029dee634 100644 --- a/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt +++ b/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt @@ -28,4 +28,4 @@ $test = new TraitsTest(); $test->hello(); ?> --EXPECT-- -Hello
\ No newline at end of file +Hello diff --git a/Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt b/Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt index b289651a9b..5c54f0027a 100644 --- a/Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt +++ b/Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt @@ -20,4 +20,4 @@ $obj = new baz(); echo $obj->zoo, "\n"; ?> --EXPECTF-- -Fatal error: baz and foo define the same property ($zoo) in the composition of baz. However, the definition differs and is considered incompatible. Class was composed in %s on line %d
\ No newline at end of file +Fatal error: baz and foo define the same property ($zoo) in the composition of baz. However, the definition differs and is considered incompatible. Class was composed in %s on line %d diff --git a/Zend/tests/traits/conflict001.phpt b/Zend/tests/traits/conflict001.phpt index dfc9456853..11dababdb5 100644 --- a/Zend/tests/traits/conflict001.phpt +++ b/Zend/tests/traits/conflict001.phpt @@ -22,4 +22,4 @@ class TraitsTest { } ?> --EXPECTF-- -Fatal error: Trait method hello has not been applied, because there are collisions with other trait methods on TraitsTest in %s on line %d
\ No newline at end of file +Fatal error: Trait method hello has not been applied, because there are collisions with other trait methods on TraitsTest in %s on line %d diff --git a/Zend/tests/traits/conflict002.phpt b/Zend/tests/traits/conflict002.phpt index a723639ee9..1327de1458 100644 --- a/Zend/tests/traits/conflict002.phpt +++ b/Zend/tests/traits/conflict002.phpt @@ -29,4 +29,4 @@ $o = new TheWorldIsNotEnough(); $o->sayHello(); // echos Hello Universe! ?> --EXPECT-- -Hello Universe!
\ No newline at end of file +Hello Universe! diff --git a/Zend/tests/traits/conflict003.phpt b/Zend/tests/traits/conflict003.phpt index 577f5c73c3..e274063a6f 100644 --- a/Zend/tests/traits/conflict003.phpt +++ b/Zend/tests/traits/conflict003.phpt @@ -28,4 +28,4 @@ class Talker { ?> --EXPECTF-- -Fatal error: Trait method smallTalk has not been applied, because there are collisions with other trait methods on Talker in %s on line %d
\ No newline at end of file +Fatal error: Trait method smallTalk has not been applied, because there are collisions with other trait methods on Talker in %s on line %d diff --git a/Zend/tests/traits/flattening001.phpt b/Zend/tests/traits/flattening001.phpt index eed429111e..db72182bb3 100644 --- a/Zend/tests/traits/flattening001.phpt +++ b/Zend/tests/traits/flattening001.phpt @@ -39,4 +39,4 @@ var_dump($o->getText()); --EXPECT-- string(4) "test" string(3) "foo" -string(3) "bar"
\ No newline at end of file +string(3) "bar" diff --git a/Zend/tests/traits/flattening002.phpt b/Zend/tests/traits/flattening002.phpt index abae314d1f..810681072b 100644 --- a/Zend/tests/traits/flattening002.phpt +++ b/Zend/tests/traits/flattening002.phpt @@ -25,4 +25,4 @@ $o = new MyHelloWorld(); $o->sayHello(); ?> --EXPECT-- -Hello World!
\ No newline at end of file +Hello World! diff --git a/Zend/tests/traits/flattening003.phpt b/Zend/tests/traits/flattening003.phpt index 276d117bb8..0b4d87a295 100644 --- a/Zend/tests/traits/flattening003.phpt +++ b/Zend/tests/traits/flattening003.phpt @@ -29,4 +29,4 @@ $o->sayHello(); $o->sayWorld(); ?> --EXPECT-- -Hello World!
\ No newline at end of file +Hello World! diff --git a/Zend/tests/traits/inheritance001.phpt b/Zend/tests/traits/inheritance001.phpt index 90cad90c46..60c5fcfc0b 100644 --- a/Zend/tests/traits/inheritance001.phpt +++ b/Zend/tests/traits/inheritance001.phpt @@ -21,4 +21,4 @@ $o = new TheWorldIsNotEnough(); $o->sayHello(); // echos Hello Universe! ?> --EXPECT-- -Hello Universe!
\ No newline at end of file +Hello Universe! diff --git a/Zend/tests/traits/inheritance002.phpt b/Zend/tests/traits/inheritance002.phpt index 0bcaca9f07..31c63a0f25 100644 --- a/Zend/tests/traits/inheritance002.phpt +++ b/Zend/tests/traits/inheritance002.phpt @@ -24,4 +24,4 @@ $o = new MyHelloWorld(); $o->sayHello(); ?> --EXPECT-- -World!
\ No newline at end of file +World! diff --git a/Zend/tests/traits/language002.phpt b/Zend/tests/traits/language002.phpt index ac29e2a124..2f336b8b8b 100644 --- a/Zend/tests/traits/language002.phpt +++ b/Zend/tests/traits/language002.phpt @@ -29,4 +29,4 @@ $o->sayWorld(); $o->sayExclamationMark(); ?> --EXPECT-- -Hello World!
\ No newline at end of file +Hello World! diff --git a/Zend/tests/traits/language003.phpt b/Zend/tests/traits/language003.phpt index 2b97a0a150..9525b65b3a 100644 --- a/Zend/tests/traits/language003.phpt +++ b/Zend/tests/traits/language003.phpt @@ -26,4 +26,4 @@ $o = new MyHelloWorld(); $o->saySomething(); ?> --EXPECT-- -Hello
\ No newline at end of file +Hello diff --git a/Zend/tests/traits/language004.phpt b/Zend/tests/traits/language004.phpt index a582c3cd9d..76959d011d 100644 --- a/Zend/tests/traits/language004.phpt +++ b/Zend/tests/traits/language004.phpt @@ -28,4 +28,4 @@ $o->saySomething(); $o->sayWorld(); ?> --EXPECT-- -Hello World
\ No newline at end of file +Hello World diff --git a/Zend/tests/traits/language005.phpt b/Zend/tests/traits/language005.phpt index 84b14c3420..762c1e4ac5 100644 --- a/Zend/tests/traits/language005.phpt +++ b/Zend/tests/traits/language005.phpt @@ -37,4 +37,4 @@ $t->talk(); ?> --EXPECT-- -bAB
\ No newline at end of file +bAB diff --git a/Zend/tests/traits/language006.phpt b/Zend/tests/traits/language006.phpt index e2f77580a3..2ed2fa9c21 100644 --- a/Zend/tests/traits/language006.phpt +++ b/Zend/tests/traits/language006.phpt @@ -28,4 +28,4 @@ $o->sayHelloWorld(); ?> --EXPECT-- -Hello World!
\ No newline at end of file +Hello World! diff --git a/Zend/tests/traits/language007.phpt b/Zend/tests/traits/language007.phpt index 5ab676853f..67cb7f86c2 100644 --- a/Zend/tests/traits/language007.phpt +++ b/Zend/tests/traits/language007.phpt @@ -27,4 +27,4 @@ $o->sayWorld(); ?> --EXPECT-- -Hello World!
\ No newline at end of file +Hello World! diff --git a/Zend/tests/traits/language008a.phpt b/Zend/tests/traits/language008a.phpt index 65a792faac..2d87de92e8 100644 --- a/Zend/tests/traits/language008a.phpt +++ b/Zend/tests/traits/language008a.phpt @@ -23,4 +23,4 @@ $o->sayHello(); Fatal error: Uncaught Error: Call to protected method MyClass::sayHello() from context '' in %s:%d Stack trace: #0 {main} - thrown in %s on line %d
\ No newline at end of file + thrown in %s on line %d diff --git a/Zend/tests/traits/language008b.phpt b/Zend/tests/traits/language008b.phpt index c1a0d2629f..e40ff59282 100644 --- a/Zend/tests/traits/language008b.phpt +++ b/Zend/tests/traits/language008b.phpt @@ -30,4 +30,4 @@ Hello World!Hello World! Fatal error: Uncaught Error: Call to private method MyClass::sayHelloWorld() from context '' in %s:%d Stack trace: #0 {main} - thrown in %s on line %d
\ No newline at end of file + thrown in %s on line %d diff --git a/Zend/tests/traits/language009.phpt b/Zend/tests/traits/language009.phpt index 998fde8e61..0672532195 100644 --- a/Zend/tests/traits/language009.phpt +++ b/Zend/tests/traits/language009.phpt @@ -33,4 +33,4 @@ $t->foo(); ?> --EXPECT-- -b
\ No newline at end of file +b diff --git a/Zend/tests/traits/language010.phpt b/Zend/tests/traits/language010.phpt index ac3ab2e29e..cd518f43e2 100644 --- a/Zend/tests/traits/language010.phpt +++ b/Zend/tests/traits/language010.phpt @@ -27,4 +27,4 @@ $o->world(); ?> --EXPECTF-- -Fatal error: Trait method world has not been applied, because there are collisions with other trait methods on MyClass in %s on line %d
\ No newline at end of file +Fatal error: Trait method world has not been applied, because there are collisions with other trait methods on MyClass in %s on line %d diff --git a/Zend/tests/traits/property009.phpt b/Zend/tests/traits/property009.phpt index 0b5918c614..1b05382c0d 100644 --- a/Zend/tests/traits/property009.phpt +++ b/Zend/tests/traits/property009.phpt @@ -41,7 +41,6 @@ var_dump($b); ?> --EXPECT-- - object(SubclassClassicInheritance)#1 (1) { ["hello"]=> int(0) diff --git a/Zend/tests/traits/static_001.phpt b/Zend/tests/traits/static_001.phpt index 5953c008d5..326481c779 100644 --- a/Zend/tests/traits/static_001.phpt +++ b/Zend/tests/traits/static_001.phpt @@ -19,4 +19,4 @@ Simas Toleikis simast@gmail.com ?> --EXPECT-- -Test
\ No newline at end of file +Test diff --git a/Zend/tests/traits/static_002.phpt b/Zend/tests/traits/static_002.phpt index 64ebf6bf14..5c1a92a806 100644 --- a/Zend/tests/traits/static_002.phpt +++ b/Zend/tests/traits/static_002.phpt @@ -20,4 +20,4 @@ Simas Toleikis simast@gmail.com ?> --EXPECT-- -Test
\ No newline at end of file +Test diff --git a/Zend/tests/traits/static_003.phpt b/Zend/tests/traits/static_003.phpt index 01953cf724..7417083f69 100644 --- a/Zend/tests/traits/static_003.phpt +++ b/Zend/tests/traits/static_003.phpt @@ -24,4 +24,4 @@ Simas Toleikis simast@gmail.com ?> --EXPECT-- -Test B
\ No newline at end of file +Test B diff --git a/Zend/tests/traits/static_004.phpt b/Zend/tests/traits/static_004.phpt index 3c3f380908..ca02a85e80 100644 --- a/Zend/tests/traits/static_004.phpt +++ b/Zend/tests/traits/static_004.phpt @@ -19,4 +19,4 @@ Simas Toleikis simast@gmail.com ?> --EXPECT-- -Test
\ No newline at end of file +Test diff --git a/Zend/tests/traits/static_forward_static_call.phpt b/Zend/tests/traits/static_forward_static_call.phpt index 9cda8aee1d..9ba53bf08a 100644 --- a/Zend/tests/traits/static_forward_static_call.phpt +++ b/Zend/tests/traits/static_forward_static_call.phpt @@ -25,4 +25,4 @@ Simas Toleikis simast@gmail.com ?> --EXPECT-- -Forwarded Test A
\ No newline at end of file +Forwarded Test A diff --git a/Zend/tests/traits/static_get_called_class.phpt b/Zend/tests/traits/static_get_called_class.phpt index bd7a603712..b1d8fa3d1e 100644 --- a/Zend/tests/traits/static_get_called_class.phpt +++ b/Zend/tests/traits/static_get_called_class.phpt @@ -21,4 +21,4 @@ Simas Toleikis simast@gmail.com ?> --EXPECT-- -B
\ No newline at end of file +B diff --git a/Zend/tests/traits/trait_constant_002.phpt b/Zend/tests/traits/trait_constant_002.phpt index ece3f61f9d..ebd75094e6 100644 --- a/Zend/tests/traits/trait_constant_002.phpt +++ b/Zend/tests/traits/trait_constant_002.phpt @@ -24,4 +24,4 @@ __TRAIT__: Use outside of traits. --EXPECT-- string(0) "" string(0) "" -string(0) ""
\ No newline at end of file +string(0) "" diff --git a/Zend/tests/try/bug72629.phpt b/Zend/tests/try/bug72629.phpt index 2d596c78f8..034a63b306 100644 --- a/Zend/tests/try/bug72629.phpt +++ b/Zend/tests/try/bug72629.phpt @@ -11,6 +11,5 @@ try { } catch (Exception $e) { } var_dump($var === $e); - --EXPECT-- bool(true) diff --git a/Zend/tests/try/bug74444.phpt b/Zend/tests/try/bug74444.phpt index 838d12ef03..74e0c9d46f 100644 --- a/Zend/tests/try/bug74444.phpt +++ b/Zend/tests/try/bug74444.phpt @@ -72,6 +72,5 @@ function foo() } foo(); - --EXPECT-- 12 diff --git a/Zend/tests/try/try_finally_012.phpt b/Zend/tests/try/try_finally_012.phpt index 32fec7ab29..a099ed3d6b 100644 --- a/Zend/tests/try/try_finally_012.phpt +++ b/Zend/tests/try/try_finally_012.phpt @@ -29,4 +29,3 @@ try { --EXPECT-- finally exception in main - diff --git a/Zend/tests/try/try_finally_022.phpt b/Zend/tests/try/try_finally_022.phpt index 51f6a26419..ff10dead42 100644 --- a/Zend/tests/try/try_finally_022.phpt +++ b/Zend/tests/try/try_finally_022.phpt @@ -38,4 +38,3 @@ try{ ?> --EXPECT-- exception2 - diff --git a/Zend/tests/try/try_multicatch_006.phpt b/Zend/tests/try/try_multicatch_006.phpt index e4505f1b24..440e06593c 100644 --- a/Zend/tests/try/try_multicatch_006.phpt +++ b/Zend/tests/try/try_multicatch_006.phpt @@ -19,4 +19,3 @@ try { TRY Exception3 FINALLY - diff --git a/Zend/tests/try/try_multicatch_007.phpt b/Zend/tests/try/try_multicatch_007.phpt index aa073b0592..40784108a0 100644 --- a/Zend/tests/try/try_multicatch_007.phpt +++ b/Zend/tests/try/try_multicatch_007.phpt @@ -19,4 +19,3 @@ try { TRY Exception4 FINALLY - diff --git a/Zend/tests/type_declarations/callable_001.phpt b/Zend/tests/type_declarations/callable_001.phpt index 0466288d59..3113bedcf0 100644 --- a/Zend/tests/type_declarations/callable_001.phpt +++ b/Zend/tests/type_declarations/callable_001.phpt @@ -36,4 +36,3 @@ array(2) { } object(Closure)#%d (0) { } - diff --git a/Zend/tests/type_declarations/callable_002.phpt b/Zend/tests/type_declarations/callable_002.phpt index 01b6945755..35564ff1af 100644 --- a/Zend/tests/type_declarations/callable_002.phpt +++ b/Zend/tests/type_declarations/callable_002.phpt @@ -24,4 +24,3 @@ var_dump($rc->getParameters()[0]->isCallable()); bool(true) bool(true) bool(true) - diff --git a/Zend/tests/type_declarations/callable_003.phpt b/Zend/tests/type_declarations/callable_003.phpt index b5e722cae3..3489c32d37 100644 --- a/Zend/tests/type_declarations/callable_003.phpt +++ b/Zend/tests/type_declarations/callable_003.phpt @@ -18,4 +18,3 @@ string(6) "strpos" int(123) string(6) "strpos" string(6) "substr" - diff --git a/Zend/tests/type_declarations/inexistent_class_hint_with_scalar_arg.phpt b/Zend/tests/type_declarations/inexistent_class_hint_with_scalar_arg.phpt index 2f6c881017..8aec0c009f 100644 --- a/Zend/tests/type_declarations/inexistent_class_hint_with_scalar_arg.phpt +++ b/Zend/tests/type_declarations/inexistent_class_hint_with_scalar_arg.phpt @@ -13,4 +13,3 @@ Stack trace: #0 %s(%d): foo(NULL) #1 {main} thrown in %s on line %d - diff --git a/Zend/tests/type_declarations/iterable_001.phpt b/Zend/tests/type_declarations/iterable_001.phpt index b9e8119436..b6755c49b9 100644 --- a/Zend/tests/type_declarations/iterable_001.phpt +++ b/Zend/tests/type_declarations/iterable_001.phpt @@ -22,7 +22,6 @@ try { } catch (Throwable $e) { echo $e->getMessage(); } - --EXPECTF-- array(3) { [0]=> diff --git a/Zend/tests/type_declarations/iterable_002.phpt b/Zend/tests/type_declarations/iterable_002.phpt index 74f6d83f1e..b9e02e40cd 100644 --- a/Zend/tests/type_declarations/iterable_002.phpt +++ b/Zend/tests/type_declarations/iterable_002.phpt @@ -17,5 +17,4 @@ function baz(iterable $iterable = 1) { ?> --EXPECTF-- - Fatal error: Default value for parameters with iterable type can only be an array or NULL in %s on line %d diff --git a/Zend/tests/type_declarations/iterable_004.phpt b/Zend/tests/type_declarations/iterable_004.phpt index 47e79fa6b3..58b3f67f40 100644 --- a/Zend/tests/type_declarations/iterable_004.phpt +++ b/Zend/tests/type_declarations/iterable_004.phpt @@ -21,5 +21,4 @@ class Bar extends Foo { ?> --EXPECTF-- - Warning: Declaration of Bar::testScalar(iterable $iterable) should be compatible with Foo::testScalar(int $int) in %s on line %d diff --git a/Zend/tests/type_declarations/iterable_005.phpt b/Zend/tests/type_declarations/iterable_005.phpt index 9c0584b51a..39dede3b5c 100644 --- a/Zend/tests/type_declarations/iterable_005.phpt +++ b/Zend/tests/type_declarations/iterable_005.phpt @@ -29,5 +29,4 @@ class TestScalar extends Test { ?> --EXPECTF-- - Fatal error: Declaration of TestScalar::method(): int must be compatible with Test::method(): iterable in %s on line %d diff --git a/Zend/tests/type_declarations/scalar_basic.phpt b/Zend/tests/type_declarations/scalar_basic.phpt index 16e7875ff9..1253f48c16 100644 --- a/Zend/tests/type_declarations/scalar_basic.phpt +++ b/Zend/tests/type_declarations/scalar_basic.phpt @@ -59,7 +59,6 @@ foreach ($functions as $type => $function) { echo PHP_EOL . "Done"; ?> --EXPECTF-- - Testing 'int' type: *** Trying int(1) diff --git a/Zend/tests/type_declarations/scalar_float_with_invalid_default.phpt b/Zend/tests/type_declarations/scalar_float_with_invalid_default.phpt index 7bc2fda2b9..fd7f96ab95 100644 --- a/Zend/tests/type_declarations/scalar_float_with_invalid_default.phpt +++ b/Zend/tests/type_declarations/scalar_float_with_invalid_default.phpt @@ -12,5 +12,4 @@ test(); ?> --EXPECTF-- - Fatal error: Default value for parameters with a float type can only be float, integer, or NULL in %s on line %d diff --git a/Zend/tests/type_declarations/scalar_strict_declaration_placement_005.phpt b/Zend/tests/type_declarations/scalar_strict_declaration_placement_005.phpt index b213bb11dd..88b21be082 100644 --- a/Zend/tests/type_declarations/scalar_strict_declaration_placement_005.phpt +++ b/Zend/tests/type_declarations/scalar_strict_declaration_placement_005.phpt @@ -11,4 +11,4 @@ var_dump(strlen("abc")); ?> --EXPECT-- -int(3)
\ No newline at end of file +int(3) diff --git a/Zend/tests/type_declarations/scalar_strict_declaration_placement_006.phpt b/Zend/tests/type_declarations/scalar_strict_declaration_placement_006.phpt index 7337ee4379..e0644482cb 100644 --- a/Zend/tests/type_declarations/scalar_strict_declaration_placement_006.phpt +++ b/Zend/tests/type_declarations/scalar_strict_declaration_placement_006.phpt @@ -22,4 +22,4 @@ var_dump(strlen("abc")); ?> --EXPECT-- -int(3)
\ No newline at end of file +int(3) diff --git a/Zend/tests/type_declarations/scalar_strict_declaration_placement_007.phpt b/Zend/tests/type_declarations/scalar_strict_declaration_placement_007.phpt index deb7a8c976..9afef254a9 100644 --- a/Zend/tests/type_declarations/scalar_strict_declaration_placement_007.phpt +++ b/Zend/tests/type_declarations/scalar_strict_declaration_placement_007.phpt @@ -22,4 +22,4 @@ var_dump(strlen("abc")); ?> --EXPECT-- -int(3)
\ No newline at end of file +int(3) diff --git a/Zend/tests/type_declarations/scalar_strict_declaration_placement_008.phpt b/Zend/tests/type_declarations/scalar_strict_declaration_placement_008.phpt index 87a09af96c..b5ddc9f0d3 100644 --- a/Zend/tests/type_declarations/scalar_strict_declaration_placement_008.phpt +++ b/Zend/tests/type_declarations/scalar_strict_declaration_placement_008.phpt @@ -8,4 +8,4 @@ declare(strict_types=1) { ?> --EXPECTF-- -Fatal error: strict_types declaration must not use block mode in %s on line %d
\ No newline at end of file +Fatal error: strict_types declaration must not use block mode in %s on line %d diff --git a/Zend/tests/type_declarations/strict_call_weak.phpt b/Zend/tests/type_declarations/strict_call_weak.phpt index d064161480..d8dc93bc1e 100644 --- a/Zend/tests/type_declarations/strict_call_weak.phpt +++ b/Zend/tests/type_declarations/strict_call_weak.phpt @@ -18,4 +18,3 @@ Stack trace: #0 %s(%d): function_declared_in_weak_mode(1) #1 {main} thrown in %sstrict_call_weak_2.inc on line 5 - diff --git a/Zend/tests/type_declarations/strict_call_weak_explicit.phpt b/Zend/tests/type_declarations/strict_call_weak_explicit.phpt index e909ee0141..e083d586e6 100644 --- a/Zend/tests/type_declarations/strict_call_weak_explicit.phpt +++ b/Zend/tests/type_declarations/strict_call_weak_explicit.phpt @@ -18,4 +18,3 @@ Stack trace: #0 %s(%d): function_declared_in_weak_mode(1) #1 {main} thrown in %sstrict_call_weak_explicit_2.inc on line 5 - diff --git a/Zend/tests/varSyntax/constClassMemberAccess.phpt b/Zend/tests/varSyntax/constClassMemberAccess.phpt index 41d871abb3..6df485b5c9 100644 --- a/Zend/tests/varSyntax/constClassMemberAccess.phpt +++ b/Zend/tests/varSyntax/constClassMemberAccess.phpt @@ -24,4 +24,4 @@ array(1) { ["b"]=> string(1) "c" } -string(1) "c"
\ No newline at end of file +string(1) "c" diff --git a/Zend/tests/zend_signed_multiply-64bit-2.phpt b/Zend/tests/zend_signed_multiply-64bit-2.phpt index 9c61a22bc3..aa8ee47db6 100644 --- a/Zend/tests/zend_signed_multiply-64bit-2.phpt +++ b/Zend/tests/zend_signed_multiply-64bit-2.phpt @@ -146,4 +146,3 @@ int(16) int(922337203685477580) float(1.4757395258968E+19) ----------- - |