Merge pull request MyIntervals#111 from moodlehq/ms-filter-parsing

Parsing of filter rules specific to Microsoft

Author: sabberworm

lib/Sabberworm/CSS/Parser.php

@@ -436,6 +436,8 @@ private function parsePrimitiveValue() {
 			$oValue = $this->parseURLValue();
 		} else if ($this->comes("'") || $this->comes('"')) {
 			$oValue = $this->parseStringValue();
+		} else if ($this->comes("progid:") && $this->oParserSettings->bLenientParsing) {
+			$oValue = $this->parseMicrosoftFilter();
 		} else {
 			$oValue = $this->parseIdentifier(true, false);
 		}
@@ -496,6 +498,12 @@ private function parseColorValue() {
 		return new Color($aColor, $this->iLineNo);
 	}
 
+	private function parseMicrosoftFilter() {
+		$sFunction = $this->consumeUntil('(', false, true);
+		$aArguments = $this->parseValue(array(',', '='));
+		return new CSSFunction($sFunction, $aArguments, ',', $this->iLineNo);
+	}
+
 	private function parseURLValue() {
 		$bUseUrl = $this->comes('url', true);
 		if ($bUseUrl) {

tests/Sabberworm/CSS/ParserTest.php

@@ -582,4 +582,17 @@ function testTopLevelCommentExtracting() {
 		$this->assertCount(1, $comments);
 		$this->assertEquals("Find Me!", $comments[0]->getComment());
 	}
+
+	/**
+	* @expectedException Sabberworm\CSS\Parsing\UnexpectedTokenException
+	*/
+	function testMicrosoftFilterStrictParsing() {
+		$oDoc = $this->parsedStructureForFile('ms-filter', Settings::create()->beStrict());
+	}
+
+	function testMicrosoftFilterParsing() {
+		$oDoc = $this->parsedStructureForFile('ms-filter');
+		$sExpected = ".test {filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=\"#80000000\",endColorstr=\"#00000000\",GradientType=1);}";
+		$this->assertSame($sExpected, $oDoc->render());
+	}
 }

tests/files/ms-filter.css

@@ -0,0 +1 @@
+.test {filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);}