Merge "Update the Display module to 2023-03-30"

Author: jenkins-bot

HISTORY.md

@@ -6,6 +6,7 @@
 	- properties: aspect-ratio, contain-intrinsic-* (size, width, height, block-size, inline-size), min-intrinsic-size;
 * Update Color to Level 4 (2025-04-24)
 * Update Values and Units to Level 4 (WD 2024-03-12)
+* Update Display Level 3 to CR 2023-03-30
 
 ## css-sanitizer 5.5.0 (2025-01-27)
 * Ensure <-token and identifiers are always separated as a security

README.md

@@ -69,7 +69,7 @@ The sanitizer recognizes the following CSS modules:
 * [Color Level 4, 2025-04-24](https://www.w3.org/TR/2025/CRD-css-color-4-20250424)
 * [Compositing Level 1, 2015-01-13](https://www.w3.org/TR/2015/CR-compositing-1-20150113/)
 * [CSS Level 2, 2011-06-07](https://www.w3.org/TR/2011/REC-CSS2-20110607/)
-* [Display Level 3, 2019-07-11](https://www.w3.org/TR/2019/CR-css-display-3-20190711)
+* [Display Level 3, 2023-03-30](https://www.w3.org/TR/2023/CR-css-display-3-20230330/)
 * [Filter Effects Level 1, 2018-12-18](https://www.w3.org/TR/2018/WD-filter-effects-1-20181218)
 * [Flexbox Level 1, 2018-11-19](https://www.w3.org/TR/2018/CR-css-flexbox-1-20181119)
 * [Fonts Level 3, 2018-09-20](https://www.w3.org/TR/2018/REC-css-fonts-3-20180920)

src/Sanitizer/StylePropertySanitizer.php

@@ -135,7 +135,6 @@ protected function css2( MatcherFactory $matcherFactory ) {
 		$props['clip'] = new Alternative( [
 			$auto, new FunctionMatcher( 'rect', Quantifier::hash( $autoLength, 4, 4 ) ),
 		] );
-		$props['visibility'] = new KeywordMatcher( [ 'visible', 'hidden', 'collapse' ] );
 
 		// https://www.w3.org/TR/2011/REC-CSS2-20110607/generate.html
 		$props['list-style-type'] = new KeywordMatcher( [
@@ -197,7 +196,7 @@ protected function css2( MatcherFactory $matcherFactory ) {
 
 	/**
 	 * Properties for CSS Display Module Level 3
-	 * @see https://www.w3.org/TR/2019/CR-css-display-3-20190711/
+	 * @see https://www.w3.org/TR/2023/CR-css-display-3-20230330/
 	 * @param MatcherFactory $matcherFactory Factory for Matchers
 	 * @return Matcher[] Array mapping declaration names (lowercase) to Matchers for the values
 	 */
@@ -236,6 +235,10 @@ protected function cssDisplay3( MatcherFactory $matcherFactory ) {
 			] ),
 		] );
 
+		$props['visibility'] = new KeywordMatcher( [ 'visible', 'hidden', 'collapse' ] );
+
+		$props['order'] = $matcherFactory->integer();
+
 		$this->cache[__METHOD__] = $props;
 		return $props;
 	}
@@ -945,7 +948,6 @@ protected function cssFlexbox3( MatcherFactory $matcherFactory ) {
 		] );
 		$props['flex-wrap'] = new KeywordMatcher( [ 'nowrap', 'wrap', 'wrap-reverse' ] );
 		$props['flex-flow'] = UnorderedGroup::someOf( [ $props['flex-direction'], $props['flex-wrap'] ] );
-		$props['order'] = $matcherFactory->integer();
 		$props['flex-grow'] = $matcherFactory->number();
 		$props['flex-shrink'] = $matcherFactory->number();
 		$props['flex-basis'] = new Alternative( [
@@ -968,6 +970,11 @@ protected function cssFlexbox3( MatcherFactory $matcherFactory ) {
 		$props['align-self'] = $align['align-self'];
 		$props['align-content'] = $align['align-content'];
 
+		// 'order' was copied into display-3 in CR 2023-03-30
+		// Removed from flexbox in the ED as of 2025-03-10, it can be removed
+		// here once we update our flexbox version.
+		$props['order'] = $this->cssDisplay3( $matcherFactory )['order'];
+
 		$this->cache[__METHOD__] = $props;
 		return $props;
 	}
@@ -1490,10 +1497,6 @@ protected function cssGrid1( MatcherFactory $matcherFactory ) {
 		$props['justify-content'] = $align['justify-content'];
 		$props['align-content'] = $align['align-content'];
 
-		// Grid uses Flexbox's order property too. Copying is ok as long as
-		// it's the identical object.
-		$props['order'] = $this->cssFlexbox3( $matcherFactory )['order'];
-
 		$this->cache[__METHOD__] = $props;
 		return $props;
 	}

tests/Sanitizer/StylePropertySanitizerTest.php

@@ -93,7 +93,6 @@ public static function provideDeclarations() {
 			[ 'line-height: 3' ],
 			[ 'vertical-align: middle' ],
 			[ 'clip: rect(1px, auto, 1em, auto)' ],
-			[ 'visibility: hidden' ],
 			[ 'list-style-type: circle' ],
 			[ 'content: "foo" url("image.jpg") counter(foobar) counter(foobaz, disc) attr(data-foo-baz)' ],
 			[ 'content: "nope" url("bad.jpg")', 'bad-value-for-property' ],
@@ -117,6 +116,8 @@ public static function provideDeclarations() {
 			[ 'display: grid' ],
 			[ 'display: inline table' ],
 			[ 'display: list-item' ],
+			[ 'visibility: hidden' ],
+			[ 'order: 6' ],
 
 			// cssPosition3
 			[ 'position: absolute' ],