Improve EOF handling + handle lonely import statements

Author: raxbg

lib/Sabberworm/CSS/CSSList/CSSList.php

@@ -6,6 +6,7 @@
 use Sabberworm\CSS\Parsing\ParserState;
 use Sabberworm\CSS\Parsing\SourceException;
 use Sabberworm\CSS\Parsing\UnexpectedTokenException;
+use Sabberworm\CSS\Parsing\UnexpectedEOFException;
 use Sabberworm\CSS\Property\AtRule;
 use Sabberworm\CSS\Property\Charset;
 use Sabberworm\CSS\Property\CSSNamespace;
@@ -110,15 +111,34 @@ private static function parseAtRule(ParserState $oParserState) {
 			$oLocation = URL::parse($oParserState);
 			$oParserState->consumeWhiteSpace();
 			$sMediaQuery = null;
-			if (!$oParserState->comes(';')) {
-				$sMediaQuery = $oParserState->consumeUntil(';');
+			try {
+				if (!$oParserState->comes(';')) {
+					$sMediaQuery = $oParserState->consumeUntil(';');
+				}
+				$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;
+				}
 			}
-			$oParserState->consume(';');
 			return new Import($oLocation, $sMediaQuery, $iIdentifierLineNum);
 		} else if ($sIdentifier === 'charset') {
 			$sCharset = CSSString::parse($oParserState);
-			$oParserState->consumeWhiteSpace();
-			$oParserState->consume(';');
+			try {
+				$oParserState->consumeWhiteSpace();
+				$oParserState->consume(';');
+			} catch (UnexpectedEOFException $e) {
+				// Nothing fatal, file ended before ; was found
+			}
 			return new Charset($sCharset, $iIdentifierLineNum);
 		} else if (self::identifierIs($sIdentifier, 'keyframes')) {
 			$oResult = new KeyFrame($iIdentifierLineNum);
@@ -136,7 +156,11 @@ private static function parseAtRule(ParserState $oParserState) {
 				$sPrefix = $mUrl;
 				$mUrl = Value::parsePrimitiveValue($oParserState);
 			}
-			$oParserState->consume(';');
+			try {
+				$oParserState->consume(';');
+			} catch (UnexpectedEOFException $e) {
+				// Nothing fatal, file ended before ; was found
+			}
 			if ($sPrefix !== null && !is_string($sPrefix)) {
 				throw new UnexpectedTokenException('Wrong namespace prefix', $sPrefix, 'custom', $iIdentifierLineNum);
 			}

lib/Sabberworm/CSS/Parsing/ParserState.php

@@ -3,6 +3,7 @@
 
 use Sabberworm\CSS\Comment\Comment;
 use Sabberworm\CSS\Parsing\UnexpectedTokenException;
+use Sabberworm\CSS\Parsing\UnexpectedEOFException;
 use Sabberworm\CSS\Settings;
 
 class ParserState {
@@ -158,7 +159,7 @@ public function consume($mValue = 1) {
 			return $mValue;
 		} else {
 			if ($this->iCurrentPosition + $mValue > $this->iLength) {
-				throw new UnexpectedTokenException($mValue, $this->peek(5), 'count', $this->iLineNo);
+				throw new UnexpectedEOFException($mValue, $this->peek(5), 'count', $this->iLineNo);
 			}
 			$sResult = $this->substr($this->iCurrentPosition, $mValue);
 			$iLineCount = substr_count($sResult, "\n");
@@ -212,19 +213,25 @@ public function consumeUntil($aEnd, $bIncludeEnd = false, $consumeEnd = false, a
 		$out = '';
 		$start = $this->iCurrentPosition;
 
-		while (($char = $this->consume(1)) !== '') {
-			if (in_array($char, $aEnd)) {
-				if ($bIncludeEnd) {
-					$out .= $char;
-				} elseif (!$consumeEnd) {
-					$this->iCurrentPosition -= $this->strlen($char);
+		try {
+			while (($char = $this->consume(1)) !== '') {
+				if (in_array($char, $aEnd)) {
+					if ($bIncludeEnd) {
+						$out .= $char;
+					} elseif (!$consumeEnd) {
+						$this->iCurrentPosition -= $this->strlen($char);
+					}
+					return $out;
+				}
+				$out .= $char;
+				if ($comment = $this->consumeComment()) {
+					$comments[] = $comment;
 				}
-				return $out;
-			}
-			$out .= $char;
-			if ($comment = $this->consumeComment()) {
-				$comments[] = $comment;
 			}
+		} 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;
 		}
 
 		$this->iCurrentPosition = $start;
@@ -307,4 +314,4 @@ private function strpos($sString, $sNeedle, $iOffset) {
 			return strpos($sString, $sNeedle, $iOffset);
 		}
 	}
-}
+}

lib/Sabberworm/CSS/Parsing/UnexpectedEOFException.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Sabberworm\CSS\Parsing;
+
+/**
+* Thrown if the CSS parsers encounters end of file it did not expect
+* Extends UnexpectedTokenException in order to preserve backwards compatibility
+*/
+class UnexpectedEOFException extends UnexpectedTokenException {}

tests/Sabberworm/CSS/ParserTest.php

@@ -746,4 +746,10 @@ function testMicrosoftFilterParsing() {
 		$sExpected = ".test {filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=\"#80000000\",endColorstr=\"#00000000\",GradientType=1);}";
 		$this->assertSame($sExpected, $oDoc->render());
 	}
+
+	function testLonelyImport() {
+		$oDoc = $this->parsedStructureForFile('lonely-import');
+		$sExpected = "@import url(\"example.css\") only screen and (max-width: 600px);";
+		$this->assertSame($sExpected, $oDoc->render());
+	}
 }

tests/files/lonely-import.css

@@ -0,0 +1 @@
+@import "example.css" only screen and (max-width: 600px)