Revert truncation of unit

Author: pierlon

lib/Sabberworm/CSS/Value/Size.php

@@ -37,39 +37,35 @@ public static function parse(ParserState $oParserState, $bIsColorComponent = fal
 			}
 		}
 
-        $sParsedUnit = '';
-        $iOffset = 0;
+		$sParsedUnit = '';
+		$iOffset = 0;
 		while (true) {
-		    $sChar = $oParserState->peek(1, $iOffset);
-            $iPeek = ord($sChar);
-
-            // Ranges: a-z A-Z 0-9 %
-            if (($iPeek >= 97 && $iPeek <= 122) ||
-                ($iPeek >= 65 && $iPeek <= 90) ||
-                ($iPeek >= 48 && $iPeek <= 57) ||
-                ($iPeek === 37)) {
-                $sParsedUnit .= $sChar;
-                $iOffset++;
-            } else {
-                break;
-            }
-        }
-
-        $sUnit = null;
-        $aSizeUnits = self::getSizeUnits();
+			$sChar = $oParserState->peek(1, $iOffset);
+			$iPeek = ord($sChar);
+
+			// Ranges: a-z A-Z 0-9 %
+			if (($iPeek >= 97 && $iPeek <= 122) ||
+				($iPeek >= 65 && $iPeek <= 90) ||
+				($iPeek >= 48 && $iPeek <= 57) ||
+				($iPeek === 37)) {
+				$sParsedUnit .= $sChar;
+				$iOffset++;
+			} else {
+				break;
+			}
+		}
+
+		$sUnit = null;
+		$aSizeUnits = self::getSizeUnits();
 
 		foreach($aSizeUnits as $iLength => $aValues) {
-		    $iConsumeLength = $iLength;
 			$sKey = strtolower($oParserState->peek($iLength));
 			if(array_key_exists($sKey, $aValues)) {
-			    if (strtolower($sParsedUnit) !== $sKey) {
-                    if (!$oParserState->getSettings()->bLenientParsing) {
-                        throw new UnexpectedTokenException('Unit', $sParsedUnit, 'identifier', $oParserState->currentLine());
-                    }
-                    $iConsumeLength = strlen($sParsedUnit);
-                }
+				if (strtolower($sParsedUnit) !== $sKey) {
+					throw new UnexpectedTokenException('Unit', $sParsedUnit, 'identifier', $oParserState->currentLine());
+				}
 				if (($sUnit = $aValues[$sKey]) !== null) {
-					$oParserState->consume($iConsumeLength);
+					$oParserState->consume($iLength);
 					break;
 				}
 			}

tests/Sabberworm/CSS/ParserTest.php

@@ -767,21 +767,21 @@ function testLonelyImport() {
 		$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);}";
+	function testTurnUnitLenient() {
+		$sText = ".foo {transform: rotate(1turn);}\n.bar {transform: rotate(1turns);}";
+		$sExpected = ".foo {transform: rotate(1turn);}\n.bar {}";
 
-        $oParser = new Parser($sText);
-        $this->assertSame($sExpected, $oParser->parse()->render());
-    }
+		$oParser = new Parser($sText);
+		$this->assertSame($sExpected, $oParser->parse()->render());
+	}
 
-    function testTurnUnitStrict() {
-        $sText = ".foo {transform: rotate(1turn);}\n.bar {transform: rotate(1turns);}";
+	function testTurnUnitStrict() {
+		$sText = ".foo {transform: rotate(1turn);}\n.bar {transform: rotate(1turns);}";
 
-        $oParser = new Parser($sText, Settings::create()->beStrict());
+		$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();
-    }
+		// 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();
+	}
 }