kalle                                    Wed, 11 Aug 2010 21:41:30 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=302121

Log:
MFB53: Changed deprecated ini options on startup from E_WARNING to E_DEPRECATED 
(Fixes #52570)

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

Bug: http://bugs.php.net/52570 (Assigned) register_globals on in php 5.3
      
Changed paths:
    U   php/php-src/trunk/ext/curl/tests/curl_setopt_basic001.phpt
    U   php/php-src/trunk/ext/dba/tests/dba_cdb_make.phpt
    U   php/php-src/trunk/ext/exif/tests/exif006.phpt
    U   php/php-src/trunk/ext/filter/tests/bug39763.phpt
    U   php/php-src/trunk/ext/pcre/tests/bug33200.phpt
    U   php/php-src/trunk/ext/posix/tests/posix_access.phpt
    U   php/php-src/trunk/ext/posix/tests/posix_access_error_modes.phpt
    U   php/php-src/trunk/ext/posix/tests/posix_access_error_wrongparams.phpt
    U   php/php-src/trunk/ext/posix/tests/posix_access_safemode.phpt
    U   php/php-src/trunk/ext/posix/tests/posix_mkfifo_safemode.phpt
    U   php/php-src/trunk/ext/session/tests/007.phpt
    U   
php/php-src/trunk/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt
    U   php/php-src/trunk/ext/standard/tests/strings/parse_str_basic3.phpt
    U   php/php-src/trunk/main/main.c

Modified: php/php-src/trunk/ext/curl/tests/curl_setopt_basic001.phpt
===================================================================
--- php/php-src/trunk/ext/curl/tests/curl_setopt_basic001.phpt	2010-08-11 21:26:09 UTC (rev 302120)
+++ php/php-src/trunk/ext/curl/tests/curl_setopt_basic001.phpt	2010-08-11 21:41:30 UTC (rev 302121)
@@ -27,7 +27,7 @@
 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

Modified: php/php-src/trunk/ext/dba/tests/dba_cdb_make.phpt
===================================================================
--- php/php-src/trunk/ext/dba/tests/dba_cdb_make.phpt	2010-08-11 21:26:09 UTC (rev 302120)
+++ php/php-src/trunk/ext/dba/tests/dba_cdb_make.phpt	2010-08-11 21:41:30 UTC (rev 302121)
@@ -37,7 +37,7 @@
 	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"

Modified: php/php-src/trunk/ext/exif/tests/exif006.phpt
===================================================================
--- php/php-src/trunk/ext/exif/tests/exif006.phpt	2010-08-11 21:26:09 UTC (rev 302120)
+++ php/php-src/trunk/ext/exif/tests/exif006.phpt	2010-08-11 21:41:30 UTC (rev 302121)
@@ -20,7 +20,7 @@
 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) {

Modified: php/php-src/trunk/ext/filter/tests/bug39763.phpt
===================================================================
--- php/php-src/trunk/ext/filter/tests/bug39763.phpt	2010-08-11 21:26:09 UTC (rev 302120)
+++ php/php-src/trunk/ext/filter/tests/bug39763.phpt	2010-08-11 21:41:30 UTC (rev 302121)
@@ -12,6 +12,6 @@
 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

Modified: php/php-src/trunk/ext/pcre/tests/bug33200.phpt
===================================================================
--- php/php-src/trunk/ext/pcre/tests/bug33200.phpt	2010-08-11 21:26:09 UTC (rev 302120)
+++ php/php-src/trunk/ext/pcre/tests/bug33200.phpt	2010-08-11 21:41:30 UTC (rev 302121)
@@ -9,5 +9,5 @@
 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

Modified: php/php-src/trunk/ext/posix/tests/posix_access.phpt
===================================================================
--- php/php-src/trunk/ext/posix/tests/posix_access.phpt	2010-08-11 21:26:09 UTC (rev 302120)
+++ php/php-src/trunk/ext/posix/tests/posix_access.phpt	2010-08-11 21:41:30 UTC (rev 302121)
@@ -46,7 +46,7 @@
 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)

Modified: php/php-src/trunk/ext/posix/tests/posix_access_error_modes.phpt
===================================================================
--- php/php-src/trunk/ext/posix/tests/posix_access_error_modes.phpt	2010-08-11 21:26:09 UTC (rev 302120)
+++ php/php-src/trunk/ext/posix/tests/posix_access_error_modes.phpt	2010-08-11 21:41:30 UTC (rev 302121)
@@ -40,7 +40,7 @@
 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)

Modified: php/php-src/trunk/ext/posix/tests/posix_access_error_wrongparams.phpt
===================================================================
--- php/php-src/trunk/ext/posix/tests/posix_access_error_wrongparams.phpt	2010-08-11 21:26:09 UTC (rev 302120)
+++ php/php-src/trunk/ext/posix/tests/posix_access_error_wrongparams.phpt	2010-08-11 21:41:30 UTC (rev 302121)
@@ -31,7 +31,7 @@
 ?>
 ===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)

Modified: php/php-src/trunk/ext/posix/tests/posix_access_safemode.phpt
===================================================================
--- php/php-src/trunk/ext/posix/tests/posix_access_safemode.phpt	2010-08-11 21:26:09 UTC (rev 302120)
+++ php/php-src/trunk/ext/posix/tests/posix_access_safemode.phpt	2010-08-11 21:41:30 UTC (rev 302121)
@@ -22,6 +22,6 @@
 ?>
 ===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===

Modified: php/php-src/trunk/ext/posix/tests/posix_mkfifo_safemode.phpt
===================================================================
--- php/php-src/trunk/ext/posix/tests/posix_mkfifo_safemode.phpt	2010-08-11 21:26:09 UTC (rev 302120)
+++ php/php-src/trunk/ext/posix/tests/posix_mkfifo_safemode.phpt	2010-08-11 21:41:30 UTC (rev 302121)
@@ -39,7 +39,7 @@
 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)

Modified: php/php-src/trunk/ext/session/tests/007.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/007.phpt	2010-08-11 21:26:09 UTC (rev 302120)
+++ php/php-src/trunk/ext/session/tests/007.phpt	2010-08-11 21:41:30 UTC (rev 302121)
@@ -47,7 +47,7 @@
 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)

Modified: php/php-src/trunk/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt	2010-08-11 21:26:09 UTC (rev 302120)
+++ php/php-src/trunk/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt	2010-08-11 21:41:30 UTC (rev 302121)
@@ -14,7 +14,7 @@

 ?>
 --EXPECTF--
-Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in %s on line 0
+Deprecated: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in %s on line 0
 *** Test by calling method or function with deprecated option ***
 string(1) "1"


Modified: php/php-src/trunk/ext/standard/tests/strings/parse_str_basic3.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/strings/parse_str_basic3.phpt	2010-08-11 21:26:09 UTC (rev 302120)
+++ php/php-src/trunk/ext/standard/tests/strings/parse_str_basic3.phpt	2010-08-11 21:41:30 UTC (rev 302121)
@@ -91,7 +91,7 @@
 ?>
 ===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

Modified: php/php-src/trunk/main/main.c
===================================================================
--- php/php-src/trunk/main/main.c	2010-08-11 21:26:09 UTC (rev 302120)
+++ php/php-src/trunk/main/main.c	2010-08-11 21:41:30 UTC (rev 302121)
@@ -2103,7 +2103,7 @@
 			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",
-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to