Skip to content

Commit 7bfe056

Browse files
dstogovdstogov
committed
Fixed tests
1 parent a0a8c58 commit 7bfe056

33 files changed

+40
-37
lines changed

‎ext/curl/tests/curl_setopt_basic001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ curl_close($ch);
2727
var_dump( $curl_content );
2828
?>
2929
--EXPECTF--
30-
PHP Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0
30+
Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0
3131
*** Testing curl_setopt with CURLOPT_FOLLOWLOCATION in safemode
3232

3333
Warning: curl_setopt(): CURLOPT_FOLLOWLOCATION cannot be activated when in safe_mode or an open_basedir is set in %s on line %d

‎ext/dba/tests/dba_cdb_make.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ magic_quotes_runtime=1
3333
}
3434
?>
3535
--EXPECT--
36-
PHP Warning: Directive 'magic_quotes_runtime' is deprecated in PHP 5.3 and greater in Unknown on line 0
36+
Warning: Directive 'magic_quotes_runtime' is deprecated in PHP 5.3 and greater in Unknown on line 0
3737
database handler: cdb_make
3838
string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5"
3939
string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5"

‎ext/exif/tests/exif006.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ magic_quotes_runtime=1
2020
var_dump(exif_read_data(dirname(__FILE__).'/test6.jpg','',true,false));
2121
?>
2222
--EXPECTF--
23-
PHP Warning: Directive 'magic_quotes_runtime' is deprecated in PHP 5.3 and greater in Unknown on line 0
23+
Warning: Directive 'magic_quotes_runtime' is deprecated in PHP 5.3 and greater in Unknown on line 0
2424
array(5) {
2525
["FILE"]=>
2626
array(6) {

‎ext/filter/tests/bug39763.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ parse_str("val=%22probably+a+bug%22");
1212
echo $val . "\n";
1313
?>
1414
--EXPECT--
15-
PHP Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0
15+
Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0
1616
\"probably a bug\"
1717
\"probably a bug\"

‎ext/oci8/tests/oci8safemode.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $r = oci_password_change($c, "hr", "hrpwd", "hrpwd");
1515
echo "Done\n";
1616
?>
1717
--EXPECTF--
18-
PHP Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0
18+
Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0
1919

2020
Warning: oci_connect(): Privileged connect is disabled in Safe Mode in %s on line %d
2121

‎ext/pcre/tests/bug33200.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ $str = preg_replace("/(some.*text)/e", "strtoupper('\\1')", $str);
99
echo $str . "\r\n";
1010
?>
1111
--EXPECT--
12-
PHP Warning: Directive 'magic_quotes_sybase' is deprecated in PHP 5.3 and greater in Unknown on line 0
12+
Warning: Directive 'magic_quotes_sybase' is deprecated in PHP 5.3 and greater in Unknown on line 0
1313
SOME '$SAMPLE' TEXT

‎ext/posix/tests/posix_access.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ chmod ($filename, 0700);
4343
unlink($filename);
4444
?>
4545
--EXPECTF--
46-
PHP Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in %s on line %d
46+
Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in %s on line %d
4747
bool(true)
4848
bool(true)
4949
bool(true)

‎ext/posix/tests/posix_access_error_modes.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ chmod ($filename, 0700);
3737
unlink($filename);
3838
?>
3939
--EXPECTF--
40-
PHP Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line %d
40+
Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line %d
4141
bool(false)
4242
bool(false)
4343
bool(false)

‎ext/posix/tests/posix_access_error_wrongparams.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ var_dump(posix_access('./foobar'));
2828
?>
2929
===DONE===
3030
--EXPECTF--
31-
PHP Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0
31+
Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0
3232

3333
Warning: posix_access() expects at least 1 parameter, 0 given in %s on line %d
3434
bool(false)

‎ext/posix/tests/posix_access_safemode.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ var_dump(posix_access('/tmp', POSIX_W_OK));
1919
?>
2020
===DONE===
2121
--EXPECTF--
22-
PHP Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in %s on line %d
22+
Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in %s on line %d
2323
bool(false)
2424
===DONE===

‎ext/posix/tests/posix_mkfifo_safemode.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ unlink($dir . '/bar');
3636
rmdir($dir);
3737
?>
3838
--EXPECTF--
39-
PHP Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in %s on line %d
39+
Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in %s on line %d
4040

4141
Warning: posix_mkfifo(): SAFE MODE Restriction in effect. The script whose uid is %d is not allowed to access /tmp owned by uid %d in %s on line %d
4242
bool(false)

‎ext/session/tests/001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ print session_encode()."\n";
3131

3232
session_destroy();
3333
--EXPECTF--
34-
PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
34+
Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
3535

3636
Deprecated: Function session_register() is deprecated in %s on line %d
3737

‎ext/session/tests/003.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ var_dump($baz);
2828
var_dump($arr);
2929
session_destroy();
3030
--EXPECT--
31-
PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
31+
Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
3232
object(foo)#1 (2) {
3333
["bar"]=>
3434
string(2) "ok"

‎ext/session/tests/004.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ var_dump($arr);
7373
session_destroy();
7474
?>
7575
--EXPECT--
76-
PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
76+
Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
7777
OPEN: PHPSESSID
7878
READ: abtest
7979
object(foo)#2 (2) {

‎ext/session/tests/005.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ var_dump($baz); var_dump($arr); var_dump($c);
8585
session_destroy();
8686
?>
8787
--EXPECTF--
88-
PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
88+
Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
8989
OPEN: PHPSESSID
9090
READ: abtest
9191
object(foo)#2 (2) {

‎ext/session/tests/006.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ echo "values after session:\n";
4545
var_dump($a,$b);
4646
?>
4747
--EXPECTF--
48-
PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
48+
Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
4949
original values:
5050
object(a)#%d (1) {
5151
["test"]=>

‎ext/session/tests/007.phpt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,9 @@ var_dump($HTTP_SESSION_VARS);
5050
session_destroy();
5151
?>
5252
--EXPECTF--
53-
PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
54-
PHP Warning: Directive 'register_long_arrays' is deprecated in PHP 5.3 and greater in Unknown on line 0
53+
Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
54+
55+
Warning: Directive 'register_long_arrays' is deprecated in PHP 5.3 and greater in Unknown on line 0
5556

5657
Deprecated: Function session_register() is deprecated in %s on line %d
5758
float(3.14)

‎ext/session/tests/008-php4.2.3.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ var_dump($HTTP_SESSION_VARS);
5858
session_destroy();
5959
?>
6060
--EXPECTF--
61-
PHP Warning: Directive 'register_long_arrays' is deprecated in PHP 5.3 and greater in Unknown on line 0
61+
Warning: Directive 'register_long_arrays' is deprecated in PHP 5.3 and greater in Unknown on line 0
6262
NULL
6363
session_write_close(): Your script possibly relies on a session side-effect which existed until PHP 4.2.3. Please be advised that the session extension does not consider global variables as a source of data, unless register_globals is enabled. You can disable this functionality and this warning by setting session.bug_compat_42 or session.bug_compat_warn to off, respectively
6464
array(1) {

‎ext/session/tests/009.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ var_dump($HTTP_SESSION_VARS);
4343
session_destroy();
4444
?>
4545
--EXPECT--
46-
PHP Warning: Directive 'register_long_arrays' is deprecated in PHP 5.3 and greater in Unknown on line 0
46+
Warning: Directive 'register_long_arrays' is deprecated in PHP 5.3 and greater in Unknown on line 0
4747
array(0) {
4848
}
4949
array(1) {

‎ext/session/tests/012.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ session_destroy();
3232
print "I live\n";
3333
?>
3434
--EXPECTF--
35-
PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
35+
Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
3636

3737
Deprecated: Function session_register() is deprecated in %s on line %d
3838
I live

‎ext/session/tests/013.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ session_destroy();
2424
print "I live\n";
2525
?>
2626
--EXPECT--
27-
PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
27+
Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
2828
I live

‎ext/session/tests/014.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ini_set("session.use_trans_sid","1");
3333
session_destroy();
3434
?>
3535
--EXPECTF--
36-
PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
36+
Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
3737
<a href="/link?PHPSESSID=abtest">
3838

3939
Warning: ini_set(): A session is active. You cannot change the session module's ini settings at this time in %s on line %d

‎ext/session/tests/019.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ var_dump($_SESSION);
4747
session_destroy();
4848
?>
4949
--EXPECTF--
50-
PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
50+
Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
5151

5252
Deprecated: Function session_register() is deprecated in %s on line %d
5353
array(2) {

‎ext/standard/tests/general_functions/get_cfg_var_variation8.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var_dump(get_cfg_var( 'register_globals' ) );
1414

1515
?>
1616
--EXPECTF--
17-
PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in %s on line 0
17+
Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in %s on line 0
1818
*** Test by calling method or function with deprecated option ***
1919
string(1) "1"
2020

‎ext/standard/tests/general_functions/putenv_error1.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ print ($set ? 'it worked' : 'boo') . "\n";
1616
?>
1717
==DONE==
1818
--EXPECTF--
19-
PHP Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0
19+
Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0
2020

2121
Warning: putenv(): Safe Mode warning: Cannot set environment variable 'FOO' - it's not in the allowed list in %s on line %d
2222

‎ext/standard/tests/general_functions/putenv_error2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ putenv('BAZ=bop');
1212
?>
1313
==DONE==
1414
--EXPECTF--
15-
PHP Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0
15+
Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0
1616

1717
Warning: putenv(): Safe Mode warning: Cannot override protected environment variable 'FOO' in %s on line %d
1818

‎ext/standard/tests/misc/syslog_vars_variation1.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ define_syslog_variables=On
77
var_dump(isset($LOG_ERR));
88
?>
99
--EXPECTF--
10-
PHP Warning: Directive 'define_syslog_variables' is deprecated in PHP 5.3 and greater in Unknown on line 0
10+
Warning: Directive 'define_syslog_variables' is deprecated in PHP 5.3 and greater in Unknown on line 0
1111
bool(true)

‎ext/standard/tests/network/define_syslog_variables_variation-win32.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,4 @@ if ($failed == false) {
9494
*** Testing define_syslog_variables() : variation ***
9595
PASSED
9696
===DONE===
97-
PHP Warning: Directive 'define_syslog_variables' is deprecated in PHP 5.3 and greater in Unknown on line 0
97+
Warning: Directive 'define_syslog_variables' is deprecated in PHP 5.3 and greater in Unknown on line 0

‎ext/standard/tests/network/define_syslog_variables_variation.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ if ($failed == false) {
9191
?>
9292
===DONE===
9393
--EXPECT--
94-
PHP Warning: Directive 'define_syslog_variables' is deprecated in PHP 5.3 and greater in Unknown on line 0
94+
Warning: Directive 'define_syslog_variables' is deprecated in PHP 5.3 and greater in Unknown on line 0
9595
*** Testing define_syslog_variables() : variation ***
9696
PASSED
9797
===DONE===

‎ext/standard/tests/strings/parse_str_basic3.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ var_dump($res);
9191
?>
9292
===DONE===
9393
--EXPECTF--
94-
PHP Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0
94+
Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0
9595
*** Testing parse_str() : basic functionality ***
9696

9797
Test string with array values

‎main/main.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2015,10 +2015,6 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
20152015
#endif
20162016

20172017
module_initialized = 1;
2018-
sapi_deactivate(TSRMLS_C);
2019-
module_startup = 0;
2020-
2021-
shutdown_memory_manager(1, 0 TSRMLS_CC);
20222018

20232019
/* Check for deprecated directives */
20242020
{
@@ -2047,6 +2043,11 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
20472043
zend_error(E_ERROR, "zend.ze1_compatibility_mode is no longer supported in PHP 5.3 and greater");
20482044
}
20492045
}
2046+
2047+
sapi_deactivate(TSRMLS_C);
2048+
module_startup = 0;
2049+
2050+
shutdown_memory_manager(1, 0 TSRMLS_CC);
20502051

20512052
/* we're done */
20522053
return SUCCESS;

‎tests/basic/bug46313-win.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,6 @@ string(12) "o1"
6060
bool(true)
6161
string(%d) "%s"
6262
bool(true)
63-
PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
64-
PHP Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0
63+
Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
64+
Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0
6565

‎tests/basic/bug46313.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Bug #46313 (Magic quotes broke $_FILES)
66
magic_quotes_gpc=1
77
file_uploads=1
88
register_globals=1
9+
display_errors=0
910
--POST_RAW--
1011
Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
1112
-----------------------------20896060251896012921717172737

0 commit comments

Comments
 (0)