MFB53: Changed deprecated ini options on startup from E_WARNING to E_DEPRECATED ...

# Some of the updated tests were to make them sync with 5.3 although they don't run on trunk anymore

diff --git a/ext/curl/tests/curl_setopt_basic001.phpt b/ext/curl/tests/curl_setopt_basic001.phpt
index b8a28dd762d2d869789598e481193b9532911b7e..7b7ab0c5769d63c09d90c0bd7af5a7ca5d583ef6 100644 (file)
--- a/ext/curl/tests/curl_setopt_basic001.phpt
+++ b/ext/curl/tests/curl_setopt_basic001.phpt
@@ -27,7 +27,7 @@ curl_close($ch);
 var_dump( $curl_content );
 ?>
 --EXPECTF--
-Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Deprecated: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0
 *** Testing curl_setopt with CURLOPT_FOLLOWLOCATION in safemode
 
 Warning: curl_setopt(): CURLOPT_FOLLOWLOCATION cannot be activated when safe_mode is enabled or an open_basedir is set in %s on line %d

diff --git a/ext/dba/tests/dba_cdb_make.phpt b/ext/dba/tests/dba_cdb_make.phpt
index c1d0a01886fcf1bf15ebfb09ffe4604cb74252b8..e3ff9662a823107ef560d12ee439d648148fa6cf 100644 (file)
--- a/ext/dba/tests/dba_cdb_make.phpt
+++ b/ext/dba/tests/dba_cdb_make.phpt
@@ -37,7 +37,7 @@ magic_quotes_runtime=1
        require(dirname(__FILE__) .'/clean.inc'); 
 ?>
 --EXPECT--
-Warning: Directive 'magic_quotes_runtime' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Deprecated: Directive 'magic_quotes_runtime' is deprecated in PHP 5.3 and greater in Unknown on line 0
 database handler: cdb_make
 string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5"
 string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5"

diff --git a/ext/exif/tests/exif006.phpt b/ext/exif/tests/exif006.phpt
index cbd71919dcefe8d7f46f19656ccfe6a105ab9f52..10458c083d951e6f40adde589ee3c27e135ec338 100644 (file)
--- a/ext/exif/tests/exif006.phpt
+++ b/ext/exif/tests/exif006.phpt
@@ -20,7 +20,7 @@ magic_quotes_runtime=1
 var_dump(exif_read_data(dirname(__FILE__).'/test6.jpg','',true,false));
 ?>
 --EXPECTF--
