Skip to content

Commit da8323f

Browse files
authored
Port cssjanus 2.1.0 changes
Changes ported: * Fix incorrect flipping with the general sibling combinator. wikimedia/node-cssjanus#86 Ref https://github.com/cssjanus/php-cssjanus/issues/31.
1 parent 086787f commit da8323f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/CSSJanus.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ private static function buildPatterns() {
101101
// Use "*+" instead of "*?" to avoid reaching the backtracking limit.
102102
// <https://github.com/cssjanus/php-cssjanus/issues/14>, <https://phabricator.wikimedia.org/T215746#4944830>.
103103
$patterns['url_chars'] = "(?:{$patterns['url_special_chars']}|{$patterns['nonAscii']}|{$patterns['escape']})*+";
104-
$patterns['lookahead_not_open_brace'] = "(?!({$patterns['nmchar']}|\\r?\\n|\s|#|\:|\.|\,|\+|>|\(|\)|\[|\]|=|\*=|~=|\^=|'[^']*'|\"[^\"]*\"|" . self::TOKEN_COMMENT . ")*+{)";
104+
$patterns['lookahead_not_open_brace'] = "(?!({$patterns['nmchar']}|\\r?\\n|\s|#|\:|\.|\,|\+|>|~|\(|\)|\[|\]|=|\*=|~=|\^=|'[^']*'|\"[^\"]*\"|" . self::TOKEN_COMMENT . ")*+{)";
105105
$patterns['lookahead_not_closing_paren'] = "(?!{$patterns['url_chars']}{$patterns['valid_after_uri_chars']}\))";
106106
$patterns['lookahead_for_closing_paren'] = "(?={$patterns['url_chars']}{$patterns['valid_after_uri_chars']}\))";
107107
$patterns['noflip_single'] = "/({$patterns['noflip_annotation']}{$patterns['lookahead_not_open_brace']}[^;}]+;?)/i";

test/suites/CSSJanusTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function testTransform($input, $args, $output, $name) {
5959
protected static function getSpec() {
6060
static $json;
6161
if ($json == null) {
62-
$version = '2.0.0';
62+
$version = '2.1.0';
6363
$dir = dirname(__DIR__);
6464
$file = "$dir/data-v$version.json";
6565
if (!is_readable($file)) {

0 commit comments

Comments
 (0)