Merge remote-tracking branch 'origin/pr/77'

* origin/pr/77:
  Add of the removeSelector from Block (previously in the todo list)

Author: sabberworm

README.md

@@ -106,7 +106,7 @@ There are a few convenience methods on Document to ease finding, manipulating an
 
 ## To-Do
 
-* More convenience methods [like `selectorsWithElement($sId/Class/TagName)`, `removeSelector($oSelector)`, `attributesOfType($sType)`, `removeAttributesOfType($sType)`]
+* More convenience methods [like `selectorsWithElement($sId/Class/TagName)`, `attributesOfType($sType)`, `removeAttributesOfType($sType)`]
 * Options for output (compact, verbose, etc.)
 * Real multibyte support. Currently only multibyte charsets whose first 255 code points take up only one byte and are identical with ASCII are supported (yes, UTF-8 fits this description).
 * Named color support (using `Color` instead of an anonymous string literal)

lib/Sabberworm/CSS/CSSList/CSSList.php

@@ -33,9 +33,16 @@ public function remove($oItemToRemove) {
 		$iKey = array_search($oItemToRemove, $this->aContents, true);
 		if ($iKey !== false) {
 			unset($this->aContents[$iKey]);
+			return true;
 		}
+		return false;
 	}
 
+	/**
+	 * Removes a declaration block from the CSS list if it matches all given selectors.
+	 * @param array|string $mSelector The selectors to match.
+	 * @param boolean $bRemoveAll Whether to stop at the first declaration block found or remove all blocks
+	 */
 	public function removeDeclarationBlockBySelector($mSelector, $bRemoveAll = false) {
 		if ($mSelector instanceof DeclarationBlock) {
 			$mSelector = $mSelector->getSelectors();

lib/Sabberworm/CSS/Parsing/OutputException.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Sabberworm\CSS\Parsing;
+
+/**
+* Thrown if the CSS parsers attempts to print something invalid
+*/
+class OutputException extends \Exception {
+}

lib/Sabberworm/CSS/RuleSet/DeclarationBlock.php

@@ -36,6 +36,20 @@ public function setSelectors($mSelector) {
 		}
 	}
 
+	// remove one of the selector of the block
+	public function removeSelector($mSelector) {
+		if($mSelector instanceof Selector) {
+			$mSelector = $mSelector->getSelector();
+		}
+		foreach($this->aSelectors as $iKey => $oSelector) {
+			if($oSelector->getSelector() === $mSelector) {
+				unset($this->aSelectors[$iKey]);
+				return true;
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * @deprecated use getSelectors()
 	 */
@@ -576,6 +590,10 @@ public function createFontShorthand() {
 	}
 
 	public function __toString() {
+		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");
+		}
 		$sResult = implode(', ', $this->aSelectors) . ' {';
 		$sResult .= parent::__toString();
 		$sResult .= '}' . "\n";

tests/Sabberworm/CSS/ParserTest.php

@@ -10,7 +10,7 @@
 class ParserTest extends \PHPUnit_Framework_TestCase {
 
 	function testFiles() {
-	
+
 		$sDirectory = dirname(__FILE__) . '/../../files';
 		if ($rHandle = opendir($sDirectory)) {
 			/* This is the correct way to loop over the directory. */
@@ -342,6 +342,23 @@ function testListValueRemoval() {
 		$this->assertSame('@media screen {html {some: -test(val2);}
 }#unrelated {other: yes;}' . "\n", $oDoc->__toString());
 	}
+  
+	/**
+	* @expectedException Sabberworm\CSS\Parsing\OutputException
+	*/
+	function testSelectorRemoval() {
+		$oDoc = $this->parsedStructureForFile('1readme');
+		$aBlocks = $oDoc->getAllDeclarationBlocks();
+		$oBlock1 = $aBlocks[0];
+		$this->assertSame(true, $oBlock1->removeSelector('html'));
+		$sExpected = '@charset "utf-8";@font-face {font-family: "CrassRoots";src: url("../media/cr.ttf");}body {font-size: 1.6em;}
+';
+		$this->assertSame($sExpected, $oDoc->__toString());
+		$this->assertSame(false, $oBlock1->removeSelector('html'));
+		$this->assertSame(true, $oBlock1->removeSelector('body'));
+		// This tries to output a declaration block without a selector and throws.
+		$oDoc->__toString();
+	}
 
 	function testComments() {
 		$oDoc = $this->parsedStructureForFile('comments');