-Warning: Directive 'magic_quotes_runtime' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Deprecated: Directive 'magic_quotes_runtime' is deprecated in PHP 5.3 and greater in Unknown on line 0
 array(5) {
   ["FILE"]=>
   array(6) {

diff --git a/ext/filter/tests/bug39763.phpt b/ext/filter/tests/bug39763.phpt
index 1422f52acc052ad987bee4fcc781c0b3922a46c6..36ee41561a8a625340ad0f2ec57d24e82c951019 100644 (file)
--- a/ext/filter/tests/bug39763.phpt
+++ b/ext/filter/tests/bug39763.phpt
@@ -12,6 +12,6 @@ parse_str("val=%22probably+a+bug%22");
 echo $val . "\n";
 ?>
 --EXPECT--     
-Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Deprecated: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0
 \"probably a bug\"
 \"probably a bug\"
\ No newline at end of file

diff --git a/ext/pcre/tests/bug33200.phpt b/ext/pcre/tests/bug33200.phpt
index 67a4d86a7aaec7a1da163150d8f1bef4773bd8b1..ddbb06519bb3d0af1f001a69800320758b7a838b 100644 (file)
--- a/ext/pcre/tests/bug33200.phpt
+++ b/ext/pcre/tests/bug33200.phpt
@@ -9,5 +9,5 @@ $str = preg_replace("/(some.*text)/e", "strtoupper('\\1')", $str);
 echo $str . "\r\n";
 ?>
 --EXPECT--
-Warning: Directive 'magic_quotes_sybase' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Deprecated: Directive 'magic_quotes_sybase' is deprecated in PHP 5.3 and greater in Unknown on line 0
 SOME '$SAMPLE' TEXT

diff --git a/ext/posix/tests/posix_access.phpt b/ext/posix/tests/posix_access.phpt
index 08d9bf2ed92ee5ed1d9215eb83707b33b9118d77..86093e26517f7ddbbe3a6361c8685c896385b74c 100644 (file)
--- a/ext/posix/tests/posix_access.phpt
+++ b/ext/posix/tests/posix_access.phpt
@@ -46,7 +46,7 @@ chmod ($filename, 0700);
 unlink($filename);
 ?>
 --EXPECTF--
-Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in %s on line %d
+Deprecated: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in %s on line %d
 bool(true)
 bool(true)
 bool(true)

diff --git a/ext/posix/tests/posix_access_error_modes.phpt b/ext/posix/tests/posix_access_error_modes.phpt
index e79d24329bf3b2f3fec41fa81cc49f2040d69834..afeb63e1e5c8cba1b78146939c55f5c962522bb1 100644 (file)
--- a/ext/posix/tests/posix_access_error_modes.phpt
+++ b/ext/posix/tests/posix_access_error_modes.phpt
@@ -40,7 +40,7 @@ chmod ($filename, 0700);
 unlink($filename);
 ?>
 --EXPECTF--
-Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line %d
+WDeprecated: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line %d
 bool(false)
 bool(false)
 bool(false)

diff --git a/ext/posix/tests/posix_access_error_wrongparams.phpt b/ext/posix/tests/posix_access_error_wrongparams.phpt
index 882c43b636213bd348554c439db23d39e8ed75d1..10c6883cc175b678c834212fa6f4203ec382423b 100644 (file)
--- a/ext/posix/tests/posix_access_error_wrongparams.phpt
+++ b/ext/posix/tests/posix_access_error_wrongparams.phpt
@@ -31,7 +31,7 @@ var_dump(posix_access('./foobar'));
 ?>
 ===DONE===
 --EXPECTF--
-Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Deprecated: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0
 
 Warning: posix_access() expects at least 1 parameter, 0 given in %s on line %d
 bool(false)

diff --git a/ext/posix/tests/posix_access_safemode.phpt b/ext/posix/tests/posix_access_safemode.phpt
index e346149fb513ca09feda7e47980fe5b4553c8c09..0ce1e4c444ed7824615f4968fcf6496337e712cc 100644 (file)
--- a/ext/posix/tests/posix_access_safemode.phpt
+++ b/ext/posix/tests/posix_access_safemode.phpt
@@ -22,6 +22,6 @@ var_dump(posix_access('/tmp', POSIX_W_OK));
 ?>
 ===DONE===
 --EXPECTF--
-Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in %s on line %d
+Deprecated: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/posix/tests/posix_mkfifo_safemode.phpt b/ext/posix/tests/posix_mkfifo_safemode.phpt
index 47caf5d3ee52a48e751bf08068c80f6071942815..79c4fed57f99386cef03398e22ccde892446e819 100644 (file)
--- a/ext/posix/tests/posix_mkfifo_safemode.phpt
+++ b/ext/posix/tests/posix_mkfifo_safemode.phpt
@@ -39,7 +39,7 @@ unlink($dir . '/bar');
 rmdir($dir);
 ?>
 --EXPECTF--
-Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in %s on line %d
+Deprecated: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in %s on line %d
 
 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
 bool(false)

diff --git a/ext/session/tests/007.phpt b/ext/session/tests/007.phpt
index dea564a7e7bd8a77b41c752df81868b62eae8de2..70560067b54d32615bad49a6bebb58d675b0b527 100644 (file)
--- a/ext/session/tests/007.phpt
+++ b/ext/session/tests/007.phpt
@@ -47,7 +47,7 @@ var_dump($_SESSION);
 session_destroy();
 ?>
 --EXPECTF--
-Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Deprecated: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
 
 Deprecated: Function session_register() is deprecated in %s on line %d
 float(3.14)

diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt
index 2c79668f7bb62437e7d45b5531da960b7c054e14..7db0d1cc781f2754c82f1f15cb3335a49d20d285 100644 (file)
--- a/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt
+++ b/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt
@@ -14,7 +14,7 @@ var_dump(get_cfg_var( 'magic_quotes_gpc' ) );
 \r
 ?>\r
 --EXPECTF--\r
-Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in %s on line 0\r
+Deprecated: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in %s on line 0\r
 *** Test by calling method or function with deprecated option ***\r
 string(1) "1"\r
 \r

diff --git a/ext/standard/tests/strings/parse_str_basic3.phpt b/ext/standard/tests/strings/parse_str_basic3.phpt
index 0cc76161534a3815e37d0620db4124901f04222d..06e614374ebb3a3295c5c557709fa2894a3d66ab 100644 (file)
--- a/ext/standard/tests/strings/parse_str_basic3.phpt
+++ b/ext/standard/tests/strings/parse_str_basic3.phpt
@@ -91,7 +91,7 @@ var_dump($res);
 ?>
 ===DONE===
 --EXPECTF--
-Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Deprecated: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0
 *** Testing parse_str() : basic functionality ***
 
 Test string with array values

diff --git a/main/main.c b/main/main.c
index 92530929732ba93b29e907f9702959301bf052bb..a8ba724e9490f06cf96d8717f27f0c07a74669ba 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -2103,7 +2103,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
                        const char *directives[13]; /* Remember to change this if the number of directives change */
                } directives[2] = {
                        {
-                               E_CORE_WARNING, 
+                               E_DEPRECATED, 
                                "Directive '%s' is deprecated in PHP 5.3 and greater", 
                                {
                                        "magic_quotes_gpc",