6543/CommunityID
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

import v1.1.0_RC2 | 2009-09-20

Browse Source
This commit is contained in:
6543
2019-07-17 22:19:00 +02:00
parent 3b7ba80568
commit 38c146901c
2504 changed files with 101817 additions and 62316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libs/Zend/Locale/Math.php
View File

@ -14,9 +14,9 @@
*
* @category Zend
* @package Zend_Locale
* @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id: Math.php 14041 2009-02-10 21:49:38Z thomas $
* @version $Id: Math.php 16221 2009-06-21 19:49:59Z thomas $
*/
@ -28,7 +28,7 @@
*
* @category Zend
* @package Zend_Locale
* @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@ -67,7 +67,8 @@ class Zend_Locale_Math
if (self::$_bcmathDisabled) {
return self::normalize(round($op1, $precision));
}
$op1 = trim(self::normalize($op1));
$op1 = trim(self::normalize($op1));
$length = strlen($op1);
if (($decPos = strpos($op1, '.')) === false) {
$op1 .= '.0';
@ -77,10 +78,12 @@ class Zend_Locale_Math
if ($precision < 0 && abs($precision) > $decPos) {
return '0';
}
$digitsBeforeDot = $length - ($decPos + 1);
if ($precision >= ($length - ($decPos + 1))) {
return $op1;
}
if ($precision === 0) {
$triggerPos = 1;
$roundPos = -1;
@ -91,22 +94,31 @@ class Zend_Locale_Math
$triggerPos = $precision;
$roundPos = $precision -1;
}
$triggerDigit = $op1[$triggerPos + $decPos];
if ($precision < 0) {
// zero fill digits to the left of the decimal place
$op1 = substr($op1, 0, $decPos + $precision) . str_pad('', abs($precision), '0');
}
if ($triggerDigit >= '5') {
if ($roundPos + $decPos == -1) {
return str_pad('1', $decPos + 1, '0');
}
$roundUp = str_pad('', $length, '0');
$roundUp[$decPos] = '.';
$roundUp[$roundPos + $decPos] = '1';
return bcadd($op1, $roundUp, $precision);
if ($op1 > 0) {
return self::Add($op1, $roundUp, $precision);
} else {
return self::Sub($op1, $roundUp, $precision);
}
} elseif ($precision >= 0) {
return substr($op1, 0, $decPos + ($precision ? $precision + 1: 0));
}
return (string) $op1;
}
@ -186,6 +198,7 @@ class Zend_Locale_Math
{
$op1 = self::exponent($op1, $scale);
$op2 = self::exponent($op2, $scale);
return bcadd($op1, $op2, $scale);
}