Merge 9898953 into 3a9f378

wmde · Oct 29, 2018 · 7e383e1 · 7e383e1
2 parents 3a9f378 + 9898953
commit 7e383e1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/DataValues/DecimalMath.php b/src/DataValues/DecimalMath.php
@@ -60,6 +60,10 @@ public function getUseBC() {
 	public function product( DecimalValue $a, DecimalValue $b ) {
 		if ( $this->useBC ) {
 			$scale = strlen( $a->getFractionalPart() ) + strlen( $b->getFractionalPart() );
+			// Decimal values must not be longer than 127 chars
+			$maxScale = 127 - ( strlen( $a->getIntegerPart() ) + strlen( $b->getIntegerPart() ) + 4 );
+
+			$scale = min( $scale, $maxScale );
 			$product = bcmul( $a->getValue(), $b->getValue(), $scale );
 		} else {
 			$product = $a->getValueFloat() * $b->getValueFloat();

diff --git a/tests/DataValues/DecimalMathTest.php b/tests/DataValues/DecimalMathTest.php
@@ -88,7 +88,8 @@ public function slumpProvider() {
 	 * @dataProvider productProvider
 	 */
 	public function testProduct( DecimalValue $a, DecimalValue $b, $value ) {
-		$math = new DecimalMath();
+		// FIXME: This should set $useBC to false (bcmath is tested below)
+		$math = new DecimalMath( /* $useBC */ true );
 
 		$actual = $math->product( $a, $b );
 		$this->assertSame( $value, $actual->getValue() );
@@ -134,6 +135,12 @@ public function productWithBCProvider() {
 		return [
 			[ new DecimalValue( '+0.1' ), new DecimalValue( '+0.1' ), '+0.01' ],
 			[ new DecimalValue( '-5000000' ), new DecimalValue( '-0.1' ), '+500000.0' ],
+
+			[
+				new DecimalValue( '+0.' . str_repeat( '3', 124 ) ),
+				new DecimalValue( '+0.' . str_repeat( '6', 124 ) ),
+				'+0.' . str_repeat( '2', 127 - 6 )
+			],
 		];
 	}