archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Allow number_format to be only passed 3 arguments

Browse source 
Closes GH-5977
This commit is contained in:
George Peter Banyard 2020-08-12 19:26:54 +02:00
parent 7be61bec80
commit 9cb522166c
3 changed files with 35 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

33
ext/standard/math.c
View file

@ -1097,7 +1097,6 @@ PHP_FUNCTION(number_format)
double num;
zend_long dec = 0;
char *thousand_sep = NULL, *dec_point = NULL;
char thousand_sep_chr = ',', dec_point_chr = '.';
size_t thousand_sep_len = 0, dec_point_len = 0;
ZEND_PARSE_PARAMETERS_START(1, 4)
@ -1108,30 +1107,16 @@ PHP_FUNCTION(number_format)
Z_PARAM_STRING_OR_NULL(thousand_sep, thousand_sep_len)
ZEND_PARSE_PARAMETERS_END();
switch(ZEND_NUM_ARGS()) {
case 1:
RETURN_STR(_php_math_number_format(num, 0, dec_point_chr, thousand_sep_chr));
break;
case 2:
RETURN_STR(_php_math_number_format(num, (int)dec, dec_point_chr, thousand_sep_chr));
break;
case 4:
if (dec_point == NULL) {
dec_point = &dec_point_chr;
dec_point_len = 1;
}
if (thousand_sep == NULL) {
thousand_sep = &thousand_sep_chr;
thousand_sep_len = 1;
}
RETVAL_STR(_php_math_number_format_ex(num, (int)dec,
dec_point, dec_point_len, thousand_sep, thousand_sep_len));
break;
default:
WRONG_PARAM_COUNT;
if (dec_point == NULL) {
dec_point = ".";
dec_point_len = 1;
}
if (thousand_sep == NULL) {
thousand_sep = ",";
thousand_sep_len = 1;
}
RETURN_STR(_php_math_number_format_ex(num, (int)dec, dec_point, dec_point_len, thousand_sep, thousand_sep_len));
}
/* }}} */

12
ext/standard/tests/math/number_format_with_3_args.phpt Normal file
View file

@ -0,0 +1,12 @@
--TEST--
number_format should use default thousands seperator when 3 arguments are used
--FILE--
<?php
$number = 2020.1415;
var_dump(number_format($number, 2, 'F'));
?>
--EXPECT--
string(8) "2,020F14"

14
ext/standard/tests/math/number_format_with_null_args.phpt Normal file
View file

@ -0,0 +1,14 @@
--TEST--
number_format should use default values when passed null
--FILE--
<?php
$number = 2020.1415;
var_dump(number_format($number, 2, null, 'T'));
var_dump(number_format($number, 2, 'F', null));
?>
--EXPECT--
string(8) "2T020.14"
string(8) "2,020F14"