Added support for CSS functions

Closes MyIntervals#15 as fixed.
Closes MyIntervals#12 as fixed.

Author: sabberworm

CSSParser.php

@@ -92,7 +92,7 @@ private function parseAtRule() {
 		}
 	}
 
-	private function parseIdentifier() {
+	private function parseIdentifier($bAllowFunctions = true) {
 		$sResult = $this->parseCharacter(true);
 		if($sResult === null) {
 			throw new Exception("Identifier expected, got {$this->peek(5)}");
@@ -101,6 +101,11 @@ private function parseIdentifier() {
 		while(($sCharacter = $this->parseCharacter(true)) !== null) {
 			$sResult .= $sCharacter;
 		}
+		if($bAllowFunctions && $this->comes('(')) {
+			$this->consume('(');
+			$sResult = new CSSFunction($sResult, $this->parseValue());
+			$this->consume(')');
+		}
 		return $sResult;
 	}
 
@@ -297,13 +302,13 @@ private function parseColorValue() {
 		$aColor = array();
 		if($this->comes('#')) {
 			$this->consume('#');
-			$sValue = $this->parseIdentifier();
+			$sValue = $this->parseIdentifier(false);
 			if(mb_strlen($sValue, $this->sCharset) === 3) {
 				$sValue = $sValue[0].$sValue[0].$sValue[1].$sValue[1].$sValue[2].$sValue[2];
 			}
 			$aColor = array('r' => new CSSSize(intval($sValue[0].$sValue[1], 16)), 'g' => new CSSSize(intval($sValue[2].$sValue[3], 16)), 'b' => new CSSSize(intval($sValue[4].$sValue[5], 16)));
 		} else {
-			$sColorMode = $this->parseIdentifier();
+			$sColorMode = $this->parseIdentifier(false);
 			$this->consumeWhiteSpace();
 			$this->consume('(');
 			$iLength = mb_strlen($sColorMode, $this->sCharset);
@@ -1034,3 +1039,26 @@ public function __toString() {
 		return "$oValue1/$oValue2";
 	}
 }
+
+class CSSFunction extends CSSValue {
+	private $sName;
+	private $aContents;
+
+	public function __construct($sName, $aContents) {
+		$this->sName = $sName;
+		$this->aContents = $aContents;
+	}
+
+	public function getName() {
+		return $this->sName;
+	}
+
+	public function getContents() {
+		return $this->aContents;
+	}
+
+	public function __toString() {
+		$sContents = implode(',', $this->aContents);
+		return "{$this->sName}({$sContents})";
+	}
+}

tests/CSSParserTests.php

@@ -167,6 +167,11 @@ function testSlashedValues() {
 		$oDoc = $this->parsedStructureForFile('slashed');
 		$this->assertSame('.test {font: 12px/1.5;border-radius: 5px 10px 5px 10px/10px 5px 10px 5px;}', $oDoc->__toString());
 	}
+
+	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());
+	}
 
 	function parsedStructureForFile($sFileName) {
 		$sFile = dirname(__FILE__).DIRECTORY_SEPARATOR.'files'.DIRECTORY_SEPARATOR."$sFileName.css";

tests/files/functions.css

@@ -0,0 +1,22 @@
+div.main { background-image: linear-gradient(#000, #fff) }
+.collapser::before,
+.collapser::-moz-before,
+.collapser::-webkit-before {
+    content: "»";
+    font-size: 1.2em;
+    margin-right: .2em;
+    -moz-transition-property: -moz-transform;
+    -moz-transition-duration: .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: .3s;
+}
+.collapser.expanded + * { height: auto }
+