Added E_DEPRECATED startup notice (5.3 only)

23 files changed, 40 insertions, 5 deletions

diff --git a/NEWS b/NEWS
index 83acaf9b22..802d0aa39d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-PHP                                                                        NEWS
+PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 200?, PHP 5.3.0 RC 2
 - Upgraded bundled sqlite to version 3.6.13. (Ilia)
@@ -26,6 +26,7 @@ PHP                                                                        NEWS
   disable this behaviour using "http"=>array("auto_decode"=>0) in stream
   context. (Dmitry)
 - Added ability to throw exceptions from SQLite3 instead of warnings. (Scott)
+- Added startup notices for deprecated ini settings. (Kalle)
 
 - Fixed bug #48087 (call_user_method() invalid free of arguments). (Felipe)
 - Fixed bug #48060 (pdo_pgsql - large objects are returned as empty). (Matteo)
diff --git a/ext/filter/tests/bug39763.phpt b/ext/filter/tests/bug39763.phpt
index b0eaaadf0f..1a07599564 100644
--- a/ext/filter/tests/bug39763.phpt
+++ b/ext/filter/tests/bug39763.phpt
@@ -14,3 +14,4 @@ echo $val . "\n";
 --EXPECT--	
 \"probably a bug\"
 \"probably a bug\"
+PHP Warning:  Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0
\ No newline at end of file
diff --git a/ext/filter/tests/bug42718-2.phpt b/ext/filter/tests/bug42718-2.phpt
index fd2a91d9d4..d33eabeb89 100644
--- a/ext/filter/tests/bug42718-2.phpt
+++ b/ext/filter/tests/bug42718-2.phpt
@@ -18,3 +18,4 @@ echo addcslashes($_GET['a'],"\0") . "\n";
 unsafe_raw
 
 1\0
+PHP Warning:  Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0
diff --git a/ext/pcre/tests/bug33200.phpt b/ext/pcre/tests/bug33200.phpt
index b00b72ac28..5ad5b78c87 100644
--- a/ext/pcre/tests/bug33200.phpt
+++ b/ext/pcre/tests/bug33200.phpt
@@ -6,7 +6,8 @@ magic_quotes_sybase=1
 <?php
 $str = 'some \'$sample\' text';
 $str = preg_replace("/(some.*text)/e", "strtoupper('\\1')", $str);
-echo $str;
+echo $str . "\r\n";
 ?>
 --EXPECT--
 SOME '$SAMPLE' TEXT
+PHP Warning:  Directive 'magic_quotes_sybase' is deprecated in PHP 5.3 and greater in Unknown on line 0
diff --git a/ext/session/tests/001.phpt b/ext/session/tests/001.phpt
index b2cd5ba2c2..f0d7af6ff7 100644
--- a/ext/session/tests/001.phpt
+++ b/ext/session/tests/001.phpt
@@ -35,4 +35,4 @@ Deprecated: Function session_register() is deprecated in %s on line %d
 
 Deprecated: Function session_register() is deprecated in %s on line %d
 baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";s:4:"done";}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";s:4:"done";}}
-
+PHP Warning:  Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
diff --git a/ext/session/tests/003.phpt b/ext/session/tests/003.phpt
index 9972358e1a..ae7a7c18c2 100644
--- a/ext/session/tests/003.phpt
+++ b/ext/session/tests/003.phpt
@@ -43,3 +43,4 @@ array(1) {
     int(2)
   }
 }
+PHP Warning:  Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
diff --git a/ext/session/tests/004.phpt b/ext/session/tests/004.phpt
index b9013cac70..529e1d9aa2 100644
--- a/ext/session/tests/004.phpt
+++ b/ext/session/tests/004.phpt
@@ -109,3 +109,4 @@ array(1) {
   }
 }
 DESTROY: abtest
