Allow lenient parsing (on by default)

Closes MyIntervals#51 as fixed

Author: sabberworm

lib/Sabberworm/CSS/Parser.php

@@ -249,7 +249,23 @@ private function parseRuleSet($oRuleSet) {
 			$this->consumeWhiteSpace();
 		}
 		while (!$this->comes('}')) {
-			$oRuleSet->addRule($this->parseRule());
+			$oRule = null;
+			if($this->oParserSettings->bLenientParsing) {
+				try {
+					$oRule = $this->parseRule();
+				} catch (UnexpectedTokenException $e) {
+					$this->consumeUntil(array("\n", ";"), true);
+					$this->consumeWhiteSpace();
+					while ($this->comes(';')) {
+						$this->consume(';');
+					}
+				}
+			} else {
+				$oRule = $this->parseRule();
+			}
+			if($oRule) {
+				$oRuleSet->addRule($oRule);
+			}
 			$this->consumeWhiteSpace();
 		}
 		$this->consume('}');
@@ -506,10 +522,20 @@ private function isEnd() {
 		return $this->iCurrentPosition >= $this->iLength;
 	}
 
-	private function consumeUntil($sEnd) {
-		$iEndPos = mb_strpos($this->sText, $sEnd, $this->iCurrentPosition, $this->sCharset);
-		if ($iEndPos === false) {
-			throw new UnexpectedTokenException($sEnd, $this->peek(5), 'search');
+	private function consumeUntil($aEnd, $bIncludeEnd = false) {
+		$aEnd = is_array($aEnd) ? $aEnd : array($aEnd);
+		$iEndPos = null;
+		foreach ($aEnd as $sEnd) {
+			$iCurrentEndPos = mb_strpos($this->sText, $sEnd, $this->iCurrentPosition, $this->sCharset);
+			if($iCurrentEndPos === false) {
+				continue;
+			}
+			if($iEndPos === null || $iCurrentEndPos < $iEndPos) {
+				$iEndPos = $iCurrentEndPos + ($bIncludeEnd ? $this->strlen($sEnd) : 0);
+			}
+		}
+		if ($iEndPos === null) {
+			throw new UnexpectedTokenException($aEnd, $this->peek(5), 'search');
 		}
 		return $this->consume($iEndPos - $this->iCurrentPosition);
 	}

tests/Sabberworm/CSS/RuleSet/LenientParsingTest.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Sabberworm\CSS\RuleSet;
+
+use Sabberworm\CSS\Parser;
+use Sabberworm\CSS\Settings;
+
+class LenientParsingTest extends \PHPUnit_Framework_TestCase {
+
+	/**
+	* @expectedException Sabberworm\CSS\Parsing\UnexpectedTokenException
+	*/
+	public function testFaultToleranceOff() {
+		$sFile = dirname(__FILE__) . '/../../../files' . DIRECTORY_SEPARATOR . "fault-tolerance.css";
+		$oParser = new Parser(file_get_contents($sFile), Settings::create()->beStrict());
+		$oParser->parse();
+	}
+
+	public function testFaultToleranceOn() {
+		$sFile = dirname(__FILE__) . '/../../../files' . DIRECTORY_SEPARATOR . "fault-tolerance.css";
+		$oParser = new Parser(file_get_contents($sFile), Settings::create()->withLenientParsing(true));
+		$oResult = $oParser->parse();
+		$this->assertSame('.test1 {}'."\n".'.test2 {hello: 2;}'."\n", $oResult->__toString());
+	}
+
+}

tests/files/atrules.css

@@ -1,12 +1,12 @@
 @charset "utf-8";
 
 @font-face {
-  font-family: "CrassRoots";
-  src: url("../media/cr.ttf")
+	font-family: "CrassRoots";
+	src: url("../media/cr.ttf")
 }
 
 html, body {
-    font-size: 1.6em
+	font-size: 1.6em
 }
 
 @keyframes mymove {

tests/files/fault-tolerance.css

@@ -0,0 +1,8 @@
+.test1 {
+	//gaga: hello;
+}
+
+.test2 {
+	*hello: 1;
+	hello: 2;
+}