Merge pull request #23 from DataValues/unitOption1

Allow non-conflicting unit option
wmde · Mar 6, 2015 · 2af1de9 · 2af1de9
2 parents ca5ee56 + e3e8a98
commit 2af1de9
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 14 deletions.
diff --git a/src/ValueParsers/QuantityParser.php b/src/ValueParsers/QuantityParser.php
@@ -67,12 +67,8 @@ protected function stringParse( $value ) {
 		$unitOption = $this->getOption( self::OPT_UNIT );
 
 		if ( $unit === null ) {
-			if ( $unitOption !== null ) {
-				$unit = $unitOption;
-			} else {
-				$unit = '1';
-			}
-		} elseif ( $unitOption !== null ) {
+			$unit = $unitOption !== null ? $unitOption : '1';
+		} elseif ( $unitOption !== null && $unit !== $unitOption ) {
 			throw new ParseException( 'Cannot specify a unit in input if a unit was fixed via options.' );
 		}
 
@@ -115,7 +111,6 @@ private function newQuantityFromParts( $amount, $exactness, $margin, $unit ) {
 		}
 
 		return $quantity;
-
 	}
 
 	/**

diff --git a/tests/ValueParsers/QuantityParserTest.php b/tests/ValueParsers/QuantityParserTest.php
@@ -196,24 +196,46 @@ function( $number ) use ( $charmap ) {
 		$this->assertEquals( 'a~b', $quantity->getUnit() );
 	}
 
-	public function testUnitOption() {
+	/**
+	 * @dataProvider unitOptionProvider
+	 */
+	public function testUnitOption( $value, $unit ) {
 		$options = new ParserOptions();
-		$options->setOption( QuantityParser::OPT_UNIT, 'kittens' );
+		$options->setOption( QuantityParser::OPT_UNIT, $unit );
 
 		$parser = new QuantityParser( $options );
 
-		$quantity = $parser->parse( '17' );
-		$this->assertEquals( 'kittens', $quantity->getUnit() );
+		$quantity = $parser->parse( $value );
+		$this->assertEquals( $unit, $quantity->getUnit() );
+	}
+
+	public function unitOptionProvider() {
+		return array(
+			array( '17', 'kittens' ),
+			array( '17 kittens', 'kittens' ),
+			array( '17m', 'm' ),
+		);
 	}
 
-	public function testUnitOption_conflict() {
+	/**
+	 * @dataProvider conflictingUnitOptionProvider
+	 */
+	public function testConflictingUnitOption( $value, $unit ) {
 		$options = new ParserOptions();
-		$options->setOption( QuantityParser::OPT_UNIT, 'kittens' );
+		$options->setOption( QuantityParser::OPT_UNIT, $unit );
 
 		$parser = new QuantityParser( $options );
 
 		$this->setExpectedException( 'ValueParsers\ParseException' );
-		$parser->parse( '17m' );
+		$parser->parse( $value );
+	}
+
+	public function conflictingUnitOptionProvider() {
+		return array(
+			array( '17 kittens', 'm' ),
+			array( '17m', 'kittens' ),
+			array( '17m', '' ),
+		);
 	}
 
 }