Add ParserState::EOL and support it in consumeUntil

Author: raxbg

lib/Sabberworm/CSS/CSSList/CSSList.php

@@ -111,24 +111,11 @@ private static function parseAtRule(ParserState $oParserState) {
 			$oLocation = URL::parse($oParserState);
 			$oParserState->consumeWhiteSpace();
 			$sMediaQuery = null;
-			try {
-				if (!$oParserState->comes(';')) {
-					$sMediaQuery = $oParserState->consumeUntil(';');
-				}
+			if (!$oParserState->comes(';')) {
+				$sMediaQuery = $oParserState->consumeUntil(array(';', ParserState::EOF));
+			}
+			if (!$oParserState->isEnd()) {
 				$oParserState->consume(';');
-			} catch (UnexpectedEOFException $e) {
-				// Save the media query if present
-				$sMediaQuery = '';
-				try {
-					while (!$oParserState->isEnd()) {
-						$sMediaQuery .= $oParserState->consume(1);
-					}
-				} catch (UnexpectedEOFException $e) {}
-
-				$sMediaQuery = trim($sMediaQuery);
-				if ($sMediaQuery === '') {
-					$sMediaQuery = null;
-				}
 			}
 			return new Import($oLocation, $sMediaQuery, $iIdentifierLineNum);
 		} else if ($sIdentifier === 'charset') {

lib/Sabberworm/CSS/Parsing/ParserState.php

@@ -7,6 +7,8 @@
 use Sabberworm\CSS\Settings;
 
 class ParserState {
+	const EOF = null;
+
 	private $oParserSettings;
 
 	private $sText;
@@ -230,9 +232,13 @@ public function consumeUntil($aEnd, $bIncludeEnd = false, $consumeEnd = false, a
 				}
 			}
 		} catch (UnexpectedEOFException $e) {
-			// Reset the position and forward the EOF exception, so the caller can distinguish between EOF and the standard unexpected token error
-			$this->iCurrentPosition = $start;
-			throw $e;
+			if (in_array(self::EOF, $aEnd)) {
+				return $out;
+			} else {
+				// Reset the position and forward the EOF exception, so the caller can distinguish between EOF and the standard unexpected token error
+				$this->iCurrentPosition = $start;
+				throw $e;
+			}
 		}
 
 		$this->iCurrentPosition = $start;