diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-06-11 16:02:11 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-06-11 16:02:11 -0400 |
| commit | 300b420e01b7fc800122d9d12c10679d077e2f8a (patch) | |
| tree | 0eb2158c64ce42365c9e5a4b9f0826c408553458 /phpBB/includes/functions.php | |
| parent | 4af503e11bc2c42654cf783f031bdb074fdd91ed (diff) | |
| parent | 4468847107103c44936468e6e3c1badeb333ff52 (diff) | |
| download | forums-300b420e01b7fc800122d9d12c10679d077e2f8a.tar forums-300b420e01b7fc800122d9d12c10679d077e2f8a.tar.gz forums-300b420e01b7fc800122d9d12c10679d077e2f8a.tar.bz2 forums-300b420e01b7fc800122d9d12c10679d077e2f8a.tar.xz forums-300b420e01b7fc800122d9d12c10679d077e2f8a.zip | |
Merge PR #834 branch 'bantu/ticket/10931' into develop
* bantu/ticket/10931:
[ticket/10931] Apply strtolower() correctly, i.e. not on false.
[ticket/10931] Also test get_bytes() and get_string() with false.
[ticket/10931] Make to_numeric function globally available.
[ticket/10931] Make sure get_bytes() always returns either an int or a float.
[ticket/10931] Correctly handle inputs such as '-k' as invalid in get_bytes().
[ticket/10931] Use strict assertSame() instead of assertEquals().
[ticket/10931] Also test for negative values.
[ticket/10931] Also test lower case units in test_get_bytes().
[ticket/10931] Correctly use GNU GPL version 2.
[ticket/10931] Make it clear that we are mocking the ini_get() function.
[ticket/10931] Document that false is also returned if value is not well formed
[ticket/10931] Correct method description of get_string().
[ticket/10931] Let us try ini_get() without error suppression.
[ticket/10931] Unit tests for phpbb_php_ini class.
[ticket/10931] Add wrapper class for ini_get function.
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 95f2cf8d26..ad64471388 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4987,3 +4987,16 @@ function phpbb_pcre_utf8_support() } return $utf8_pcre_properties; } + +/** +* Casts a numeric string $input to an appropriate numeric type (i.e. integer or float) +* +* @param string $input A numeric string. +* +* @return int|float Integer $input if $input fits integer, +* float $input otherwise. +*/ +function phpbb_to_numeric($input) +{ + return ($input > PHP_INT_MAX) ? (float) $input : (int) $input; +} |