Added support for the unit/unit syntax found in font: and border-radius: rules.

Closes MyIntervals#11 as fixed.
Closes MyIntervals#17 as fixed.
Closes MyIntervals#16 as fixed.

Author: sabberworm

CSSParser.php

@@ -223,23 +223,33 @@ private function parseRule() {
 	private function parseValue() {
 		$aResult = array();
 		do {
-			$this->consumeWhiteSpace();
-			if(is_numeric($this->peek()) || $this->comes('-') || $this->comes('.')) {
-				$aResult[] = $this->parseNumericValue();
-			} else if($this->comes('#') || $this->comes('rgb') || $this->comes('hsl')) {
-				$aResult[] = $this->parseColorValue();
-			} else if($this->comes('url')){
-				$aResult[] = $this->parseURLValue();
-			} else if($this->comes("'") || $this->comes('"')){
-				$aResult[] = $this->parseStringValue();
-			} else {
-				$aResult[] = $this->parseIdentifier();
-			}
-			$this->consumeWhiteSpace();
+			$aResult[] = $this->parseSingleValue();
 		} while($this->comes(',') && is_string($this->consume(',')));
 
 		return $aResult;
 	}
+
+	private function parseSingleValue() {
+		$oValue = null;
+		$this->consumeWhiteSpace();
+		if(is_numeric($this->peek()) || (($this->comes('-') || $this->comes('.')) && is_numeric($this->peek(1, 1)))) {
+			$oValue = $this->parseNumericValue();
+		} else if($this->comes('#') || $this->comes('rgb') || $this->comes('hsl')) {
+			$oValue = $this->parseColorValue();
+		} else if($this->comes('url')){
+			$oValue = $this->parseURLValue();
+		} else if($this->comes("'") || $this->comes('"')){
+			$oValue = $this->parseStringValue();
+		} else {
+			$oValue = $this->parseIdentifier();
+		}
+		$this->consumeWhiteSpace();
+		if($this->comes('/')) {
+			$this->consume('/');
+			$oValue = new CSSSlashedValue($oValue, $this->parseSingleValue());
+		}
+		return $oValue;
+	}
 
 	private function parseNumericValue() {
 		$sSize = '';
@@ -990,3 +1000,33 @@ public function __toString() {
 		return "url({$this->oURL->__toString()})";
 	}
 }
+
+class CSSSlashedValue extends CSSValue {
+	private $oValue1;
+	private $oValue2;
+
+	public function __construct($oValue1, $oValue2) {
+		$this->oValue1 = $oValue1;
+		$this->oValue2 = $oValue2;
+	}
+
+	public function getValue1() {
+		return $this->oValue1;
+	}
+
+	public function getValue2() {
+		return $this->oValue2;
+	}
+
+	public function __toString() {
+		$oValue1 = $this->oValue1;
+		$oValue2 = $this->oValue2;
+		if($oValue1 instanceof CSSValue) {
+			$oValue1 = $oValue1->__toString();
+		}
+		if($oValue2 instanceof CSSValue) {
+			$oValue2 = $oValue2->__toString();
+		}
+		return "$oValue1/$oValue2";
+	}
+}

tests/CSSParserTests.php

@@ -17,6 +17,10 @@ function testCssFiles() {
 				if(strrpos($sFileName, '.css') !== strlen($sFileName)-strlen('.css')) {
 					continue;
 				}
+				if(strpos($sFileName, '-') === 0) {
+					//Either a file which SHOULD fail or a future test of a as-of-now missing feature
+					continue;
+				}
 				$oParser = new CSSParser(file_get_contents($sDirectory.DIRECTORY_SEPARATOR.$sFileName));
 				try {
 					$oParser->parse()->__toString();
@@ -158,6 +162,11 @@ function testManipulation() {
 		}
 		$this->assertSame('#header {margin: 10px 2em 1cm 2%;color: red !important;}body {color: green;}', $oDoc->__toString());
 	}
+
+	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 parsedStructureForFile($sFileName) {
 		$sFile = dirname(__FILE__).DIRECTORY_SEPARATOR.'files'.DIRECTORY_SEPARATOR."$sFileName.css";

tests/files/slashed.css

@@ -0,0 +1,4 @@
+.test {
+	font: 12px/1.5;
+	border-radius: 5px 10px 5px 10px / 10px 5px 10px 5px;
+}