Refactor size unit parsing logic

Author: pierlon

lib/Sabberworm/CSS/Value/Size.php

@@ -38,26 +38,21 @@ public static function parse(ParserState $oParserState, $bIsColorComponent = fal
 		}
 
 		$sUnit = null;
-		$sParsedUnit = null;
 		$aSizeUnits = self::getSizeUnits();
-
 		$iMaxSizeUnitLength = max(array_keys($aSizeUnits));
+
 		if ( preg_match( '/^[a-zA-Z0-9%]+/', $oParserState->peek($iMaxSizeUnitLength), $matches ) ) {
-			$sParsedUnit = $matches[0];
-		}
+			$sUnit = strtolower($matches[0]);
+			$iUnitLength = strlen($sUnit);
 
-		foreach($aSizeUnits as $iLength => $aValues) {
-			$sKey = strtolower($oParserState->peek($iLength));
-			if(array_key_exists($sKey, $aValues)) {
-				if (strtolower($sParsedUnit) !== $sKey) {
-					throw new UnexpectedTokenException('Unit', $sParsedUnit, 'identifier', $oParserState->currentLine());
-				}
-				if (($sUnit = $aValues[$sKey]) !== null) {
-					$oParserState->consume($iLength);
-					break;
-				}
+			if (isset($aSizeUnits[$iUnitLength][$sUnit])) {
+				$sUnit = $aSizeUnits[$iUnitLength][$sUnit];
+				$oParserState->consume($iUnitLength);
+			} else {
+				throw new UnexpectedTokenException('Unit', $sUnit, 'identifier', $oParserState->currentLine());
 			}
 		}
+
 		return new Size(floatval($sSize), $sUnit, $bIsColorComponent, $oParserState->currentLine());
 	}