Skip to content

Commit 75c4eec

Browse files
committed
Update patches for php-css-parser and include complex value fix
1 parent 88b5cd5 commit 75c4eec

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"ampproject/amp-toolbox": "0.11.3",
1818
"cweagans/composer-patches": "~1.0",
1919
"fasterimage/fasterimage": "1.5.0",
20-
"sabberworm/php-css-parser": "8.4.0"
20+
"sabberworm/php-css-parser": "dev-master#cc791ad"
2121
},
2222
"require-dev": {
2323
"automattic/vipwpcs": "^2.2",
@@ -94,9 +94,9 @@
9494
"Remove 'match' keyword from uses <https://github.com/sebastianbergmann/phpunit/issues/4373>": "patches/remove-match-keyword.patch"
9595
},
9696
"sabberworm/php-css-parser": {
97-
"1. Add additional validation for size unit <https://github.com/sabberworm/PHP-CSS-Parser/pull/350>": "https://github.com/westonruter/PHP-CSS-Parser/commit/5b1d6a4abe43f4311d9b4674913ca665ed8c43aa.diff",
98-
"2. Validate name-start code points for identifier <https://github.com/westonruter/PHP-CSS-Parser/pull/2>": "https://github.com/westonruter/PHP-CSS-Parser/commit/9f96bc97fcb1e848a2f6ca6f658009996883dffc.diff",
99-
"3. Fix parsing CSS selectors which contain commas <https://github.com/westonruter/PHP-CSS-Parser/pull/1>": "https://github.com/westonruter/PHP-CSS-Parser/commit/dc18ba737fd6a611189a5b83729396500676f8dd.diff"
97+
"1. Validate name-start code points for identifier <https://github.com/westonruter/PHP-CSS-Parser/pull/2>": "https://patch-diff.githubusercontent.com/raw/westonruter/PHP-CSS-Parser/pull/2.diff?2",
98+
"2. Fix parsing CSS selectors which contain commas <https://github.com/westonruter/PHP-CSS-Parser/pull/1>": "https://patch-diff.githubusercontent.com/raw/westonruter/PHP-CSS-Parser/pull/1.diff?2",
99+
"3. Parse simple expressions <https://github.com/sabberworm/PHP-CSS-Parser/pull/389>": "https://patch-diff.githubusercontent.com/raw/sabberworm/PHP-CSS-Parser/pull/389.diff?2"
100100
}
101101
}
102102
},

composer.lock

Lines changed: 12 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/php/test-amp-style-sanitizer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -893,8 +893,8 @@ public function get_link_and_style_test_data() {
893893
',
894894
[
895895
'body{background:green;width:calc(( 100vw - 100px ) / 2);height:100px}',
896-
':where(body){width:min(var(--container-max-width), 100% - calc(var(--container-padding) * 2));margin-inline:auto}',
897-
'body{--wp--preset--font-size--normal:16px;--wp--preset--font-size--small:clamp(.875rem,.875rem + ((1vw - .48rem)*0.24),1rem);--wp--preset--font-size--medium:clamp(1rem,1rem + ((1vw - .48rem)*0.24),1.125rem);--wp--preset--font-size--large:clamp(1.5rem,1.5rem + ((1vw - .48rem)*0.24),1.625rem);--wp--preset--font-size--normal:16px}',
896+
':where(body){width:min(var(--container-max-width),100% - calc(var(--container-padding) * 2));margin-inline:auto}',
897+
'body{--wp--preset--font-size--huge:42px;--wp--preset--font-size--small:clamp(.875rem,.875rem + ((1vw - .48rem) * .24),1rem);--wp--preset--font-size--medium:clamp(1rem,1rem + ((1vw - .48rem) * .24),1.125rem);--wp--preset--font-size--large:clamp(1.5rem,1.5rem + ((1vw - .48rem) * .24),1.625rem);--wp--preset--font-size--normal:16px}',
898898
],
899899
[],
900900
],

0 commit comments

Comments
 (0)