+PHP Warning:  Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
diff --git a/ext/session/tests/005.phpt b/ext/session/tests/005.phpt
index 9b3adf10b8..9a4ed3ab01 100644
--- a/ext/session/tests/005.phpt
+++ b/ext/session/tests/005.phpt
@@ -146,3 +146,4 @@ array(1) {
 int(123)
 DESTROY: abtest
 CLOSE
+PHP Warning:  Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
diff --git a/ext/session/tests/006.phpt b/ext/session/tests/006.phpt
index 8094d32bc5..b481face44 100644
--- a/ext/session/tests/006.phpt
+++ b/ext/session/tests/006.phpt
@@ -77,3 +77,4 @@ object(b)#%d (1) {
     string(5) "hallo"
   }
 }
+PHP Warning:  Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
diff --git a/ext/session/tests/007.phpt b/ext/session/tests/007.phpt
index a98af19856..71a9f105e7 100644
--- a/ext/session/tests/007.phpt
+++ b/ext/session/tests/007.phpt
@@ -61,3 +61,5 @@ array(1) {
   ["c"]=>
   &float(3.14)
 }
+PHP Warning:  Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
+PHP Warning:  Directive 'register_long_arrays' is deprecated in PHP 5.3 and greater in Unknown on line 0
diff --git a/ext/session/tests/008-php4.2.3.phpt b/ext/session/tests/008-php4.2.3.phpt
index 7d31f2e3de..85b89b33ff 100644
--- a/ext/session/tests/008-php4.2.3.phpt
+++ b/ext/session/tests/008-php4.2.3.phpt
@@ -69,3 +69,4 @@ array(1) {
   ["c"]=>
   float(3.14)
 }
+PHP Warning:  Directive 'register_long_arrays' is deprecated in PHP 5.3 and greater in Unknown on line 0
diff --git a/ext/session/tests/009.phpt b/ext/session/tests/009.phpt
index 903b8be3a5..dee12a0c34 100644
--- a/ext/session/tests/009.phpt
+++ b/ext/session/tests/009.phpt
@@ -57,3 +57,4 @@ array(0) {
 }
 array(0) {
 }
+PHP Warning:  Directive 'register_long_arrays' is deprecated in PHP 5.3 and greater in Unknown on line 0
diff --git a/ext/session/tests/012.phpt b/ext/session/tests/012.phpt
index 7fd91c9f2f..6e2c406ae8 100644
--- a/ext/session/tests/012.phpt
+++ b/ext/session/tests/012.phpt
@@ -34,3 +34,4 @@ print "I live\n";
 --EXPECTF--
 Deprecated: Function session_register() is deprecated in %s on line %d
 I live
+PHP Warning:  Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
diff --git a/ext/session/tests/013.phpt b/ext/session/tests/013.phpt
index 54ccaeddb7..17622d33f4 100644
--- a/ext/session/tests/013.phpt
+++ b/ext/session/tests/013.phpt
@@ -25,3 +25,4 @@ print "I live\n";
 ?>
 --EXPECT--
 I live
+PHP Warning:  Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
diff --git a/ext/session/tests/014.phpt b/ext/session/tests/014.phpt
index e5734bc6e9..b91ac7835a 100644
--- a/ext/session/tests/014.phpt
+++ b/ext/session/tests/014.phpt
@@ -40,3 +40,4 @@ Warning: ini_set(): A session is active. You cannot change the session module's
 
 Warning: ini_set(): A session is active. You cannot change the session module's ini settings at this time in %s on line %d
 <a href="/link?PHPSESSID=abtest">
+PHP Warning:  Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
diff --git a/ext/session/tests/019.phpt b/ext/session/tests/019.phpt
index e008e8b638..84e6bba194 100644
--- a/ext/session/tests/019.phpt
+++ b/ext/session/tests/019.phpt
@@ -72,3 +72,4 @@ array(2) {
     int(44)
   }
 }
+PHP Warning:  Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
diff --git a/ext/standard/tests/general_functions/putenv_error1.phpt b/ext/standard/tests/general_functions/putenv_error1.phpt
index 4e4fc40fbb..941c3f3c7c 100644
--- a/ext/standard/tests/general_functions/putenv_error1.phpt
+++ b/ext/standard/tests/general_functions/putenv_error1.phpt
@@ -22,3 +22,4 @@ Warning: putenv(): Safe Mode warning: Cannot set environment variable 'BAZ' - it
 it worked
 it worked
 ==DONE==
