Update closing bracket parsing in a way which allows us to better match the browsers' parsing behavior

Author: raxbg

lib/Sabberworm/CSS/CSSList/CSSList.php

@@ -83,10 +83,8 @@ private static function parseListItem(ParserState $oParserState, CSSList $oList)
 			}
 			return $oAtRule;
 		} else if ($oParserState->comes('}')) {
-			$oParserState->consume('}');
 			if ($bIsRoot) {
 				if ($oParserState->getSettings()->bLenientParsing) {
-					while ($oParserState->comes('}')) $oParserState->consume('}');
 					return DeclarationBlock::parse($oParserState);
 				} else {
 					throw new SourceException("Unopened {", $oParserState->currentLine());
@@ -123,6 +121,9 @@ private static function parseAtRule(ParserState $oParserState) {
 			$oResult->setVendorKeyFrame($sIdentifier);
 			$oResult->setAnimationName(trim($oParserState->consumeUntil('{', false, true)));
 			CSSList::parseList($oParserState, $oResult);
+			if ($oParserState->comes('}')) {
+				$oParserState->consume('}');
+			}
 			return $oResult;
 		} else if ($sIdentifier === 'namespace') {
 			$sPrefix = null;
@@ -162,6 +163,9 @@ private static function parseAtRule(ParserState $oParserState) {
 			} else {
 				$oAtRule = new AtRuleBlockList($sIdentifier, $sArgs, $iIdentifierLineNum);
 				CSSList::parseList($oParserState, $oAtRule);
+				if ($oParserState->comes('}')) {
+					$oParserState->consume('}');
+				}
 			}
 			return $oAtRule;
 		}

tests/Sabberworm/CSS/ParserTest.php

@@ -501,7 +501,7 @@ function testCharsetFailure2() {
 	 * @expectedException \Sabberworm\CSS\Parsing\SourceException
 	 */
 	function testUnopenedClosingBracketFailure() {
-		$this->parsedStructureForFile('unopened-close-brackets', Settings::create()->withLenientParsing(false));
+		$this->parsedStructureForFile('-unopened-close-brackets', Settings::create()->withLenientParsing(false));
 	}
 
 	/**