Output correct size unit in lenient mode; fail if unit not valid

Author: pierlon

lib/Sabberworm/CSS/Value/Size.php

@@ -3,6 +3,7 @@
 namespace Sabberworm\CSS\Value;
 
 use Sabberworm\CSS\Parsing\ParserState;
+use Sabberworm\CSS\Parsing\UnexpectedTokenException;
 
 class Size extends PrimitiveValue {
 
@@ -38,11 +39,21 @@ public static function parse(ParserState $oParserState, $bIsColorComponent = fal
 
 		$sUnit = null;
 		$aSizeUnits = self::getSizeUnits();
-		foreach($aSizeUnits as $iLength => &$aValues) {
+		$sUnit = strtolower($oParserState->parseIdentifier());
+		$oParserState->backtrack(strlen($sUnit));
+
+		foreach($aSizeUnits as $iLength => $aValues) {
+		    $iConsumeLength = $iLength;
 			$sKey = strtolower($oParserState->peek($iLength));
 			if(array_key_exists($sKey, $aValues)) {
+			    if ($sUnit !== $sKey) {
+                    if (!$oParserState->getSettings()->bLenientParsing) {
+                        throw new UnexpectedTokenException('Unit', $sUnit, 'identifier', $oParserState->currentLine());
+                    }
+                    $iConsumeLength = strlen($sUnit);
+                }
 				if (($sUnit = $aValues[$sKey]) !== null) {
-					$oParserState->consume($iLength);
+					$oParserState->consume($iConsumeLength);
 					break;
 				}
 			}

tests/Sabberworm/CSS/ParserTest.php

@@ -787,4 +787,22 @@ function testLonelyImport() {
 		$sExpected = "@import url(\"example.css\") only screen and (max-width: 600px);";
 		$this->assertSame($sExpected, $oDoc->render());
 	}
+
+    function testTurnUnitLenient() {
+        $sText = ".foo {transform: rotate(1turn);}\n.bar {transform: rotate(1turns);}";
+        $sExpected = ".foo {transform: rotate(1turn);}\n.bar {transform: rotate(1turn);}";
+
+        $oParser = new Parser($sText);
+        $this->assertSame($sExpected, $oParser->parse()->render());
+    }
+
+    function testTurnUnitStrict() {
+        $sText = ".foo {transform: rotate(1turn);}\n.bar {transform: rotate(1turns);}";
+
+        $oParser = new Parser($sText, Settings::create()->beStrict());
+
+        // Line 2 contains the invalid unit and so should be reported.
+        $this->setExpectedException( 'Sabberworm\CSS\Parsing\UnexpectedTokenException', 'Identifier expected. Got “turns” [line no: 2]' );
+        $oParser->parse();
+    }
 }