Merge pull request MyIntervals#194 from NitroPack/fix/escape_identifiers

Author: sabberworm

lib/Sabberworm/CSS/Parsing/ParserState.php

@@ -55,7 +55,11 @@ public function parseIdentifier($bIgnoreCase = true) {
 		}
 		$sCharacter = null;
 		while (($sCharacter = $this->parseCharacter(true)) !== null) {
-			$sResult .= $sCharacter;
+			if (preg_match('/[a-zA-Z0-9\x{00A0}-\x{FFFF}_-]/Sux', $sCharacter)) {
+				$sResult .= $sCharacter;
+			} else {
+				$sResult .= '\\' . $sCharacter;
+			}
 		}
 		if ($bIgnoreCase) {
 			$sResult = $this->strtolower($sResult);

tests/Sabberworm/CSS/ParserTest.php

@@ -466,6 +466,12 @@ function testSelectorEscapesInFile() {
 		$this->assertSame($sExpected, $oDoc->render());
 	}
 
+	function testIdentifierEscapesInFile() {
+		$oDoc = $this->parsedStructureForFile('identifier-escapes', Settings::create()->withMultibyteSupport(true));
+		$sExpected = 'div {font: 14px Font Awesome\ 5 Pro;font: 14px Font Awesome\} 5 Pro;font: 14px Font Awesome\; 5 Pro;f\;ont: 14px Font Awesome\; 5 Pro;}';
+		$this->assertSame($sExpected, $oDoc->render());
+	}
+
 	function testSelectorIgnoresInFile() {
 		$oDoc = $this->parsedStructureForFile('selector-ignores', Settings::create()->withMultibyteSupport(true));
 		$sExpected = '.some[selectors-may=\'contain-a-{\'] {}

tests/files/identifier-escapes.css

@@ -0,0 +1,6 @@
+div {
+  font: 14px Font Awesome\ 5 Pro;
+  font: 14px Font Awesome\} 5 Pro;
+  font: 14px Font Awesome\; 5 Pro;
+  f\;ont: 14px Font Awesome\; 5 Pro;
+}