Merge pull request #67 from smalyshev/master

Make public function to convert numeric string or value to DecimalValue.
wmde · Jul 9, 2016 · 37c7f49 · 37c7f49
2 parents 49a5fba + 2d8bb74
commit 37c7f49
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 22 deletions.
diff --git a/src/DataValues/DecimalMath.php b/src/DataValues/DecimalMath.php
@@ -42,22 +42,6 @@ public function __construct( $useBC = null ) {
 		$this->useBC = $useBC;
 	}
 
-	/**
-	 * @param int|float|string $number
-	 *
-	 * @return DecimalValue
-	 */
-	private function makeDecimalValue( $number ) {
-
-		if ( is_string( $number ) && $number !== '' ) {
-			if ( $number[0] !== '-' && $number[0] !== '+' ) {
-				$number = '+' . $number;
-			}
-		}
-
-		return new DecimalValue( $number );
-	}
-
 	/**
 	 * Whether this is using the bcmath library.
 	 *
@@ -83,7 +67,7 @@ public function product( DecimalValue $a, DecimalValue $b ) {
 			$product = $a->getValueFloat() * $b->getValueFloat();
 		}
 
-		return $this->makeDecimalValue( $product );
+		return new DecimalValue( $product );
 	}
 
 	/**
@@ -102,7 +86,7 @@ public function sum( DecimalValue $a, DecimalValue $b ) {
 			$sum = $a->getValueFloat() + $b->getValueFloat();
 		}
 
-		return $this->makeDecimalValue( $sum );
+		return new DecimalValue( $sum );
 	}
 
 	/**
@@ -121,7 +105,7 @@ public function min( DecimalValue $a, DecimalValue $b ) {
 			$min = $comp > 0 ? $b : $a;
 		} else {
 			$min = min( $a->getValueFloat(), $b->getValueFloat() );
-			$min = $this->makeDecimalValue( $min );
+			$min = new DecimalValue( $min );
 		}
 
 		return $min;
@@ -143,7 +127,7 @@ public function max( DecimalValue $a, DecimalValue $b ) {
 			$max = $comp > 0 ? $a : $b;
 		} else {
 			$max = max( $a->getValueFloat(), $b->getValueFloat() );
-			$max = $this->makeDecimalValue( $max );
+			$max = new DecimalValue( $max );
 		}
 
 		return $max;

diff --git a/src/DataValues/DecimalValue.php b/src/DataValues/DecimalValue.php
@@ -58,7 +58,9 @@ public function __construct( $value ) {
 		}
 
 		$value = trim( $value );
-
+		if ( $value !== '' && $value[0] !== '-' && $value[0] !== '+' ) {
+			$value = '+' . $value;
+		}
 		if ( strlen( $value ) > 127 ) {
 			throw new IllegalValueException( 'Value must be at most 127 characters long.' );
 		}

diff --git a/tests/DataValues/DecimalValueTest.php b/tests/DataValues/DecimalValueTest.php
@@ -42,6 +42,8 @@ public function validConstructorArgumentsProvider() {
 		$argLists[] = array( '+0.0' );
 		$argLists[] = array( '+0.000' );
 		$argLists[] = array( '+1.0' . str_repeat( ' ', 124 ) );
+		$argLists[] = array( '4.2' );
+		$argLists[] = array( ' 4.2' );
 
 		return $argLists;
 	}
@@ -51,7 +53,6 @@ public function invalidConstructorArgumentsProvider() {
 
 		$argLists[] = array( 'foo' );
 		$argLists[] = array( '' );
-		$argLists[] = array( '4.2' );
 		$argLists[] = array( '++4.2' );
 		$argLists[] = array( '--4.2' );
 		$argLists[] = array( '-+4.2' );