Ignore Exceptions during rule set and list render

if output format has `setIgnoreExceptions(true)` or `beLenient()`

Author: sabberworm

lib/Sabberworm/CSS/CSSList/CSSList.php

@@ -80,13 +80,19 @@ public function render(\Sabberworm\CSS\OutputFormat $oOutputFormat) {
 			$oNextLevel = $oOutputFormat->nextLevel();
 		}
 		foreach ($this->aContents as $oContent) {
+			$sRendered = $oOutputFormat->safely(function() use ($oNextLevel, $oContent) {
+				return $oContent->render($oNextLevel);
+			});
+			if($sRendered === null) {
+				continue;
+			}
 			if($bIsFirst) {
 				$bIsFirst = false;
 				$sResult .= $oNextLevel->spaceBeforeBlocks();
 			} else {
 				$sResult .= $oNextLevel->spaceBetweenBlocks();
 			}
-			$sResult .= $oContent->render($oNextLevel);
+			$sResult .= $sRendered;
 		}
 
 		if(!$bIsFirst) {

lib/Sabberworm/CSS/OutputFormat.php

@@ -2,6 +2,8 @@
 
 namespace Sabberworm\CSS;
 
+use Sabberworm\CSS\Parsing\OutputException;
+
 class OutputFormat {
 	/**
 	* Value format
@@ -225,7 +227,7 @@ public function spaceBeforeOpeningBrace() {
 	* Runs the given code, either swallowing or passing exceptions, depending on the bIgnoreExceptions setting.
 	*/
 	public function safely($cCode) {
-		if($this->oFormat->bIgnoreExceptions) {
+		if($this->oFormat->get('IgnoreExceptions')) {
 			// If output exceptions are ignored, run the code with exception guards
 			try {
 				return $cCode();

lib/Sabberworm/CSS/RuleSet/DeclarationBlock.php

@@ -9,6 +9,7 @@
 use Sabberworm\CSS\Value\Size;
 use Sabberworm\CSS\Value\Color;
 use Sabberworm\CSS\Value\URL;
+use Sabberworm\CSS\Parsing\OutputException;
 
 /**
  * Declaration blocks are the parts of a css file which denote the rules belonging to a selector.
@@ -596,7 +597,7 @@ public function __toString() {
 	public function render(\Sabberworm\CSS\OutputFormat $oOutputFormat) {
 		if(count($this->aSelectors) === 0) {
 			// If all the selectors have been removed, this declaration block becomes invalid
-			throw new \Sabberworm\CSS\Parsing\OutputException("Attempt to print declaration block with missing selector");
+			throw new OutputException("Attempt to print declaration block with missing selector");
 		}
 		$sResult = $oOutputFormat->implode($oOutputFormat->spaceBeforeSelectorSeparator() . ',' . $oOutputFormat->spaceAfterSelectorSeparator(), $this->aSelectors) . $oOutputFormat->spaceBeforeOpeningBrace() . '{';
 		$sResult .= parent::render($oOutputFormat);

lib/Sabberworm/CSS/RuleSet/RuleSet.php

@@ -92,13 +92,19 @@ public function render(\Sabberworm\CSS\OutputFormat $oOutputFormat) {
 		$bIsFirst = true;
 		foreach ($this->aRules as $aRules) {
 			foreach($aRules as $oRule) {
+				$sRendered = $oOutputFormat->safely(function() use ($oRule, $oOutputFormat) {
+					return $oRule->render($oOutputFormat->nextLevel());
+				});
+				if($sRendered === null) {
+					continue;
+				}
 				if($bIsFirst) {
 					$bIsFirst = false;
 					$sResult .= $oOutputFormat->nextLevel()->spaceBeforeRules();
 				} else {
 					$sResult .= $oOutputFormat->nextLevel()->spaceBetweenRules();
 				}
-				$sResult .= $oRule->render($oOutputFormat->nextLevel());
+				$sResult .= $sRendered;
 			}
 		}
 

tests/Sabberworm/CSS/OutputFormatTest.php

@@ -146,10 +146,25 @@ public function testSpaceBeforeBraces() {
 @media screen{.main{background-size: 100% 100%;font-size: 1.3em;background-color: #fff;}}', $this->oDocument->render(OutputFormat::create()->setSpaceBeforeOpeningBrace('')));
 	}
 
-// 	public function testIgnoreExceptions() {
-// 		$this->assertSame('.main, .test {font: italic normal bold 16px/1.2 "Helvetica",Verdana,sans-serif;background: white;}
-// @media screen {.main {background-size: 100% 100%;font-size: 1.3em;background-color: #fff;}
-// }', $this->oDocument->render(OutputFormat::create()->setIgnoreExceptions('')));
-// 	}
+	/**
+	* @expectedException Sabberworm\CSS\Parsing\OutputException
+	*/
+	public function testIgnoreExceptionsOff() {
+		$aBlocks = $this->oDocument->getAllDeclarationBlocks();
+		$oFirstBlock = $aBlocks[0];
+		$oFirstBlock->removeSelector('.main');
+		$this->assertSame('.test {font: italic normal bold 16px/1.2 "Helvetica",Verdana,sans-serif;background: white;}
+@media screen {.main {background-size: 100% 100%;font-size: 1.3em;background-color: #fff;}}', $this->oDocument->render(OutputFormat::create()->setIgnoreExceptions(false)));
+		$oFirstBlock->removeSelector('.test');
+		$this->oDocument->render(OutputFormat::create()->setIgnoreExceptions(false));
+	}
+
+	public function testIgnoreExceptionsOn() {
+		$aBlocks = $this->oDocument->getAllDeclarationBlocks();
+		$oFirstBlock = $aBlocks[0];
+		$oFirstBlock->removeSelector('.main');
+		$oFirstBlock->removeSelector('.test');
+		$this->assertSame('@media screen {.main {background-size: 100% 100%;font-size: 1.3em;background-color: #fff;}}', $this->oDocument->render(OutputFormat::create()->setIgnoreExceptions(true)));
+	}
 
 }