diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/basic/bug46313-win.phpt | 4 | ||||
| -rw-r--r-- | tests/basic/bug46313.phpt | 1 | ||||
| -rw-r--r-- | tests/basic/bug46759.phpt | 1 | ||||
| -rw-r--r-- | tests/classes/interface_constant_inheritance_001.phpt | 2 | ||||
| -rw-r--r-- | tests/classes/interface_constant_inheritance_002.phpt | 2 | ||||
| -rw-r--r-- | tests/classes/interface_constant_inheritance_003.phpt | 2 | ||||
| -rw-r--r-- | tests/output/ob_011.phpt | 3 | ||||
| -rw-r--r-- | tests/output/ob_start_basic_unerasable_005.phpt | 2 | ||||
| -rw-r--r-- | tests/security/magic_quotes_gpc.phpt | 1 |
9 files changed, 10 insertions, 8 deletions
diff --git a/tests/basic/bug46313-win.phpt b/tests/basic/bug46313-win.phpt index a85178995..1971e807b 100644 --- a/tests/basic/bug46313-win.phpt +++ b/tests/basic/bug46313-win.phpt @@ -60,6 +60,6 @@ string(12) "o1" bool(true) string(%d) "%s" bool(true) -PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 -PHP Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0 +Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 +Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0 diff --git a/tests/basic/bug46313.phpt b/tests/basic/bug46313.phpt index 275b26796..924114161 100644 --- a/tests/basic/bug46313.phpt +++ b/tests/basic/bug46313.phpt @@ -6,6 +6,7 @@ Bug #46313 (Magic quotes broke $_FILES) magic_quotes_gpc=1 file_uploads=1 register_globals=1 +display_errors=0 --POST_RAW-- Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737 -----------------------------20896060251896012921717172737 diff --git a/tests/basic/bug46759.phpt b/tests/basic/bug46759.phpt index c5db2b9bb..d35cd534c 100644 --- a/tests/basic/bug46759.phpt +++ b/tests/basic/bug46759.phpt @@ -1,6 +1,7 @@ --TEST-- Testing magic_quotes_gpc --INI-- +display_errors=0 magic_quotes_gpc=1 --GET-- a='&b="&c=\" diff --git a/tests/classes/interface_constant_inheritance_001.phpt b/tests/classes/interface_constant_inheritance_001.phpt index ae3e71e7a..f982a4a64 100644 --- a/tests/classes/interface_constant_inheritance_001.phpt +++ b/tests/classes/interface_constant_inheritance_001.phpt @@ -14,4 +14,4 @@ echo "Done\n"; ?> --EXPECTF-- -Fatal error: Cannot inherit previously-inherited constant FOO from interface I1 in %s on line 6
\ No newline at end of file +Fatal error: Cannot inherit previously-inherited or override constant FOO from interface I1 in %s on line 6 diff --git a/tests/classes/interface_constant_inheritance_002.phpt b/tests/classes/interface_constant_inheritance_002.phpt index d5001baa3..af4ce695f 100644 --- a/tests/classes/interface_constant_inheritance_002.phpt +++ b/tests/classes/interface_constant_inheritance_002.phpt @@ -14,4 +14,4 @@ echo "Done\n"; ?> --EXPECTF-- -Fatal error: Cannot inherit previously-inherited constant FOO from interface I in %s on line 6
\ No newline at end of file +Fatal error: Cannot inherit previously-inherited or override constant FOO from interface I in %s on line 6 diff --git a/tests/classes/interface_constant_inheritance_003.phpt b/tests/classes/interface_constant_inheritance_003.phpt index a3ba815ed..6b4139bd9 100644 --- a/tests/classes/interface_constant_inheritance_003.phpt +++ b/tests/classes/interface_constant_inheritance_003.phpt @@ -17,4 +17,4 @@ echo "Done\n"; ?> --EXPECTF-- -Fatal error: Cannot inherit previously-inherited constant FOO from interface I2 in %s on line 10 +Fatal error: Cannot inherit previously-inherited or override constant FOO from interface I2 in %s on line 10 diff --git a/tests/output/ob_011.phpt b/tests/output/ob_011.phpt index 996ed3925..a90fd56f8 100644 --- a/tests/output/ob_011.phpt +++ b/tests/output/ob_011.phpt @@ -1,8 +1,7 @@ --TEST-- output buffering - fatalism --XFAIL-- -This test will fail until the fix in version 1.178 of ext/main/output.c -is backported from php 6 +This test will fail until the fix in revision r214155 is backported from php 6 --FILE-- <?php function obh($s) diff --git a/tests/output/ob_start_basic_unerasable_005.phpt b/tests/output/ob_start_basic_unerasable_005.phpt index 6bfb7ae90..7be71e5aa 100644 --- a/tests/output/ob_start_basic_unerasable_005.phpt +++ b/tests/output/ob_start_basic_unerasable_005.phpt @@ -1,5 +1,5 @@ --TEST-- -ob_start(): Ensure unerasable buffer cannot be flushed by ob_flush(). +ob_start(): Ensure unerasable buffer cannot be flushed by ob_flush() --FILE-- <?php function callback($string) { diff --git a/tests/security/magic_quotes_gpc.phpt b/tests/security/magic_quotes_gpc.phpt index eb5b84242..382ab94d2 100644 --- a/tests/security/magic_quotes_gpc.phpt +++ b/tests/security/magic_quotes_gpc.phpt @@ -1,6 +1,7 @@ --TEST-- Test if magic_quotes_gpc works as expected --INI-- +display_errors=0 magic_quotes_gpc=1 --GET-- a=abc'"%00123 |