Improved selector parsing + better handling for '}'

Author: raxbg

lib/Sabberworm/CSS/CSSList/CSSList.php

@@ -83,14 +83,18 @@ private static function parseListItem(ParserState $oParserState, CSSList $oList)
 			}
 			return $oAtRule;
 		} else if ($oParserState->comes('}')) {
-			if ($bIsRoot) {
-				if ($oParserState->getSettings()->bLenientParsing) {
-					return DeclarationBlock::parse($oParserState);
+			if (!$oParserState->getSettings()->bLenientParsing) {
+				throw new UnexpectedTokenException('CSS selector', '}', 'identifier', $oParserState->currentLine());
+			} else {
+				if ($bIsRoot) {
+					if ($oParserState->getSettings()->bLenientParsing) {
+						return DeclarationBlock::parse($oParserState);
+					} else {
+						throw new SourceException("Unopened {", $oParserState->currentLine());
+					}
 				} else {
-					throw new SourceException("Unopened {", $oParserState->currentLine());
+					return null;
 				}
-			} else {
-				return null;
 			}
 		} else {
 			return DeclarationBlock::parse($oParserState);

lib/Sabberworm/CSS/RuleSet/DeclarationBlock.php

@@ -30,10 +30,15 @@ public static function parse(ParserState $oParserState) {
 		$aComments = array();
 		$oResult = new DeclarationBlock($oParserState->currentLine());
 		try {
-			$oResult->setSelector($oParserState->consumeUntil('{', false, true, $aComments));
+			$oResult->setSelector($oParserState->consume(1) . $oParserState->consumeUntil(array('{', '}'), false, false, $aComments));
+			if ($oParserState->comes('{')) {
+				$oParserState->consume(1);
+			}
 		} catch (UnexpectedTokenException $e) {
 			if($oParserState->getSettings()->bLenientParsing) {
-				$oParserState->consumeUntil('}', false, true);
+				if(!$oParserState->comes('}')) {
+					$oParserState->consumeUntil('}', false, true);
+				}
 				return false;
 			} else {
 				throw $e;