Merge pull request MyIntervals#134 from raxbg/trailing_whitespace_fix

Fix UnexpectedTokenException caused by trailing whitespace

Author: sabberworm

lib/Sabberworm/CSS/Parser.php

@@ -111,6 +111,7 @@ private function parseList(CSSList $oList, $bIsRoot = false) {
 				$oListItem->setComments($comments);
 				$oList->append($oListItem);
 			}
+			$this->consumeWhiteSpace();
 		}
 		if (!$bIsRoot) {
 			throw new SourceException("Unexpected end of document", $this->iLineNo);
@@ -368,15 +369,18 @@ private function parseRule() {
 				$this->consumeWhiteSpace();
 			}
 		}
+		$this->consumeWhiteSpace();
 		if ($this->comes('!')) {
 			$this->consume('!');
 			$this->consumeWhiteSpace();
 			$this->consume('important');
 			$oRule->setIsImportant(true);
 		}
+		$this->consumeWhiteSpace();
 		while ($this->comes(';')) {
 			$this->consume(';');
 		}
+		$this->consumeWhiteSpace();
 		return $oRule;
 	}
 

tests/Sabberworm/CSS/ParserTest.php

@@ -451,6 +451,12 @@ function testCharsetLenient2() {
 		$this->assertSame($sExpected, $oDoc->render());
 	}
 
+	function testTrailingWhitespace() {
+		$oDoc = $this->parsedStructureForFile('trailing-whitespace', Settings::create()->withLenientParsing(false));
+		$sExpected = 'div {width: 200px;}';
+		$this->assertSame($sExpected, $oDoc->render());
+	}
+
 	/**
 	* @expectedException Sabberworm\CSS\Parsing\UnexpectedTokenException
 	*/

tests/files/trailing-whitespace.css

@@ -0,0 +1,2 @@
+div { width: 200px; }
+