Skip to content

Commit

Permalink
MDL-58646 lib: import latest sabberworm/PHP-CSS-Parser
Browse files Browse the repository at this point in the history
This version includes a fix[1] contributed by Frédéric Massart investigating
our compilation time issues, which significantly improves the speed of
processing font awesome.

Thanks, Fred!

[1] MyIntervals/PHP-CSS-Parser#120
  • Loading branch information
danpoltawski committed Jun 2, 2017
1 parent 78ab4f7 commit 2fe51fa
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 4 additions & 3 deletions lib/php-css-parser/Parser.php
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ private function parseCharacter($bIsForIdentifier) {
if (preg_match('/[0-9a-fA-F]/Su', $this->peek()) === 0) {
return $this->consume(1);
}
$sUnicode = $this->consumeExpression('/^[0-9a-fA-F]{1,6}/u');
$sUnicode = $this->consumeExpression('/^[0-9a-fA-F]{1,6}/u', 6);
if ($this->strlen($sUnicode) < 6) {
//Consume whitespace after incomplete unicode escape
if (preg_match('/\\s/isSu', $this->peek())) {
Expand Down Expand Up @@ -565,9 +565,10 @@ private function consume($mValue = 1) {
}
}

private function consumeExpression($mExpression) {
private function consumeExpression($mExpression, $iMaxLength = null) {
$aMatches = null;
if (preg_match($mExpression, $this->inputLeft(), $aMatches, PREG_OFFSET_CAPTURE) === 1) {
$sInput = $iMaxLength !== null ? $this->peek($iMaxLength) : $this->inputLeft();
if (preg_match($mExpression, $sInput, $aMatches, PREG_OFFSET_CAPTURE) === 1) {
return $this->consume($aMatches[0][0]);
}
throw new UnexpectedTokenException($mExpression, $this->peek(5), 'expression', $this->iLineNo);
Expand Down
2 changes: 1 addition & 1 deletion lib/php-css-parser/moodle_readme.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PHP CSS Parser
--------------

Import git ref: 50a802f562e71236140e2a8903b097c28d6101de
Import git ref: c3b01ef0a85824e86fd86a74a8154d8d5c34b0ff
(master)

Downloaded from: https://github.com/sabberworm/PHP-CSS-Parser
Expand Down

0 comments on commit 2fe51fa

Please sign in to comment.