php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-15 22:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'patch-1' of https://github.com/necrox87/yii2 into necrox87-patch-1

Browse Source
This commit is contained in:
SilverFire - Dmitry Naumenko
2016-01-19 00:33:41 +02:00
parent 65cee6a2cf 5747557794
commit 56a035ef6c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/i18n/Formatter.php
View File

@@ -1123,7 +1123,7 @@ class Formatter extends Component
* If [[sizeFormatBase]] is 1024, [binary prefixes](http://en.wikipedia.org/wiki/Binary_prefix) (e.g. kibibyte/KiB, mebibyte/MiB, ...) * If [[sizeFormatBase]] is 1024, [binary prefixes](http://en.wikipedia.org/wiki/Binary_prefix) (e.g. kibibyte/KiB, mebibyte/MiB, ...)
* are used in the formatting result. * are used in the formatting result.
* *
* @param integer $value value in bytes to be formatted. * @param string|integer|float $value value in bytes to be formatted.
* @param integer $decimals the number of digits after the decimal point. * @param integer $decimals the number of digits after the decimal point.
* @param array $options optional configuration for the number formatter. This parameter will be merged with [[numberFormatterOptions]]. * @param array $options optional configuration for the number formatter. This parameter will be merged with [[numberFormatterOptions]].
* @param array $textOptions optional configuration for the number formatter. This parameter will be merged with [[numberFormatterTextOptions]]. * @param array $textOptions optional configuration for the number formatter. This parameter will be merged with [[numberFormatterTextOptions]].
@@ -1167,7 +1167,7 @@ class Formatter extends Component
* If [[sizeFormatBase]] is 1024, [binary prefixes](http://en.wikipedia.org/wiki/Binary_prefix) (e.g. kibibyte/KiB, mebibyte/MiB, ...) * If [[sizeFormatBase]] is 1024, [binary prefixes](http://en.wikipedia.org/wiki/Binary_prefix) (e.g. kibibyte/KiB, mebibyte/MiB, ...)
* are used in the formatting result. * are used in the formatting result.
* *
* @param integer $value value in bytes to be formatted. * @param string|integer|float $value value in bytes to be formatted.
* @param integer $decimals the number of digits after the decimal point. * @param integer $decimals the number of digits after the decimal point.
* @param array $options optional configuration for the number formatter. This parameter will be merged with [[numberFormatterOptions]]. * @param array $options optional configuration for the number formatter. This parameter will be merged with [[numberFormatterOptions]].
* @param array $textOptions optional configuration for the number formatter. This parameter will be merged with [[numberFormatterTextOptions]]. * @param array $textOptions optional configuration for the number formatter. This parameter will be merged with [[numberFormatterTextOptions]].
@@ -1219,7 +1219,7 @@ class Formatter extends Component
private function formatSizeNumber($value, $decimals, $options, $textOptions) private function formatSizeNumber($value, $decimals, $options, $textOptions)
{ {
if (is_string($value) && is_numeric($value)) { if (is_string($value) && is_numeric($value)) {
$value = (int) $value; $value = (float) $value;
} }
if (!is_numeric($value)) { if (!is_numeric($value)) {
throw new InvalidParamException("'$value' is not a numeric value."); throw new InvalidParamException("'$value' is not a numeric value.");