CSSDocument->getAllValues may now also return CSSFunction argument values

Author: sabberworm

lib/CSSList.php

@@ -47,19 +47,24 @@ protected function allRuleSets(&$aResult) {
 		}
 	}
 
-	protected function allValues($oElement, &$aResult, $sSearchString = null) {
+	protected function allValues($oElement, &$aResult, $sSearchString = null, $bSearchInFunctionArguments = false) {
 		if($oElement instanceof CSSList) {
 			foreach($oElement->getContents() as $oContent) {
-				$this->allValues($oContent, $aResult, $sSearchString);
+				$this->allValues($oContent, $aResult, $sSearchString, $bSearchInFunctionArguments);
 			}
 		} else if($oElement instanceof CSSRuleSet) {
 			foreach($oElement->getRules($sSearchString) as $oRule) {
-				$this->allValues($oRule, $aResult, $sSearchString);
+				$this->allValues($oRule, $aResult, $sSearchString, $bSearchInFunctionArguments);
 			}
 		} else if($oElement instanceof CSSRule) {
 			foreach($oElement->getValues() as $aValues) {
 				foreach($aValues as $mValue) {
 					$aResult[] = $mValue;
+					if($bSearchInFunctionArguments && $mValue instanceof CSSFunction) {
+						foreach($mValue->getArguments() as $mArgument) {
+							$aResult[] = $mArgument;
+						}
+					}
 				}
 			}
 		}
@@ -113,8 +118,10 @@ public function getAllRuleSets() {
 
 	/**
 	* Returns all CSSValue objects found recursively in the tree.
+	* @param (object|string) $mElement the CSSList or CSSRuleSet to start the search from (defaults to the whole document). If a string is given, it is used as rule name filter (@see{CSSRuleSet->getRules()}).
+	* @param (bool) $bSearchInFunctionArguments whether to also return CSSValue objects used as CSSFunction arguments.
 	*/
-	public function getAllValues($mElement = null) {
+	public function getAllValues($mElement = null, $bSearchInFunctionArguments = false) {
 		$sSearchString = null;
 		if($mElement === null) {
 			$mElement = $this;
@@ -123,7 +130,7 @@ public function getAllValues($mElement = null) {
 			$mElement = $this;
 		}
 		$aResult = array();
-		$this->allValues($mElement, $aResult, $sSearchString);
+		$this->allValues($mElement, $aResult, $sSearchString, $bSearchInFunctionArguments);
 		return $aResult;
 	}
 

lib/CSSRuleSet.php

@@ -15,6 +15,12 @@ public function addRule(CSSRule $oRule) {
 		$this->aRules[$oRule->getRule()] = $oRule;
 	}
 
+	/**
+	* Returns all rules matching the given pattern
+	* @param (null|string|CSSRule) $mRule pattern to search for. If null, returns all rules. if the pattern ends with a dash, all rules starting with the pattern are returned as well as one matching the pattern with the dash excluded. passing a CSSRule behaves like calling getRules($mRule->getRule()).
+	* @example $oRuleSet->getRules('font-') //returns an array of all rules either beginning with font- or matching font.
+	* @example $oRuleSet->getRules('font') //returns array('font' => $oRule) or array().
+	*/
 	public function getRules($mRule = null) {
 		if($mRule === null) {
 			return $this->aRules;

lib/CSSValue.php

@@ -142,23 +142,23 @@ public function __toString() {
 
 class CSSFunction extends CSSValue {
 	private $sName;
-	private $aContents;
+	private $aArguments;
 
-	public function __construct($sName, $aContents) {
+	public function __construct($sName, $aArguments) {
 		$this->sName = $sName;
-		$this->aContents = $aContents;
+		$this->aArguments = $aArguments;
 	}
 
 	public function getName() {
 		return $this->sName;
 	}
 
-	public function getContents() {
-		return $this->aContents;
+	public function getArguments() {
+		return $this->aArguments;
 	}
 
 	public function __toString() {
-		$sContents = implode(',', $this->aContents);
-		return "{$this->sName}({$sContents})";
+		$aArguments = implode(',', $this->aArguments);
+		return "{$this->sName}({$aArguments})";
 	}
 }

tests/CSSParserTests.php

@@ -170,7 +170,15 @@ function testSlashedValues() {
 
 	function testFunctionSyntax() {
 		$oDoc = $this->parsedStructureForFile('functions');
-		$this->assertSame('div.main {background-image: linear-gradient(rgb(0, 0, 0),rgb(255, 255, 255));}.collapser::before, .collapser::-moz-before, .collapser::-webkit-before {content: "»";font-size: 1.2em;margin-right: 0.2em;-moz-transition-property: -moz-transform;-moz-transition-duration: 0.2s;-moz-transform-origin: center 60%;}.collapser.expanded::before, .collapser.expanded::-moz-before, .collapser.expanded::-webkit-before {-moz-transform: rotate(90deg);}.collapser + * {height: 0;overflow: hidden;-moz-transition-property: height;-moz-transition-duration: 0.3s;}.collapser.expanded + * {height: auto;}', $oDoc->__toString());
+		$sExpected = 'div.main {background-image: linear-gradient(rgb(0, 0, 0),rgb(255, 255, 255));}.collapser::before, .collapser::-moz-before, .collapser::-webkit-before {content: "»";font-size: 1.2em;margin-right: 0.2em;-moz-transition-property: -moz-transform;-moz-transition-duration: 0.2s;-moz-transform-origin: center 60%;}.collapser.expanded::before, .collapser.expanded::-moz-before, .collapser.expanded::-webkit-before {-moz-transform: rotate(90deg);}.collapser + * {height: 0;overflow: hidden;-moz-transition-property: height;-moz-transition-duration: 0.3s;}.collapser.expanded + * {height: auto;}';
+		$this->assertSame($sExpected, $oDoc->__toString());
+		foreach($oDoc->getAllValues(null, true) as $mValue) {
+			if($mValue instanceof CSSSize && !$mValue->isRelative()) {
+				$mValue->setSize($mValue->getSize()*2);
+			}
+		}
+		$sExpected = str_replace(array('0.2s', '0.3s', '90deg'), array('0.4s', '0.6s', '180deg'), $sExpected);
+		$this->assertSame($sExpected, $oDoc->__toString());
 	}
 
 	function parsedStructureForFile($sFileName) {

tests/files/-tobedone.css

@@ -0,0 +1,11 @@
+.some[selectors-may='contain-a-{'] {
+	
+}
+
+.some {
+	filters: may(contain, a, ')');
+}
+
+.ie-specific {
+	filter: (may-contain=sign);
+}