+PHP Warning:  Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0
diff --git a/ext/standard/tests/general_functions/putenv_error2.phpt b/ext/standard/tests/general_functions/putenv_error2.phpt
index a98a93461c..904b9b2174 100644
--- a/ext/standard/tests/general_functions/putenv_error2.phpt
+++ b/ext/standard/tests/general_functions/putenv_error2.phpt
@@ -16,3 +16,4 @@ Warning: putenv(): Safe Mode warning: Cannot override protected environment vari
 
 Warning: putenv(): Safe Mode warning: Cannot override protected environment variable 'BAZ' in %s on line %d
 ==DONE==
+PHP Warning:  Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0
diff --git a/ext/standard/tests/misc/syslog_vars_variation1.phpt b/ext/standard/tests/misc/syslog_vars_variation1.phpt
index 7cac8adf63..adf64cb1e8 100644
--- a/ext/standard/tests/misc/syslog_vars_variation1.phpt
+++ b/ext/standard/tests/misc/syslog_vars_variation1.phpt
@@ -8,3 +8,4 @@ var_dump(isset($LOG_ERR));
 ?>
 --EXPECTF--
 bool(true)
+PHP Warning:  Directive 'define_syslog_variables' is deprecated in PHP 5.3 and greater in Unknown on line 0
diff --git a/ext/standard/tests/network/define_syslog_variables_variation-win32.phpt b/ext/standard/tests/network/define_syslog_variables_variation-win32.phpt
index b5bfdd263f..ac7dac8ab2 100644
--- a/ext/standard/tests/network/define_syslog_variables_variation-win32.phpt
+++ b/ext/standard/tests/network/define_syslog_variables_variation-win32.phpt
@@ -94,3 +94,4 @@ if ($failed == false) {
 *** Testing define_syslog_variables() : variation ***
 PASSED
 ===DONE===
+PHP Warning:  Directive 'define_syslog_variables' is deprecated in PHP 5.3 and greater in Unknown on line 0
diff --git a/main/main.c b/main/main.c
index de964a80ca..da082359a0 100644
--- a/main/main.c
+++ b/main/main.c
@@ -1901,17 +1901,28 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
 	/* Check for deprecated directives */
 	{
 		static const char *directives[] = {
-			"zend.ze1_compatibility_mode",
+			"define_syslog_variables", 
+			"register_globals", 
+			"register_long_arrays", 
+			"safe_mode", 
+			"magic_quotes_gpc", 
+			"magic_quotes_runtime", 
+			"magic_quotes_sybase", 
 			NULL};
 		const char **p = directives;
 		long val;
 
 		while (*p) {
 			if (cfg_get_long((char*)*p, &val) == SUCCESS && val) {
-				zend_error(E_WARNING, "Directive '%s' is no longer supported in PHP 5.3 and greater", *p);
+				zend_error(E_WARNING, "Directive '%s' is deprecated in PHP 5.3 and greater", *p);
 			}
 			++p;
 		}
+
+		/* This is not too nice, but since its the only one theres no need for extra stuff here */
+		if (cfg_get_long("zend.ze1_compatibility_mode", &val) == SUCCESS && val) {
+			zend_error(E_ERROR, "zend.ze1_compatibility_mode is no longer supported in PHP 5.3 and greater");
+		}
 	}
 
 	/* Register PHP core ini entries */
diff --git a/tests/basic/bug46313-win.phpt b/tests/basic/bug46313-win.phpt
index 276efe196f..a85178995d 100644
--- a/tests/basic/bug46313-win.phpt
+++ b/tests/basic/bug46313-win.phpt
@@ -60,3 +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
+
diff --git a/tests/security/magic_quotes_gpc.phpt b/tests/security/magic_quotes_gpc.phpt
index eb5b84242a..64f7179cfe 100644
--- a/tests/security/magic_quotes_gpc.phpt
+++ b/tests/security/magic_quotes_gpc.phpt
@@ -10,3 +10,4 @@ echo $_GET['a'],"\n";
 ?>
 --EXPECT--
 abc\'\"\0123
+PHP Warning:  Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0