Merge pull request MyIntervals#178 from raxbg/improvement/better_eof_handling

sabberworm · web-flow · commit a80a97d3fdb2 · 2019-11-13T07:52:21.000+01:00
Fix @import's output when there is no media query
diff --git a/lib/Sabberworm/CSS/CSSList/CSSList.php b/lib/Sabberworm/CSS/CSSList/CSSList.php
@@ -115,7 +115,7 @@ private static function parseAtRule(ParserState $oParserState) {
 				$sMediaQuery = trim($oParserState->consumeUntil(array(';', ParserState::EOF)));
 			}
 			$oParserState->consumeUntil(array(';', ParserState::EOF), true, true);
-			return new Import($oLocation, $sMediaQuery, $iIdentifierLineNum);
+			return new Import($oLocation, $sMediaQuery ? $sMediaQuery : null, $iIdentifierLineNum);
 		} else if ($sIdentifier === 'charset') {
 			$sCharset = CSSString::parse($oParserState);
 			$oParserState->consumeWhiteSpace();

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ private static function parseAtRule(ParserState $oParserState) {`
`115`	`115`	`$sMediaQuery = trim($oParserState->consumeUntil(array(';', ParserState::EOF)));`
`116`	`116`	`}`
`117`	`117`	`$oParserState->consumeUntil(array(';', ParserState::EOF), true, true);`
`118`		`- return new Import($oLocation, $sMediaQuery, $iIdentifierLineNum);`
	`118`	`+ return new Import($oLocation, $sMediaQuery ? $sMediaQuery : null, $iIdentifierLineNum);`
`119`	`119`	`} else if ($sIdentifier === 'charset') {`
`120`	`120`	`$sCharset = CSSString::parse($oParserState);`
`121`	`121`	`$oParserState->consumeWhiteSpace();`