diff options
39 files changed, 113 insertions, 906 deletions
diff --git a/ext/exif/tests/bug34704.phpt b/ext/exif/tests/bug34704.phpt index b6b26de78d..7688ce861a 100755 --- a/ext/exif/tests/bug34704.phpt +++ b/ext/exif/tests/bug34704.phpt @@ -3,7 +3,6 @@ Bug #34704 (Infinite recursion due to corrupt JPEG) --SKIPIF-- <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?> --INI-- -magic_quotes_runtime=0 output_handler= zlib.output_compression=0 --FILE-- diff --git a/ext/exif/tests/exif002.phpt b/ext/exif/tests/exif002.phpt index 1b1220c600..2a70f2920c 100644 --- a/ext/exif/tests/exif002.phpt +++ b/ext/exif/tests/exif002.phpt @@ -3,7 +3,6 @@ Check for exif_thumbnail --SKIPIF-- <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?> --INI-- -magic_quotes_runtime=0 output_handler= zlib.output_compression=0 --FILE-- diff --git a/ext/exif/tests/exif006.phpt b/ext/exif/tests/exif006.phpt index 10458c083d..e69de29bb2 100644 --- a/ext/exif/tests/exif006.phpt +++ b/ext/exif/tests/exif006.phpt @@ -1,90 +0,0 @@ ---TEST-- -Check for exif_read_data, magic_quotes_runtime ---SKIPIF-- -<?php - if (!extension_loaded('exif')) die('skip exif extension not available'); - if (version_compare(PHP_VERSION, "4.4.0-dev", "<")) die('skip PHP 4.4 required'); -?> ---INI-- -output_handler= -zlib.output_compression=0 -magic_quotes_runtime=1 ---FILE-- -<?php -/* - test1.jpg is a 1*1 image that does not contain any Exif/Comment information - test2.jpg is the same image but contains Exif/Comment information and a - copy of test1.jpg as a thumbnail. - test6.jpg is the same as test2.jpg but with a UNICODE UserComment: ÄÖ&Üßäöü -*/ -var_dump(exif_read_data(dirname(__FILE__).'/test6.jpg','',true,false)); -?> ---EXPECTF-- -Deprecated: Directive 'magic_quotes_runtime' is deprecated in PHP 5.3 and greater in Unknown on line 0 -array(5) { - ["FILE"]=> - array(6) { - ["FileName"]=> - string(9) "test6.jpg" - ["FileDateTime"]=> - int(%d) - ["FileSize"]=> - int(1240) - ["FileType"]=> - int(2) - ["MimeType"]=> - string(10) "image/jpeg" - ["SectionsFound"]=> - string(33) "ANY_TAG, IFD0, THUMBNAIL, COMMENT" - } - ["COMPUTED"]=> - array(12) { - ["html"]=> - string(24) "width=\"1\" height=\"1\"" - ["Height"]=> - int(1) - ["Width"]=> - int(1) - ["IsColor"]=> - int(1) - ["ByteOrderMotorola"]=> - int(1) - ["UserComment"]=> - string(16) "Hallo \'Du\'+da!" - ["UserCommentEncoding"]=> - string(5) "ASCII" - ["Copyright"]=> - string(45) "Photo \"M. Boerger\"., Edited \'M. Boerger\'." - ["Copyright.Photographer"]=> - string(21) "Photo \"M. Boerger\"." - ["Copyright.Editor"]=> - string(22) "Edited \'M. Boerger\'." - ["Thumbnail.FileType"]=> - int(2) - ["Thumbnail.MimeType"]=> - string(10) "image/jpeg" - } - ["IFD0"]=> - array(2) { - ["Copyright"]=> - string(21) "Photo \"M. Boerger\"." - ["UserComment"]=> - string(5) "ASCII" - } - ["THUMBNAIL"]=> - array(2) { - ["JPEGInterchangeFormat"]=> - int(134) - ["JPEGInterchangeFormatLength"]=> - int(523) - } - ["COMMENT"]=> - array(3) { - [0]=> - string(13) "Comment \"1\"" - [1]=> - string(13) "Comment \'2\'" - [2]=> - string(13) "Comment #3end" - } -} diff --git a/ext/filter/tests/bug39763.phpt b/ext/filter/tests/bug39763.phpt index 36ee41561a..e69de29bb2 100644 --- a/ext/filter/tests/bug39763.phpt +++ b/ext/filter/tests/bug39763.phpt @@ -1,17 +0,0 @@ ---TEST-- -Bug #39763 (filter applies magic_quotes twice in parse_str()) ---INI-- -magic_quotes_gpc=1 -filter.default= ---FILE-- -<?php -$arr = array(); -parse_str("val=%22probably+a+bug%22", $arr); -echo $arr['val'] . "\n"; -parse_str("val=%22probably+a+bug%22"); -echo $val . "\n"; -?> ---EXPECT-- -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/filter/tests/bug42718-2.phpt b/ext/filter/tests/bug42718-2.phpt index 13cd990d00..ed210681d3 100644 --- a/ext/filter/tests/bug42718-2.phpt +++ b/ext/filter/tests/bug42718-2.phpt @@ -4,7 +4,6 @@ Bug #42718 - 2 (unsafe_raw filter not applied when configured as default filter) <?php if (!extension_loaded("filter")) die("skip"); ?> --INI-- display_errors=0 -magic_quotes_gpc=1 filter.default=unsafe_raw filter.default_flags= --GET-- @@ -13,9 +12,7 @@ a=1%00 <?php echo ini_get('filter.default') . "\n"; echo ini_get('filter.default_flags') . "\n"; -echo addcslashes($_GET['a'],"\0") . "\n"; ?> --EXPECT-- unsafe_raw -1\0 diff --git a/ext/filter/tests/bug42718.phpt b/ext/filter/tests/bug42718.phpt index d1ede3f7d2..ba56d3988a 100644 --- a/ext/filter/tests/bug42718.phpt +++ b/ext/filter/tests/bug42718.phpt @@ -5,7 +5,6 @@ FILTER_UNSAFE_RAW not applied when configured as default filter, even with flags --SKIPIF-- <?php if (!extension_loaded("filter")) die("skip"); ?> --INI-- -magic_quotes_gpc=0 filter.default=unsafe_raw filter.default_flags=4 --GET-- diff --git a/ext/hash/tests/mhash_001.phpt b/ext/hash/tests/mhash_001.phpt index b2a92839be..5df0378259 100644 --- a/ext/hash/tests/mhash_001.phpt +++ b/ext/hash/tests/mhash_001.phpt @@ -1,7 +1,5 @@ --TEST-- mhash() test ---INI-- -magic_quotes_runtime=0 --SKIPIF-- <?php include "skip_mhash.inc"; diff --git a/ext/hash/tests/mhash_004.phpt b/ext/hash/tests/mhash_004.phpt index 2721663332..b928a794b1 100644 --- a/ext/hash/tests/mhash_004.phpt +++ b/ext/hash/tests/mhash_004.phpt @@ -1,7 +1,5 @@ --TEST-- mhash() modifying algorithm parameter ---INI-- -magic_quotes_runtime=0 --SKIPIF-- <?php include "skip_mhash.inc"; diff --git a/ext/iconv/tests/translit-utf8.phpt b/ext/iconv/tests/translit-utf8.phpt index aa5131f2c3..0151dc385c 100644 --- a/ext/iconv/tests/translit-utf8.phpt +++ b/ext/iconv/tests/translit-utf8.phpt @@ -6,7 +6,6 @@ include('skipif.inc'); ( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\""); ?> --INI-- -magic_quotes_runtime=0 error_reporting=2047 --FILE-- <?php // vim600: syn=php diff --git a/ext/pcre/tests/bug33200.phpt b/ext/pcre/tests/bug33200.phpt index ddbb06519b..e69de29bb2 100644 --- a/ext/pcre/tests/bug33200.phpt +++ b/ext/pcre/tests/bug33200.phpt @@ -1,13 +0,0 @@ ---TEST-- -Bug #33200 (magic_quotes_sybase = On makes 'e' modifier misbehave) ---INI-- -magic_quotes_sybase=1 ---FILE-- -<?php -$str = 'some \'$sample\' text'; -$str = preg_replace("/(some.*text)/e", "strtoupper('\\1')", $str); -echo $str . "\r\n"; -?> ---EXPECT-- -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/phar/tests/fgc_edgecases.phpt b/ext/phar/tests/fgc_edgecases.phpt index 5b85d0dcf2..b943546963 100644 --- a/ext/phar/tests/fgc_edgecases.phpt +++ b/ext/phar/tests/fgc_edgecases.phpt @@ -33,7 +33,6 @@ echo file_get_contents("foob", true); echo file_get_contents("./hi", 0, $context); echo file_get_contents("../oops"); echo file_get_contents("./hi", 0, $context, 50000); -ini_set("magic_quotes_runtime", 1); echo file_get_contents("./hi"); echo file_get_contents("./hi", 0, $context, 0, 0); ?> @@ -60,7 +59,6 @@ echo file_get_contents("foob", true); echo file_get_contents("./hi", 0, $context); echo file_get_contents("../oops"); echo file_get_contents("./hi", 0, $context, 50000); -ini_set("magic_quotes_runtime", 1); echo file_get_contents("./hi"); echo file_get_contents("./hi", 0, $context, 0, 0); ?> @@ -78,7 +76,6 @@ echo file_get_contents("foob", true); echo file_get_contents("./hi", 0, $context); echo file_get_contents("../oops"); echo file_get_contents("./hi", 0, $context, 50000); -ini_set("magic_quotes_runtime", 1); echo file_get_contents("./hi"); echo file_get_contents("./hi", 0, $context, 0, 0); ?> @@ -87,17 +84,16 @@ Warning: file_get_contents(phar://%sfgc_edgecases.phar.php/oops): failed to open Warning: file_get_contents(): Failed to seek to position 50000 in the stream in phar://%sfgc_edgecases.phar.php/foo/hi on line %d <?php -echo file_get_contents(\"foo/\" . basename(__FILE__)); +echo file_get_contents("foo/" . basename(__FILE__)); $context = stream_context_create(); -file_get_contents(\"./hi\", 0, $context, 0, -1); -echo file_get_contents(\"foob\"); -set_include_path(\"%stests\"); -echo file_get_contents(\"foob\", true); -echo file_get_contents(\"./hi\", 0, $context); -echo file_get_contents(\"../oops\"); -echo file_get_contents(\"./hi\", 0, $context, 50000); -ini_set(\"magic_quotes_runtime\", 1); -echo file_get_contents(\"./hi\"); -echo file_get_contents(\"./hi\", 0, $context, 0, 0); +file_get_contents("./hi", 0, $context, 0, -1); +echo file_get_contents("foob"); +set_include_path("%stests"); +echo file_get_contents("foob", true); +echo file_get_contents("./hi", 0, $context); +echo file_get_contents("../oops"); +echo file_get_contents("./hi", 0, $context, 50000); +echo file_get_contents("./hi"); +echo file_get_contents("./hi", 0, $context, 0, 0); ?> ===DONE=== diff --git a/ext/spl/tests/SplFileObject_fwrite_variation_003.phpt b/ext/spl/tests/SplFileObject_fwrite_variation_003.phpt index 429d2a66bc..e69de29bb2 100644 --- a/ext/spl/tests/SplFileObject_fwrite_variation_003.phpt +++ b/ext/spl/tests/SplFileObject_fwrite_variation_003.phpt @@ -1,22 +0,0 @@ ---TEST-- -SplFileObject::fwrite function - writing with magic_quotes_runtime ini set ---FILE-- -<?php -ini_set('magic_quotes_runtime',true); -$file = dirname(__FILE__).'/SplFileObject_fwrite_variation_002.txt'; -if(file_exists($file)) { - unlink($file); -} -$obj = New SplFileObject($file,'w'); -$obj->fwrite('"test" \'write\''); -var_dump(file_get_contents($file)); -?> ---CLEAN-- -<?php -$file = dirname(__FILE__).'/SplFileObject_fwrite_variation_002.txt'; -if(file_exists($file)) { - unlink($file); -} -?> ---EXPECT-- -string(18) "\"test\" \'write\'" diff --git a/ext/standard/tests/file/magic_quotes.phpt b/ext/standard/tests/file/magic_quotes.phpt index 0f42cd7c87..e69de29bb2 100644 --- a/ext/standard/tests/file/magic_quotes.phpt +++ b/ext/standard/tests/file/magic_quotes.phpt @@ -1,77 +0,0 @@ ---TEST-- -various magic quotes tests ---INI-- -error_reporting=14335 ---FILE-- -<?php - -$filename = dirname(__FILE__)."/magic_quotes.dat"; - -var_dump(get_magic_quotes_runtime()); -var_dump(get_magic_quotes_runtime("blah")); - -file_put_contents($filename, "some'content'here\"and}there"); - -var_dump(set_magic_quotes_runtime(true)); -var_dump(get_magic_quotes_runtime()); -var_dump(set_magic_quotes_runtime(-1)); -var_dump(get_magic_quotes_runtime()); - -var_dump(file_get_contents($filename)); - -var_dump(set_magic_quotes_runtime(0)); -var_dump(get_magic_quotes_runtime()); - -var_dump(file_get_contents($filename)); - -var_dump(set_magic_quotes_runtime(1)); -var_dump(get_magic_quotes_runtime()); - -file_put_contents($filename, "some'content'here\"and}there"); - -var_dump(file_get_contents($filename)); - -var_dump(set_magic_quotes_runtime(0)); -var_dump(set_magic_quotes_runtime()); -var_dump(get_magic_quotes_runtime()); - -var_dump(file_get_contents($filename)); - - -@unlink($filename); - -echo "Done\n"; -?> ---EXPECTF-- -int(0) -int(0) - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) -int(1) - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) -int(1) -string(30) "some\'content\'here\"and}there" - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) -int(0) -string(27) "some'content'here"and}there" - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) -int(1) -string(30) "some\'content\'here\"and}there" - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d - -Warning: set_magic_quotes_runtime() expects exactly 1 parameter, 0 given in %s on line %d -NULL -int(0) -string(27) "some'content'here"and}there" -Done 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 7db0d1cc78..c7a72de944 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt @@ -1,20 +1,17 @@ ---TEST--
-Test function get_cfg_var() by calling deprecated option
---CREDITS--
-Francesco Fullone ff@ideato.it
-#PHPTestFest Cesena Italia on 2009-06-20
---INI--
-magic_quotes_gpc=1
---SKIPIF--
-<?php if (version_compare(PHP_VERSION, "5.3", "<")) die("skip requires 5.3 or greater"); ?>
---FILE--
-<?php
-echo "*** Test by calling method or function with deprecated option ***\n";
-var_dump(get_cfg_var( 'magic_quotes_gpc' ) );
-
-?>
---EXPECTF--
-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"
-
+--TEST-- +Test function get_cfg_var() by calling deprecated option +--CREDITS-- +Francesco Fullone ff@ideato.it +#PHPTestFest Cesena Italia on 2009-06-20 +--INI-- +magic_quotes_gpc=1 +--SKIPIF-- +<?php if (version_compare(PHP_VERSION, "5.3", "<")) die("skip requires 5.3 or greater"); ?> +--FILE-- +<?php +echo "*** Test by calling method or function with deprecated option ***\n"; +var_dump(get_cfg_var( 'magic_quotes_gpc' ) ); + +?> +--EXPECTF-- +Fatal error: Directive 'magic_quotes_gpc' is no longer available in PHP in Unknown on line 0 diff --git a/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt b/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt index cfa4dcc681..b1c694a720 100644 --- a/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt +++ b/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt @@ -1,27 +1,13 @@ --TEST-- Test get_magic_quotes_gpc() function ---INI-- -magic_quotes_gpc = 0 --FILE-- <?php /* Prototype: int get_magic_quotes_gpc ( void ) - * Description: Gets the current configuration setting of magic quotes gpc -*/ + * This function is not supported anymore and will always return false + */ echo "Simple testcase for get_magic_quotes_gpc() function\n"; - -$g = get_magic_quotes_gpc(); -echo "\n-- magic quotes gpc set in INI file: " . $g . " --\n"; - -echo "\n-- Set magic quotes gpc to 1 - not allowed so should fail! --\n"; -var_dump(ini_set("magic_quotes_gpc", 1)); -$g = get_magic_quotes_gpc(); -echo "\n-- magic quotes gpc after set: " . $g . " --\n"; - -echo "\n-- Set magic quotes gpc to 0: --\n"; -var_dump(ini_set("magic_quotes_gpc", 0)); -$g = get_magic_quotes_gpc(); -echo "\n-- magic quotes gpc after set: " . $g . " --\n"; +var_dump(get_magic_quotes_gpc()); echo "\n-- Error cases --\n"; // no checks on number of args @@ -29,21 +15,16 @@ var_dump(get_magic_quotes_gpc(true)); ?> ===DONE=== ---EXPECT-- +--EXPECTF-- Simple testcase for get_magic_quotes_gpc() function --- magic quotes gpc set in INI file: 0 -- - --- Set magic quotes gpc to 1 - not allowed so should fail! -- +Deprecated: Function get_magic_quotes_gpc() is deprecated in %s on line %d bool(false) --- magic quotes gpc after set: 0 -- - --- Set magic quotes gpc to 0: -- -bool(false) +-- Error cases -- --- magic quotes gpc after set: 0 -- +Deprecated: Function get_magic_quotes_gpc() is deprecated in %s on line %d --- Error cases -- -int(0) -===DONE===
\ No newline at end of file +Warning: get_magic_quotes_gpc() expects exactly 0 parameters, 1 given in %s on line %d +NULL +===DONE=== diff --git a/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt b/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt index fca064d840..abcef3577c 100644 --- a/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt +++ b/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt @@ -1,32 +1,14 @@ --TEST-- Test get_magic_quotes_runtime() function ---INI-- -magic_quotes_runtime = 0 --FILE-- <?php /* Prototype: int get_magic_quotes_runtime ( void ) - * Description: Gets the current active configuration setting of magic_quotes_runtime -*/ + * This function is not supported anymore and will always return false + */ echo "Simple testcase for get_magic_quotes_runtime() function\n"; -$g = get_magic_quotes_runtime(); -echo "\n-- magic quotes runtime set in INI file: " . $g . " --\n"; - -echo "\n-- Set magic quotes runtime to 1: --\n"; -var_dump(set_magic_quotes_runtime(1)); -$g = get_magic_quotes_runtime(); -echo "\n-- magic quotes runtime after set: " . $g . " --\n"; - -echo "\n-- Set magic quotes runtime to 0: --\n"; -var_dump(set_magic_quotes_runtime(0)); -$g = get_magic_quotes_runtime(); -echo "\n-- magic quotes runtime after set: " . $g . " --\n"; - -echo "\n-- Set magic quotes runtime to 1: --\n"; -var_dump(set_magic_quotes_runtime(1)); -$g = get_magic_quotes_runtime(); -echo "\n-- magic quotes runtime after set: " . $g . " --\n"; +var_dump(get_magic_quotes_runtime()); echo "\n-- Error cases --\n"; // no checks on number of args @@ -37,29 +19,13 @@ var_dump(get_magic_quotes_runtime(true)); --EXPECTF-- Simple testcase for get_magic_quotes_runtime() function --- magic quotes runtime set in INI file: 0 -- - --- Set magic quotes runtime to 1: -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) - --- magic quotes runtime after set: 1 -- +Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d +bool(false) --- Set magic quotes runtime to 0: -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) - --- magic quotes runtime after set: 0 -- - --- Set magic quotes runtime to 1: -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) +-- Error cases -- --- magic quotes runtime after set: 1 -- +Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d --- Error cases -- -int(1) +Warning: get_magic_quotes_runtime() expects exactly 0 parameters, 1 given in %s on line %d +NULL ===DONE=== diff --git a/ext/standard/tests/general_functions/set_magic_quotes_runtime_variation1.phpt b/ext/standard/tests/general_functions/set_magic_quotes_runtime_variation1.phpt index 843dbe22f3..e69de29bb2 100644 --- a/ext/standard/tests/general_functions/set_magic_quotes_runtime_variation1.phpt +++ b/ext/standard/tests/general_functions/set_magic_quotes_runtime_variation1.phpt @@ -1,204 +0,0 @@ ---TEST-- -Test set_magic_quotes_runtime() function - usage variation ---INI-- -magic_quotes_runtime = 0 ---FILE-- -<?php -/* Prototype: bool set_magic_quotes_runtime ( int $new_setting ) - * Description: Sets the current active configuration setting of magic_quotes_runtime -*/ - -echo "Simple testcase for set_magic_quotes_runtime() function\n"; - -$g = get_magic_quotes_runtime(); -echo "magic quotes runtime set in INI file: ".$g."\n"; - -// Prevent notices about undefines variables -error_reporting(E_ALL & ~E_NOTICE); - -$unset_var = 10; -unset ($unset_var); - -class fooClass { - function __toString() { - return "true"; - } -} - -$fp = fopen(__FILE__, "r"); - -$values = array( - - // int data -/*1*/ 0, - 1, - 12345, - -2345, - - // float data -/*5*/ 0.0, - 10.5, - -10.5, - 10.1234567e10, - 10.7654321E-10, - .5, - - // null data -/*11*/ NULL, - null, - - // boolean data -/*13*/ true, - false, - TRUE, - FALSE, - - // empty data -/*17*/ "", - '', - - // object data -/*19*/ new fooClass(), - - // resource -/*20*/ $fp, - - // undefined data -/*21*/ $undefined_var, - - // unset data -/*22*/ $unset_var -); - -// loop through each element of the array for data - -$iterator = 1; -foreach($values as $value) { - echo "-- Iterator $iterator --\n"; - var_dump( set_magic_quotes_runtime($value) ); - echo "New value of magic_quotes_runtime after last set is " . get_magic_quotes_runtime(). "\n"; - $iterator++; -}; - -fclose($fp); - -?> -===DONE=== ---EXPECTF-- -Simple testcase for set_magic_quotes_runtime() function -magic quotes runtime set in INI file: 0 --- Iterator 1 -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) -New value of magic_quotes_runtime after last set is 0 --- Iterator 2 -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) -New value of magic_quotes_runtime after last set is 1 --- Iterator 3 -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) -New value of magic_quotes_runtime after last set is 1 --- Iterator 4 -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) -New value of magic_quotes_runtime after last set is 1 --- Iterator 5 -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) -New value of magic_quotes_runtime after last set is 0 --- Iterator 6 -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) -New value of magic_quotes_runtime after last set is 1 --- Iterator 7 -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) -New value of magic_quotes_runtime after last set is 1 --- Iterator 8 -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) -New value of magic_quotes_runtime after last set is 1 --- Iterator 9 -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) -New value of magic_quotes_runtime after last set is 1 --- Iterator 10 -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) -New value of magic_quotes_runtime after last set is 1 --- Iterator 11 -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) -New value of magic_quotes_runtime after last set is 0 --- Iterator 12 -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) -New value of magic_quotes_runtime after last set is 0 --- Iterator 13 -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) -New value of magic_quotes_runtime after last set is 1 --- Iterator 14 -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) -New value of magic_quotes_runtime after last set is 0 --- Iterator 15 -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) -New value of magic_quotes_runtime after last set is 1 --- Iterator 16 -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) -New value of magic_quotes_runtime after last set is 0 --- Iterator 17 -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) -New value of magic_quotes_runtime after last set is 0 --- Iterator 18 -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) -New value of magic_quotes_runtime after last set is 0 --- Iterator 19 -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d - -Warning: set_magic_quotes_runtime() expects parameter 1 to be boolean, object given in %s on line %d -NULL -New value of magic_quotes_runtime after last set is 0 --- Iterator 20 -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d - -Warning: set_magic_quotes_runtime() expects parameter 1 to be boolean, resource given in %s on line %d -NULL -New value of magic_quotes_runtime after last set is 0 --- Iterator 21 -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) -New value of magic_quotes_runtime after last set is 0 --- Iterator 22 -- - -Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d -bool(true) -New value of magic_quotes_runtime after last set is 0 -===DONE=== diff --git a/ext/standard/tests/strings/add-and-stripslashes.phpt b/ext/standard/tests/strings/add-and-stripslashes.phpt index a5eab410b9..6f01176d4e 100644 --- a/ext/standard/tests/strings/add-and-stripslashes.phpt +++ b/ext/standard/tests/strings/add-and-stripslashes.phpt @@ -1,5 +1,5 @@ --TEST-- -addslashes() and stripslashes() functions, normal and sybase-style +addslashes() and stripslashes() functions --FILE-- <?php @@ -9,15 +9,6 @@ for($i=0; $i<512; $i++) { } echo "Normal: "; -ini_set('magic_quotes_sybase', 0); -if($input === stripslashes(addslashes($input))) { - echo "OK\n"; -} else { - echo "FAILED\n"; -} - -echo "Sybase: "; -ini_set('magic_quotes_sybase', 1); if($input === stripslashes(addslashes($input))) { echo "OK\n"; } else { @@ -27,4 +18,3 @@ if($input === stripslashes(addslashes($input))) { ?> --EXPECT-- Normal: OK -Sybase: OK diff --git a/ext/standard/tests/strings/addslashes_variation3.phpt b/ext/standard/tests/strings/addslashes_variation3.phpt index 8f46ebe9a4..e69de29bb2 100644 --- a/ext/standard/tests/strings/addslashes_variation3.phpt +++ b/ext/standard/tests/strings/addslashes_variation3.phpt @@ -1,196 +0,0 @@ ---TEST-- -Test addslashes() function : usage variations - with magic_quotes_sybase directive ON ---FILE-- -<?php -/* Prototype : string addslashes ( string $str ) - * Description: Returns a string with backslashes before characters that need to be quoted in database queries etc. - * Source code: ext/standard/string.c -*/ - -/* - * Test addslashes() with PHP directive magic_quotes_sybase set ON -*/ - -echo "*** Testing addslashes() : with php directive magic_quotes_sybase set ON ***\n"; - -// setting ON the php directive magic_quotes_sybase -ini_set("magic_quotes_sybase", "1"); - -// initialising a heredoc string -$heredoc_string = <<<EOT -This is line 1 of 'heredoc' string -This is line 2 of "heredoc" string -EOT; - -$heredoc_null_string =<<<EOT -EOT; - -// initialising the string array -$str_array = array( - // string without any characters that can be backslashed - 'Hello world', - - // string with single quotes - "how're you doing?", - "don't disturb u'r neighbours", - "don't disturb u'r neighbours''", - '', - '\'', - "'", - - // string with double quotes - 'he said, "he will be on leave"', - 'he said, ""he will be on leave"', - '"""PHP"""', - "", - "\"", - '"', - "hello\"", - - // string with backslash characters - 'Is your name Ram\Krishna?', - '\\0.0.0.0', - 'c:\php\testcase\addslashes', - '\\', - - // string with nul characters - 'hello'.chr(0).'world', - chr(0).'hello'.chr(0), - chr(0).chr(0).'hello', - chr(0), - - // mixed strings - "'\\0.0.0.0'", - "'\\0.0.0.0'".chr(0), - chr(0)."'c:\php\'", - '"\\0.0.0.0"', - '"c:\php\"'.chr(0)."'", - '"hello"'."'world'".chr(0).'//', - - // string with hexadecimal number - "0xABCDEF0123456789", - "\xabcdef0123456789", - '!@#$%&*@$%#&/;:,<>', - "hello\x00world", - - // heredoc strings - $heredoc_string, - $heredoc_null_string - ); - -$count = 1; -// looping to test for all strings in $str_array -foreach( $str_array as $str ) { - echo "\n-- Iteration $count --\n"; - var_dump( addslashes($str) ); - $count ++; -} - -echo "Done\n"; -?> ---EXPECTF-- -*** Testing addslashes() : with php directive magic_quotes_sybase set ON *** - --- Iteration 1 -- -string(11) "Hello world" - --- Iteration 2 -- -string(18) "how''re you doing?" - --- Iteration 3 -- -string(30) "don''t disturb u''r neighbours" - --- Iteration 4 -- -string(34) "don''t disturb u''r neighbours''''" - --- Iteration 5 -- -string(0) "" - --- Iteration 6 -- -string(2) "''" - --- Iteration 7 -- -string(2) "''" - --- Iteration 8 -- -string(30) "he said, "he will be on leave"" - --- Iteration 9 -- -string(31) "he said, ""he will be on leave"" - --- Iteration 10 -- -string(9) """"PHP"""" - --- Iteration 11 -- -string(0) "" - --- Iteration 12 -- -string(1) """ - --- Iteration 13 -- -string(1) """ - --- Iteration 14 -- -string(6) "hello"" - --- Iteration 15 -- -string(25) "Is your name Ram\Krishna?" - --- Iteration 16 -- -string(8) "\0.0.0.0" - --- Iteration 17 -- -string(26) "c:\php\testcase\addslashes" - --- Iteration 18 -- -string(1) "\" - --- Iteration 19 -- -string(12) "hello\0world" - --- Iteration 20 -- -string(9) "\0hello\0" - --- Iteration 21 -- -string(9) "\0\0hello" - --- Iteration 22 -- -string(2) "\0" - --- Iteration 23 -- -string(12) "''\0.0.0.0''" - --- Iteration 24 -- -string(14) "''\0.0.0.0''\0" - --- Iteration 25 -- -string(13) "\0''c:\php\''" - --- Iteration 26 -- -string(10) ""\0.0.0.0"" - --- Iteration 27 -- -string(13) ""c:\php\"\0''" - --- Iteration 28 -- -string(20) ""hello"''world''\0//" - --- Iteration 29 -- -string(18) "0xABCDEF0123456789" - --- Iteration 30 -- -string(15) "«cdef0123456789" - --- Iteration 31 -- -string(18) "!@#$%&*@$%#&/;:,<>" - --- Iteration 32 -- -string(12) "hello\0world" - --- Iteration 33 -- -string(71) "This is line 1 of ''heredoc'' string -This is line 2 of "heredoc" string" - --- Iteration 34 -- -string(0) "" -Done diff --git a/ext/standard/tests/strings/bug22904.phpt b/ext/standard/tests/strings/bug22904.phpt index 3c56e1a414..e69de29bb2 100644 --- a/ext/standard/tests/strings/bug22904.phpt +++ b/ext/standard/tests/strings/bug22904.phpt @@ -1,30 +0,0 @@ ---TEST-- -Bug #22904 (magic mode failed for cybase with '\0') ---FILE-- -not active yet -<?php - -/* -ini_set("magic_quotes_sybase","on"); -test(); -ini_set("magic_quotes_sybase","off"); -test(); -*/ -function test(){ - $buf = 'g\g"\0g'."'"; - $slashed = addslashes($buf); - echo "$buf\n"; - echo "$slashed\n"; - echo stripslashes($slashed."\n"); -/* -g\g"\0g' -g\\g"\\0g'' -g\g"\0g' -g\g"\0g' -g\\g\"\\0g\' -g\g"\0g' -*/ -} -?> ---EXPECT-- -not active yet diff --git a/ext/standard/tests/strings/parse_str_basic3.phpt b/ext/standard/tests/strings/parse_str_basic3.phpt Binary files differindex 06e614374e..f0f5981e8f 100644 --- a/ext/standard/tests/strings/parse_str_basic3.phpt +++ b/ext/standard/tests/strings/parse_str_basic3.phpt diff --git a/ext/standard/tests/strings/stripslashes_variation5.phpt b/ext/standard/tests/strings/stripslashes_variation5.phpt Binary files differindex 0507e04960..e69de29bb2 100644 --- a/ext/standard/tests/strings/stripslashes_variation5.phpt +++ b/ext/standard/tests/strings/stripslashes_variation5.phpt diff --git a/ext/sysvsem/tests/sysv.phpt b/ext/sysvsem/tests/sysv.phpt index 4245d8ef0c..3a962be31a 100644 --- a/ext/sysvsem/tests/sysv.phpt +++ b/ext/sysvsem/tests/sysv.phpt @@ -6,8 +6,6 @@ if(!extension_loaded('sysvsem') || !extension_loaded('sysvshm')) { die("skip Both sysvsem and sysvshm required"); } ?> ---INI-- -magic_quotes_runtime=0 --FILE-- <?php $MEMSIZE = 512; // size of shared memory to allocate diff --git a/ext/xml/tests/xml001.phpt b/ext/xml/tests/xml001.phpt index 62d597c5f8..9c03b553cc 100644 --- a/ext/xml/tests/xml001.phpt +++ b/ext/xml/tests/xml001.phpt @@ -5,8 +5,6 @@ XML parser test, function callbacks require_once("skipif.inc"); XML_SAX_IMPL == 'libxml' && die('skip this test is not intended for libxml SAX parser'); ?> ---INI-- -magic_quotes_runtime=0 --FILE-- <?php chdir(dirname(__FILE__)); diff --git a/ext/xml/tests/xml002.phpt b/ext/xml/tests/xml002.phpt index 8ae8dfbe66..ce547e8acc 100644 --- a/ext/xml/tests/xml002.phpt +++ b/ext/xml/tests/xml002.phpt @@ -5,8 +5,6 @@ XML parser test, object tuple callbacks require_once("skipif.inc"); XML_SAX_IMPL == 'libxml' && die('skip this test is not intended for libxml SAX parser'); ?> ---INI-- -magic_quotes_runtime=0 --FILE-- <?php chdir(dirname(__FILE__)); diff --git a/ext/xml/tests/xml003.phpt b/ext/xml/tests/xml003.phpt index 311c81acfb..6b0c3f5c5a 100644 --- a/ext/xml/tests/xml003.phpt +++ b/ext/xml/tests/xml003.phpt @@ -5,8 +5,6 @@ XML parser test, xml_set_object callbacks require_once("skipif.inc"); XML_SAX_IMPL == 'libxml' && die('skip this test is not intended for libxml SAX parser'); ?> ---INI-- -magic_quotes_runtime=0 --FILE-- <?php chdir(dirname(__FILE__)); diff --git a/ext/xml/tests/xml004.phpt b/ext/xml/tests/xml004.phpt index 78840ee122..245a93fc10 100644 --- a/ext/xml/tests/xml004.phpt +++ b/ext/xml/tests/xml004.phpt @@ -2,8 +2,6 @@ XML parser case folding test --SKIPIF-- <?php include("skipif.inc"); ?> ---INI-- -magic_quotes_runtime=0 --FILE-- <?php chdir(dirname(__FILE__)); diff --git a/ext/xml/tests/xml_closures_001.phpt b/ext/xml/tests/xml_closures_001.phpt index 5439a2a918..37df254190 100755 --- a/ext/xml/tests/xml_closures_001.phpt +++ b/ext/xml/tests/xml_closures_001.phpt @@ -2,8 +2,6 @@ XML parser test using closures as callbacks --SKIPIF-- <?php include("skipif.inc"); ?> ---INI-- -magic_quotes_runtime=0 --FILE-- <?php chdir(dirname(__FILE__)); diff --git a/ext/zlib/tests/004.phpt b/ext/zlib/tests/004.phpt index a758b8c7b3..ebc7d82b95 100644 --- a/ext/zlib/tests/004.phpt +++ b/ext/zlib/tests/004.phpt @@ -12,9 +12,6 @@ var_dump(gzfile(1,1,1)); var_dump(gzfile(dirname(__FILE__)."/004.txt.gz")); var_dump(gzfile(dirname(__FILE__)."/004.txt.gz", 1)); -ini_set("magic_quotes_runtime", 1); -var_dump(gzfile(dirname(__FILE__)."/004.txt.gz", -1)); - echo "Done\n"; ?> --EXPECTF-- @@ -66,24 +63,4 @@ array(6) { string(39) "and I know that it descends down on me " } -array(6) { - [0]=> - string(37) "When you\'re taught through feelings -" - [1]=> - string(26) "Destiny flying high above -" - [2]=> - string(38) "all I know is that you can realize it -" - [3]=> - string(18) "Destiny who cares -" - [4]=> - string(19) "as it turns around -" - [5]=> - string(39) "and I know that it descends down on me -" -} Done diff --git a/main/php_version.h b/main/php_version.h index 7ae029251b..b09b8a4b5c 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 4 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION "alpha3" +#define PHP_EXTRA_VERSION "alpha3-dev" #define PHP_VERSION "5.4.0alpha3-dev" #define PHP_VERSION_ID 50400 diff --git a/tests/basic/023.phpt b/tests/basic/023.phpt index 4eb698fa05..181745ea5b 100644 --- a/tests/basic/023.phpt +++ b/tests/basic/023.phpt @@ -1,7 +1,5 @@ --TEST-- Cookies test#2 ---INI-- -magic_quotes_gpc=0 --COOKIE-- c o o k i e=value; c o o k i e= v a l u e ;;c%20o+o k+i%20e=v;name="value","value",UEhQIQ==;UEhQIQ==foo --FILE-- diff --git a/tests/basic/024.phpt b/tests/basic/024.phpt index 847eeac824..497d3514e0 100644 --- a/tests/basic/024.phpt +++ b/tests/basic/024.phpt @@ -1,7 +1,6 @@ --TEST-- Test HTTP_RAW_POST_DATA creation --INI-- -magic_quotes_gpc=0 always_populate_raw_post_data=1 --POST-- a=ABC&y=XYZ&c[]=1&c[]=2&c[a]=3 diff --git a/tests/basic/025.phpt b/tests/basic/025.phpt index bafcac8091..58191bcd61 100644 --- a/tests/basic/025.phpt +++ b/tests/basic/025.phpt @@ -1,7 +1,6 @@ --TEST-- Test HTTP_RAW_POST_DATA with excessive post length --INI-- -magic_quotes_gpc=0 always_populate_raw_post_data=1 post_max_size=1K --POST-- diff --git a/tests/basic/026.phpt b/tests/basic/026.phpt index 957aa1972c..b98a31f430 100644 --- a/tests/basic/026.phpt +++ b/tests/basic/026.phpt @@ -1,7 +1,6 @@ --TEST-- Registration of HTTP_RAW_POST_DATA due to unknown content-type --INI-- -magic_quotes_gpc=0 always_populate_raw_post_data=0 --POST_RAW-- Content-Type: unknown/type diff --git a/tests/basic/027.phpt b/tests/basic/027.phpt index ae5d78d50d..aa001f65a3 100644 --- a/tests/basic/027.phpt +++ b/tests/basic/027.phpt @@ -1,7 +1,6 @@ --TEST-- Handling of max_input_nesting_level being reached --INI-- -magic_quotes_gpc=0 always_populate_raw_post_data=0 display_errors=0 max_input_nesting_level=10 diff --git a/tests/basic/bug46313-win.phpt b/tests/basic/bug46313-win.phpt index 457e5eb7b3..e588bec767 100644 --- a/tests/basic/bug46313-win.phpt +++ b/tests/basic/bug46313-win.phpt @@ -5,6 +5,71 @@ Bug #46313 (Magic quotes broke $_FILES) --INI-- magic_quotes_gpc=1 file_uploads=1 +register_globals=1 +--POST_RAW-- +Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737 +-----------------------------20896060251896012921717172737 +Content-Disposition: form-data; name="o1'file"; filename="o1'file.png" +Content-Type: text/plain-file1 + +1 +-----------------------------20896060251896012921717172737 +Content-Disposition: form-data; name="o2'file"; filename="o2'file2.txt" +Content-Type: text/plain-file2 + +2 +-----------------------------20896060251896012921717172737-- +--FILE-- +<?php +var_dump($_FILES); +var_dump($GLOBALS["o1\'file_name"]); +var_dump($GLOBALS["o1\'file_name"] === $_FILES["o1\'file"]["name"]); +var_dump($GLOBALS["o1\'file"]); +var_dump($GLOBALS["o1\'file"] === $_FILES["o1\'file"]["tmp_name"]); +?> +--EXPECTF-- +array(2) { + ["o1\'file"]=> + array(5) { + ["name"]=> + string(12) "o1" + ["type"]=> + string(16) "text/plain-file1" + ["tmp_name"]=> + string(14) "%s" + ["error"]=> + int(0) + ["size"]=> + int(1) + } + ["o2\'file"]=> + array(5) { + ["name"]=> + string(13) "o2" + ["type"]=> + string(16) "text/plain-file2" + ["tmp_name"]=> + string(14) "%s" + ["error"]=> + int(0) + ["size"]=> + int(1) + } +} +string(12) "o1" +bool(true) +string(%d) "%s" +bool(true) +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 + +--TEST-- +Bug #46313 (Magic quotes broke $_FILES) +--SKIPIF-- +<?php if(substr(PHP_OS, 0, 3) != "WIN") die("skip Windows-only test"); ?> +--INI-- +magic_quotes_gpc=1 +file_uploads=1 --POST_RAW-- Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737 -----------------------------20896060251896012921717172737 diff --git a/tests/basic/bug46313.phpt b/tests/basic/bug46313.phpt index 6c1f65c935..e69de29bb2 100644 --- a/tests/basic/bug46313.phpt +++ b/tests/basic/bug46313.phpt @@ -1,54 +0,0 @@ ---TEST-- -Bug #46313 (Magic quotes broke $_FILES) ---SKIPIF-- -<?php if(substr(PHP_OS, 0, 3) == "WIN") die("skip non-Windows test"); ?> ---INI-- -magic_quotes_gpc=1 -file_uploads=1 -display_errors=0 ---POST_RAW-- -Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737 ------------------------------20896060251896012921717172737 -Content-Disposition: form-data; name="o1'file"; filename="o1'file.png" -Content-Type: text/plain-file1 - -1 ------------------------------20896060251896012921717172737 -Content-Disposition: form-data; name="o2'file"; filename="o2'file2.txt" -Content-Type: text/plain-file2 - -2 ------------------------------20896060251896012921717172737-- ---FILE-- -<?php -var_dump($_FILES); -?> ---EXPECTF-- -array(2) { - ["o1\'file"]=> - array(5) { - ["name"]=> - string(12) "o1\'file.png" - ["type"]=> - string(16) "text/plain-file1" - ["tmp_name"]=> - string(%d) "%s" - ["error"]=> - int(0) - ["size"]=> - int(1) - } - ["o2\'file"]=> - array(5) { - ["name"]=> - string(13) "o2\'file2.txt" - ["type"]=> - string(16) "text/plain-file2" - ["tmp_name"]=> - string(%d) "%s" - ["error"]=> - int(0) - ["size"]=> - int(1) - } -} diff --git a/tests/basic/bug46759.phpt b/tests/basic/bug46759.phpt index d35cd534c2..e69de29bb2 100644 --- a/tests/basic/bug46759.phpt +++ b/tests/basic/bug46759.phpt @@ -1,20 +0,0 @@ ---TEST-- -Testing magic_quotes_gpc ---INI-- -display_errors=0 -magic_quotes_gpc=1 ---GET-- -a='&b="&c=\" ---FILE-- -<?php - -foreach ($_GET AS $key => $value) -{ - echo $key . ": " . $value . "\n"; -} - -?> ---EXPECT-- -a: \' -b: \" -c: \\\" diff --git a/tests/security/magic_quotes_gpc.phpt b/tests/security/magic_quotes_gpc.phpt index 382ab94d2d..e69de29bb2 100644 --- a/tests/security/magic_quotes_gpc.phpt +++ b/tests/security/magic_quotes_gpc.phpt @@ -1,13 +0,0 @@ ---TEST-- -Test if magic_quotes_gpc works as expected ---INI-- -display_errors=0 -magic_quotes_gpc=1 ---GET-- -a=abc'"%00123 ---FILE-- -<?php -echo $_GET['a'],"\n"; -?> ---EXPECT-- -abc\'\"\0123 |