com php-src: moved function warning test to money_format_er ror.phpt file: ext/standard/tests/strings/money_forma t_error.phpt
ext/standard/tests/strings/moneyformat.php t

Commit: 098a4cc3ebfd8142643b3fa0b7ed6787cbd23c61 Author: Edgar R. Sandi <edgar.r.sandi@gmail.com> Thu, 25 Jun 2015 20:19:44 -0300 Parents: 0955f9513f4a0491f6a0d24a3c396095fe2e84bc Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=098a4cc3ebfd8142643b3fa0b7ed6787cbd23c61 Log: moved function warning test to money_format_error.phpt file Changed paths: M ext/standard/tests/strings/money_format_error.phpt M ext/standard/tests/strings/moneyformat.phpt Diff: diff --git a/ext/standard/tests/strings/money_format_error.phpt b/ext/standard/tests/strings/money_format_error.phpt index cf110b4..454b593 100644 --- a/ext/standard/tests/strings/money_format_error.phpt +++ b/ext/standard/tests/strings/money_format_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test money_format() function : error conditions +Test money_format() function : error conditions --SKIPIF-- <?php if (!function_exists('money_format')) { @@ -30,9 +30,10 @@ echo "\n-- Testing money_format() function with insufficient arguments --\n"; var_dump( money_format($string) ); echo "\n-- Testing money_format() function with more than expected no. of arguments --\n"; - var_dump( money_format($string, $value, $extra_arg) ); +echo "\n-- Testing money_format() function with more than one token --\n"; +var_dump( money_format($string . $string, $value) ); ?> ===DONE=== --EXPECTF-- @@ -52,4 +53,9 @@ NULL Warning: money_format() expects exactly 2 parameters, 3 given in %s on line %d NULL -===DONE=== \ No newline at end of file + +-- Testing money_format() function with more than one token -- + +Warning: money_format(): Only a single %ci or %cn token can be used in %s on line %d +bool(false) +===DONE=== diff --git a/ext/standard/tests/strings/moneyformat.phpt b/ext/standard/tests/strings/moneyformat.phpt index db6c48c..3924577 100644 --- a/ext/standard/tests/strings/moneyformat.phpt +++ b/ext/standard/tests/strings/moneyformat.phpt @@ -14,10 +14,6 @@ if (setlocale(LC_MONETARY, 'en_US') === false) { <?php setlocale(LC_MONETARY, 'en_US'); var_dump( money_format("X%nY", 3.1415)); -var_dump(money_format("AAAAA%n%n%n%n", NULL)); ?> --EXPECTF-- string(7) "X$3.14Y" - -Warning: money_format(): Only a single %ci or %cn token can be used in %s on line %d -bool(false)