Merge commit '8eba275'

* commit '8eba275':
  Better fault tolerance.

Author: sabberworm

lib/Sabberworm/CSS/Parser.php

@@ -264,10 +264,20 @@ private function parseRuleSet($oRuleSet) {
 				try {
 					$oRule = $this->parseRule();
 				} catch (UnexpectedTokenException $e) {
-					$this->consumeUntil(array("\n", ";"), true);
-					$this->consumeWhiteSpace();
-					while ($this->comes(';')) {
-						$this->consume(';');
+					try {
+						$sConsume = $this->consumeUntil(array("\n", ";", '}'), true);
+						// We need to “unfind” the matches to the end of the ruleSet as this will be matched later
+						if($this->streql($this->substr($sConsume, $this->strlen($sConsume)-1, 1), '}')) {
+							$this->iCurrentPosition--;
+						} else {
+							$this->consumeWhiteSpace();
+							while ($this->comes(';')) {
+								$this->consume(';');
+							}
+						}
+					} catch (UnexpectedTokenException $e) {
+						// We’ve reached the end of the document. Just close the RuleSet.
+						return;
 					}
 				}
 			} else {

tests/Sabberworm/CSS/ParserTest.php

@@ -22,7 +22,7 @@ function testFiles() {
 					continue;
 				}
 				if (strpos($sFileName, '-') === 0) {
-					//Either a file which SHOULD fail or a future test of a as-of-now missing feature
+					//Either a file which SHOULD fail (at least in strict mode) or a future test of a as-of-now missing feature
 					continue;
 				}
 				$oParser = new Parser(file_get_contents($sDirectory . DIRECTORY_SEPARATOR . $sFileName));

tests/Sabberworm/CSS/RuleSet/LenientParsingTest.php

@@ -11,24 +11,33 @@ class LenientParsingTest extends \PHPUnit_Framework_TestCase {
 	* @expectedException Sabberworm\CSS\Parsing\UnexpectedTokenException
 	*/
 	public function testFaultToleranceOff() {
-		$sFile = dirname(__FILE__) . '/../../../files' . DIRECTORY_SEPARATOR . "fault-tolerance.css";
+		$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";
+		$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.2;hello: 200000000000.2;}'."\n", $oResult->__toString());
+		$this->assertSame('.test1 {}'."\n".'.test2 {hello: 2.2;hello: 200000000000.2;}'."\n".'#test {}'."\n".'#test2 {help: none;}'."\n", $oResult->__toString());
+	}
+	
+	/**
+	* @expectedException Sabberworm\CSS\Parsing\UnexpectedTokenException
+	*/
+	public function testEndToken() {
+		$sFile = dirname(__FILE__) . '/../../../files' . DIRECTORY_SEPARATOR . "-end-token.css";
+		$oParser = new Parser(file_get_contents($sFile), Settings::create()->beStrict());
+		$oResult = $oParser->parse();
 	}
 
 	public function testLocaleTrap() {
 		setlocale(LC_ALL, "pt_PT", "no");
-		$sFile = dirname(__FILE__) . '/../../../files' . DIRECTORY_SEPARATOR . "fault-tolerance.css";
+		$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.2;hello: 200000000000.2;}'."\n", $oResult->__toString());
+		$this->assertSame('.test1 {}'."\n".'.test2 {hello: 2.2;hello: 200000000000.2;}'."\n".'#test {}'."\n".'#test2 {help: none;}'."\n", $oResult->__toString());
 	}
 
 	public function testCaseInsensitivity() {

tests/files/fault-tolerance.css renamed to tests/files/-fault-tolerance.css

@@ -6,4 +6,10 @@
 	*hello: 1;
 	hello: 2.2;
 	hello: 2000000000000.2;
-}
+}
+
+#test {
+	#hello: 1}
+
+#test2 {
+	help: none;