diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-11-29 01:45:54 +0000 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-11-29 01:45:54 +0000 |
| commit | 01554bf3e417f13baf7af874e449c265c0309279 (patch) | |
| tree | 8aca46ab27a54cea34c14001af774942f0502e39 /ext/standard/tests | |
| parent | 65c8edd525108f6598a8bb25fb3c5d6c80233322 (diff) | |
| parent | 719083bd943e6c287c2dcb47918cf51f89a4ac08 (diff) | |
| download | php-git-01554bf3e417f13baf7af874e449c265c0309279.tar.gz | |
Merge branch 'master' into zppFailOnOverflow
Diffstat (limited to 'ext/standard/tests')
45 files changed, 217 insertions, 67 deletions
diff --git a/ext/standard/tests/array/array_search_variation4.phpt b/ext/standard/tests/array/array_search_variation4.phpt index c247879ccc..7feb2ef147 100644 --- a/ext/standard/tests/array/array_search_variation4.phpt +++ b/ext/standard/tests/array/array_search_variation4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test array_search() function : usage variations - haystack as resource/multi dimentional array +Test array_search() function : usage variations - haystack as resource/multi dimensional array --FILE-- <?php /* diff --git a/ext/standard/tests/array/in_array_variation4.phpt b/ext/standard/tests/array/in_array_variation4.phpt index a27bb196b4..9a5312b268 100644 --- a/ext/standard/tests/array/in_array_variation4.phpt +++ b/ext/standard/tests/array/in_array_variation4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test in_array() function : usage variations - haystack as resource/multi dimentional array +Test in_array() function : usage variations - haystack as resource/multi dimensional array --FILE-- <?php /* diff --git a/ext/standard/tests/file/fgetc_variation1.phpt b/ext/standard/tests/file/fgetc_variation1.phpt index 007b2e0f9c..03258cac5d 100644 --- a/ext/standard/tests/file/fgetc_variation1.phpt +++ b/ext/standard/tests/file/fgetc_variation1.phpt @@ -34,7 +34,7 @@ for(; $loop_counter < count($file_modes); $loop_counter++) { var_dump( feof($file_handle) ); // expected false var_dump( ftell($file_handle) ); // ensure that file pointer is at eof var_dump( fgetc($file_handle) ); // try n read a char, none expected - var_dump( feof($file_handle) ); // ensure thta file pointer is at eof + var_dump( feof($file_handle) ); // ensure that file pointer is at eof var_dump( ftell($file_handle) ); // file pointer position // close the file handle diff --git a/ext/standard/tests/file/fgets_variation6-win32.phpt b/ext/standard/tests/file/fgets_variation6-win32.phpt index 14cb46f185..0334050aaa 100644 --- a/ext/standard/tests/file/fgets_variation6-win32.phpt +++ b/ext/standard/tests/file/fgets_variation6-win32.phpt @@ -49,7 +49,7 @@ foreach($file_modes as $file_mode) { var_dump( fgets($file_handle) ); // try n read a line, none expected var_dump( ftell($file_handle) ); // file pointer position - var_dump( feof($file_handle) ); // ensure thta file pointer is at eof + var_dump( feof($file_handle) ); // ensure that file pointer is at eof //close file fclose($file_handle); diff --git a/ext/standard/tests/file/fgets_variation6.phpt b/ext/standard/tests/file/fgets_variation6.phpt index da6c2149b9..69215d9020 100644 --- a/ext/standard/tests/file/fgets_variation6.phpt +++ b/ext/standard/tests/file/fgets_variation6.phpt @@ -49,7 +49,7 @@ foreach($file_modes as $file_mode) { var_dump( fgets($file_handle) ); // try n read a line, none expected var_dump( ftell($file_handle) ); // file pointer position - var_dump( feof($file_handle) ); // ensure thta file pointer is at eof + var_dump( feof($file_handle) ); // ensure that file pointer is at eof //close file fclose($file_handle); diff --git a/ext/standard/tests/file/file.inc b/ext/standard/tests/file/file.inc index b3cd99e1c1..aff9d107d9 100644 --- a/ext/standard/tests/file/file.inc +++ b/ext/standard/tests/file/file.inc @@ -451,7 +451,7 @@ function delete_file($filename) { Description: Deletes given number of files if exists. $file_path = location of the files $name_prefix = prefix for the filename, rest of the name is incremental(increment by 1 only) - numeric starting from suffix upto count + numeric starting from suffix up to count $count = number of files to be deleted $name_suffix = first numeric suffix in the name Returns: An array with following key/value pair @@ -495,7 +495,7 @@ function delete_files($file_path, $file_path = location of link files $link_file_count = Number of link files $link_name_prefix = prefix for the linkname, rest of the name is incremental(increment by 1 only) - numeric starting from $link_name_suffix upto count + numeric starting from $link_name_suffix up to count $link_name_suffix = first numeric suffix in the name Returns: An array with following key/value pair diff --git a/ext/standard/tests/file/fscanf_variation18.phpt b/ext/standard/tests/file/fscanf_variation18.phpt index 71b72984b8..bdd444d0e5 100644 --- a/ext/standard/tests/file/fscanf_variation18.phpt +++ b/ext/standard/tests/file/fscanf_variation18.phpt @@ -35,8 +35,8 @@ $integer_values = array ( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/file/fscanf_variation2.phpt b/ext/standard/tests/file/fscanf_variation2.phpt index 77ae474ccc..8179aee78e 100644 --- a/ext/standard/tests/file/fscanf_variation2.phpt +++ b/ext/standard/tests/file/fscanf_variation2.phpt @@ -34,8 +34,8 @@ $valid_ints = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/file/fscanf_variation20.phpt b/ext/standard/tests/file/fscanf_variation20.phpt index 7ce609c680..3c176773ed 100644 --- a/ext/standard/tests/file/fscanf_variation20.phpt +++ b/ext/standard/tests/file/fscanf_variation20.phpt @@ -34,8 +34,8 @@ $valid_ints = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/file/fscanf_variation27.phpt b/ext/standard/tests/file/fscanf_variation27.phpt index 7a691fcc60..04f2dd5a62 100644 --- a/ext/standard/tests/file/fscanf_variation27.phpt +++ b/ext/standard/tests/file/fscanf_variation27.phpt @@ -34,8 +34,8 @@ $valid_ints = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/file/fscanf_variation33.phpt b/ext/standard/tests/file/fscanf_variation33.phpt index 7ecff33fb9..2dc404ac76 100644 --- a/ext/standard/tests/file/fscanf_variation33.phpt +++ b/ext/standard/tests/file/fscanf_variation33.phpt @@ -40,8 +40,8 @@ $valid_ints = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/file/fscanf_variation39.phpt b/ext/standard/tests/file/fscanf_variation39.phpt index 1b17015bc1..30d299662a 100644 --- a/ext/standard/tests/file/fscanf_variation39.phpt +++ b/ext/standard/tests/file/fscanf_variation39.phpt @@ -40,8 +40,8 @@ $valid_ints = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/file/fscanf_variation45.phpt b/ext/standard/tests/file/fscanf_variation45.phpt index 7db0cc9748..cfd1fe2c4f 100644 --- a/ext/standard/tests/file/fscanf_variation45.phpt +++ b/ext/standard/tests/file/fscanf_variation45.phpt @@ -34,8 +34,8 @@ $valid_ints = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/file/fscanf_variation9.phpt b/ext/standard/tests/file/fscanf_variation9.phpt index f3551f08d2..609c3ef139 100644 --- a/ext/standard/tests/file/fscanf_variation9.phpt +++ b/ext/standard/tests/file/fscanf_variation9.phpt @@ -41,8 +41,8 @@ $integer_values = array ( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/general_functions/bug39322.phpt b/ext/standard/tests/general_functions/bug39322.phpt index a9f83c75bf..da06e89847 100644 --- a/ext/standard/tests/general_functions/bug39322.phpt +++ b/ext/standard/tests/general_functions/bug39322.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #39322 (proc_terminate() loosing process resource) +Bug #39322 (proc_terminate() losing process resource) --SKIPIF-- <?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); diff --git a/ext/standard/tests/general_functions/getrusage_basic.phpt b/ext/standard/tests/general_functions/getrusage_basic.phpt index c9b34597cf..0e5b42c420 100644 --- a/ext/standard/tests/general_functions/getrusage_basic.phpt +++ b/ext/standard/tests/general_functions/getrusage_basic.phpt @@ -18,7 +18,7 @@ echo "Simple testcase for getrusage() function\n"; $dat = getrusage(); if (!is_array($dat)) { - echo "TEST FAILED : getrusage shoudl return an array\n"; + echo "TEST FAILED : getrusage should return an array\n"; } // echo the fields which are common to all platforms diff --git a/ext/standard/tests/general_functions/intval.phpt b/ext/standard/tests/general_functions/intval.phpt index 7986e2dd14..095d66e3f2 100644 --- a/ext/standard/tests/general_functions/intval.phpt +++ b/ext/standard/tests/general_functions/intval.phpt @@ -25,8 +25,8 @@ $valid_ints = array( '0Xfff', '0XFA', -0x80000000, // max negative integer as hexadecimal - '0x7fffffff', // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + '0x7fffffff', // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal '0123', // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/general_functions/is_int.phpt b/ext/standard/tests/general_functions/is_int.phpt index 7cc3f3b2f5..3aed0c9f17 100644 --- a/ext/standard/tests/general_functions/is_int.phpt +++ b/ext/standard/tests/general_functions/is_int.phpt @@ -25,8 +25,8 @@ $valid_ints = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/general_functions/is_int_64bit.phpt b/ext/standard/tests/general_functions/is_int_64bit.phpt index 9de376eb1c..6f7f5162cd 100644 --- a/ext/standard/tests/general_functions/is_int_64bit.phpt +++ b/ext/standard/tests/general_functions/is_int_64bit.phpt @@ -27,8 +27,8 @@ $valid_ints = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/general_functions/php_uname_error.phpt b/ext/standard/tests/general_functions/php_uname_error.phpt index 5e221b75cc..ca4c3d4022 100644 --- a/ext/standard/tests/general_functions/php_uname_error.phpt +++ b/ext/standard/tests/general_functions/php_uname_error.phpt @@ -12,7 +12,7 @@ echo "\n-- Testing php_uname() function with more than expected no. of arguments var_dump( php_uname('a', true) ); echo "\n-- Testing php_uname() function with invalid mode --\n"; -// am invalid mode shoudl result in same o/p as mode 'a' +// am invalid mode should result in same o/p as mode 'a' var_dump( php_uname('z') == php_uname('z') ); class barClass { diff --git a/ext/standard/tests/general_functions/strval.phpt b/ext/standard/tests/general_functions/strval.phpt index 372ac6701e..89f5c591e8 100644 --- a/ext/standard/tests/general_functions/strval.phpt +++ b/ext/standard/tests/general_functions/strval.phpt @@ -43,8 +43,8 @@ $scalars = array( /* floats */ -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/general_functions/var_export-locale.phpt b/ext/standard/tests/general_functions/var_export-locale.phpt index b6f87c431c..b4d122e7b3 100644 --- a/ext/standard/tests/general_functions/var_export-locale.phpt +++ b/ext/standard/tests/general_functions/var_export-locale.phpt @@ -31,8 +31,8 @@ $valid_ints = array( '0Xfff', '0XFA', -0x80000000, // max negative integer as hexadecimal - '0x7fffffff', // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + '0x7fffffff', // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal '0123', // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/general_functions/var_export_basic1.phpt b/ext/standard/tests/general_functions/var_export_basic1.phpt index 3a734c7fe0..8a23fe341b 100644 --- a/ext/standard/tests/general_functions/var_export_basic1.phpt +++ b/ext/standard/tests/general_functions/var_export_basic1.phpt @@ -23,8 +23,8 @@ $valid_ints = array( "'0Xfff'" => '0Xfff', "'0XFA'" => '0XFA', "-0x80000000" => -0x80000000, // max negative integer as hexadecimal - "'0x7fffffff'" => '0x7fffffff', // max postive integer as hexadecimal - "0x7FFFFFFF" => 0x7FFFFFFF, // max postive integer as hexadecimal + "'0x7fffffff'" => '0x7fffffff', // max positive integer as hexadecimal + "0x7FFFFFFF" => 0x7FFFFFFF, // max positive integer as hexadecimal "'0123'" => '0123', // integer as octal "01912" => 01912, // should be quivalent to octal 1 "-020000000000" => -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/image/test1bpix.bmp b/ext/standard/tests/image/test1bpix.bmp Binary files differindex 5522e503d2..ddac2a0dda 100644 --- a/ext/standard/tests/image/test1bpix.bmp +++ b/ext/standard/tests/image/test1bpix.bmp diff --git a/ext/standard/tests/serialize/precision.phpt b/ext/standard/tests/serialize/precision.phpt index 142b2cecf8..229c514e69 100644 --- a/ext/standard/tests/serialize/precision.phpt +++ b/ext/standard/tests/serialize/precision.phpt @@ -15,8 +15,8 @@ $numbers = array( "0100000000001000", //2^-1022. + 10^-Accuracy[2^-1022.]*1.01 "ffffffffffffef7f", //2^1024. (maximum normal double) "feffffffffffef7f", //2^1024. - 10^-Accuracy[2^1024.] - "0100000000000000", //minumum subnormal double - "0200000000000000", //2nd minumum subnormal double + "0100000000000000", //minimum subnormal double + "0200000000000000", //2nd minimum subnormal double "fffffffffffff000", //maximum subnormal double "fefffffffffff000", //2nd maximum subnormal double "0000000000000f7f", //+inf diff --git a/ext/standard/tests/serialize/serialization_error_001.phpt b/ext/standard/tests/serialize/serialization_error_001.phpt index da6f50cc02..014128b19f 100644 --- a/ext/standard/tests/serialize/serialization_error_001.phpt +++ b/ext/standard/tests/serialize/serialization_error_001.phpt @@ -21,7 +21,7 @@ var_dump( unserialize() ); //Test serialize with one more than the expected number of arguments var_dump( serialize(1,2) ); -var_dump( unserialize(1,2) ); +var_dump( unserialize(1,2,3) ); echo "Done"; ?> @@ -31,12 +31,12 @@ echo "Done"; Warning: serialize() expects exactly 1 parameter, 0 given in %s on line 16 NULL -Warning: unserialize() expects exactly 1 parameter, 0 given in %s on line 17 +Warning: unserialize() expects at least 1 parameter, 0 given in %s on line 17 bool(false) Warning: serialize() expects exactly 1 parameter, 2 given in %s on line 20 NULL -Warning: unserialize() expects exactly 1 parameter, 2 given in %s on line 21 +Warning: unserialize() expects at most 2 parameters, 3 given in %s on line 21 bool(false) Done diff --git a/ext/standard/tests/serialize/unserialize_classes.phpt b/ext/standard/tests/serialize/unserialize_classes.phpt new file mode 100644 index 0000000000..2a9d8a743c --- /dev/null +++ b/ext/standard/tests/serialize/unserialize_classes.phpt @@ -0,0 +1,88 @@ +--TEST-- +Test unserialize() with second parameter +--FILE-- +<?php +class foo { + public $x = "bar"; +} +$z = array(new foo(), 2, "3"); +$s = serialize($z); + +var_dump(unserialize($s)); +var_dump(unserialize($s, ["allowed_classes" => false])); +var_dump(unserialize($s, ["allowed_classes" => true])); +var_dump(unserialize($s, ["allowed_classes" => ["bar"]])); +var_dump(unserialize($s, ["allowed_classes" => ["FOO"]])); +var_dump(unserialize($s, ["allowed_classes" => ["bar", "foO"]])); + +--EXPECTF-- +array(3) { + [0]=> + object(foo)#%d (1) { + ["x"]=> + string(3) "bar" + } + [1]=> + int(2) + [2]=> + string(1) "3" +} +array(3) { + [0]=> + object(__PHP_Incomplete_Class)#%d (2) { + ["__PHP_Incomplete_Class_Name"]=> + string(3) "foo" + ["x"]=> + string(3) "bar" + } + [1]=> + int(2) + [2]=> + string(1) "3" +} +array(3) { + [0]=> + object(foo)#%d (1) { + ["x"]=> + string(3) "bar" + } + [1]=> + int(2) + [2]=> + string(1) "3" +} +array(3) { + [0]=> + object(__PHP_Incomplete_Class)#%d (2) { + ["__PHP_Incomplete_Class_Name"]=> + string(3) "foo" + ["x"]=> + string(3) "bar" + } + [1]=> + int(2) + [2]=> + string(1) "3" +} +array(3) { + [0]=> + object(foo)#%d (1) { + ["x"]=> + string(3) "bar" + } + [1]=> + int(2) + [2]=> + string(1) "3" +} +array(3) { + [0]=> + object(foo)#%d (1) { + ["x"]=> + string(3) "bar" + } + [1]=> + int(2) + [2]=> + string(1) "3" +} diff --git a/ext/standard/tests/strings/addcslashes_005.phpt b/ext/standard/tests/strings/addcslashes_005.phpt new file mode 100644 index 0000000000..f0b2fbcecb --- /dev/null +++ b/ext/standard/tests/strings/addcslashes_005.phpt @@ -0,0 +1,12 @@ +--TEST-- +addcslashes(); function test with warning +--CREDITS-- + marcosptf - <marcosptf@yahoo.com.br> +#phptestfest PHPSP on Google - Sao Paulo - Brazil - 2014-06-05 +--FILE-- +<?php +echo addcslashes("zoo['.']","z..A"); +?> +--EXPECTF-- +Warning: addcslashes(): Invalid '..'-range, '..'-range needs to be incrementing in %s on line %d +\zoo['\.'] diff --git a/ext/standard/tests/strings/bin2hex_001.phpt b/ext/standard/tests/strings/bin2hex_001.phpt new file mode 100644 index 0000000000..e73500a30e --- /dev/null +++ b/ext/standard/tests/strings/bin2hex_001.phpt @@ -0,0 +1,11 @@ +--TEST-- +bin2hex(); function test +--CREDITS-- +marcosptf - <marcosptf@yahoo.com.br> +#phptestfest PHPSP on Google - Sao Paulo - Brazil - 2014-06-05 +--FILE-- +<?php +echo bin2hex("123456"); +?> +--EXPECT-- +313233343536 diff --git a/ext/standard/tests/strings/sprintf_variation10.phpt b/ext/standard/tests/strings/sprintf_variation10.phpt index 702dc34c77..e989d9f8b8 100644 --- a/ext/standard/tests/strings/sprintf_variation10.phpt +++ b/ext/standard/tests/strings/sprintf_variation10.phpt @@ -23,8 +23,8 @@ $integer_values = array ( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/strings/sprintf_variation19.phpt b/ext/standard/tests/strings/sprintf_variation19.phpt index ae7b910573..542ba52aa3 100644 --- a/ext/standard/tests/strings/sprintf_variation19.phpt +++ b/ext/standard/tests/strings/sprintf_variation19.phpt @@ -23,8 +23,8 @@ $integer_values = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/strings/sprintf_variation21.phpt b/ext/standard/tests/strings/sprintf_variation21.phpt Binary files differindex afedfcaf7c..cbbf16e066 100644 --- a/ext/standard/tests/strings/sprintf_variation21.phpt +++ b/ext/standard/tests/strings/sprintf_variation21.phpt diff --git a/ext/standard/tests/strings/sprintf_variation28.phpt b/ext/standard/tests/strings/sprintf_variation28.phpt index 8fad68b0d9..40af96f960 100644 --- a/ext/standard/tests/strings/sprintf_variation28.phpt +++ b/ext/standard/tests/strings/sprintf_variation28.phpt @@ -29,8 +29,8 @@ $integer_values = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/strings/sprintf_variation28_64bit.phpt b/ext/standard/tests/strings/sprintf_variation28_64bit.phpt index cd83093a74..92fdf78da1 100644 --- a/ext/standard/tests/strings/sprintf_variation28_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation28_64bit.phpt @@ -25,8 +25,8 @@ $integer_values = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/strings/sprintf_variation3.phpt b/ext/standard/tests/strings/sprintf_variation3.phpt index 51a89ea08b..0435cf3d77 100644 --- a/ext/standard/tests/strings/sprintf_variation3.phpt +++ b/ext/standard/tests/strings/sprintf_variation3.phpt @@ -23,8 +23,8 @@ $valid_ints = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/strings/sprintf_variation34.phpt b/ext/standard/tests/strings/sprintf_variation34.phpt index c6186b6780..8a5cd809d6 100644 --- a/ext/standard/tests/strings/sprintf_variation34.phpt +++ b/ext/standard/tests/strings/sprintf_variation34.phpt @@ -29,8 +29,8 @@ $integer_values = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/strings/sprintf_variation34_64bit.phpt b/ext/standard/tests/strings/sprintf_variation34_64bit.phpt index f9a7805f98..27e3f0c73e 100644 --- a/ext/standard/tests/strings/sprintf_variation34_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation34_64bit.phpt @@ -25,8 +25,8 @@ $integer_values = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/strings/sprintf_variation40.phpt b/ext/standard/tests/strings/sprintf_variation40.phpt index 0da6a10b8a..6efcee0608 100644 --- a/ext/standard/tests/strings/sprintf_variation40.phpt +++ b/ext/standard/tests/strings/sprintf_variation40.phpt @@ -29,8 +29,8 @@ $integer_values = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/strings/sprintf_variation40_64bit.phpt b/ext/standard/tests/strings/sprintf_variation40_64bit.phpt index da6f37ace4..029e94c782 100644 --- a/ext/standard/tests/strings/sprintf_variation40_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation40_64bit.phpt @@ -25,8 +25,8 @@ $integer_values = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/strings/sprintf_variation46.phpt b/ext/standard/tests/strings/sprintf_variation46.phpt index 36aef14dd8..311d8c192a 100644 --- a/ext/standard/tests/strings/sprintf_variation46.phpt +++ b/ext/standard/tests/strings/sprintf_variation46.phpt @@ -23,8 +23,8 @@ $integer_values = array( 0Xfff, 0XFA, -0x80000000, // max negative integer as hexadecimal - 0x7fffffff, // max postive integer as hexadecimal - 0x7FFFFFFF, // max postive integer as hexadecimal + 0x7fffffff, // max positive integer as hexadecimal + 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal 01912, // should be quivalent to octal 1 -020000000000, // max negative integer as octal diff --git a/ext/standard/tests/strings/str_pad.phpt b/ext/standard/tests/strings/str_pad.phpt Binary files differindex 645d8ff385..0c0c2026cd 100644 --- a/ext/standard/tests/strings/str_pad.phpt +++ b/ext/standard/tests/strings/str_pad.phpt diff --git a/ext/standard/tests/strings/str_repeat.phpt b/ext/standard/tests/strings/str_repeat.phpt Binary files differindex 73c193b6d7..795050a9a4 100644 --- a/ext/standard/tests/strings/str_repeat.phpt +++ b/ext/standard/tests/strings/str_repeat.phpt diff --git a/ext/standard/tests/strings/strncasecmp_variation6.phpt b/ext/standard/tests/strings/strncasecmp_variation6.phpt index 765032b773..56276e9554 100644 --- a/ext/standard/tests/strings/strncasecmp_variation6.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation6.phpt @@ -13,11 +13,11 @@ echo "*** Test strncasecmp() function: with binary inputs ***\n"; /* A binary function should work with all 256 characters that a character(8-bit) can take */ echo "\n-- Checking with all 256 characters given, in binary format --\n"; -/* loop through to get all 256 character's equivelent binary value, and check working of strncasecmp() */ +/* loop through to get all 256 character's equivalent binary value, and check working of strncasecmp() */ $count = 1; for($ASCII = 0; $ASCII <= 255; $ASCII++) { $str1 = decbin($ASCII); //ASCII value in binary form - $str2 = decbin( ord( chr($ASCII) ) ); //Getting equivelent ASCII value for the character in binary form + $str2 = decbin( ord( chr($ASCII) ) ); //Getting equivalent ASCII value for the character in binary form echo "-- Iteration $count --\n"; var_dump( strncasecmp($str1, $str2, 8) ); //comparing all the 8-bits; expected: int(0) var_dump( strncasecmp($str1, $str2, 4) ); //comparing only 4-bits; expected: int(0) diff --git a/ext/standard/tests/strings/strncmp_variation6.phpt b/ext/standard/tests/strings/strncmp_variation6.phpt index 7a79d29a51..b3b918920e 100644 --- a/ext/standard/tests/strings/strncmp_variation6.phpt +++ b/ext/standard/tests/strings/strncmp_variation6.phpt @@ -13,11 +13,11 @@ echo "*** Test strncmp() function: with binary inputs ***\n"; echo "\n-- Checking with all 256 characters given, in binary format --\n"; /* A binary function should work with all 256 characters that a character(8-bit) can take */ -/* loop through to get all 256 character's equivelent binary value, and check working of strncmp() */ +/* loop through to get all 256 character's equivalent binary value, and check working of strncmp() */ $count = 1; for($ASCII = 0; $ASCII <= 255; $ASCII++) { $str1 = decbin($ASCII); //ASCII value in binary form - $str2 = decbin( ord( chr($ASCII) ) ); //Getting equivelent ASCII value for the character in binary form + $str2 = decbin( ord( chr($ASCII) ) ); //Getting equivalent ASCII value for the character in binary form echo "-- Iteration $count --\n"; var_dump( strncmp($str1, $str2, 8) ); //comparing all the 8-bits; expected: int(0) var_dump( strncmp($str1, $str2, 4) ); //comparing only 4-bits; expected: int(0) diff --git a/ext/standard/tests/strings/unpack_bug68225.phpt b/ext/standard/tests/strings/unpack_bug68225.phpt new file mode 100644 index 0000000000..7f8cdd4701 --- /dev/null +++ b/ext/standard/tests/strings/unpack_bug68225.phpt @@ -0,0 +1,39 @@ +--TEST-- +Bug #68225 unpack and X format code +--FILE-- +<?php + +$data = pack('VV', 1, 2); + +$result = unpack('Va/X' ,$data); +var_dump($result); + +$result = unpack('Va/X4' ,$data); +var_dump($result); + +$result = unpack('V1a/X4/V1b/V1c/X4/V1d', $data); +var_dump($result); + +?> +===DONE=== +--EXPECTF-- +array(1) { + ["a"]=> + int(1) +} +array(1) { + ["a"]=> + int(1) +} +array(4) { + ["a"]=> + int(1) + ["b"]=> + int(1) + ["c"]=> + int(2) + ["d"]=> + int(2) +} +===DONE=== + |
