Introduce illegal_cdata error code

ampproject · Nov 22, 2019 · aa129aa · aa129aa
1 parent d2d04d5
commit aa129aa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
@@ -519,7 +519,7 @@ private function process_node( DOMElement $node ) {
 		if ( ! empty( $cdata ) && $node instanceof DOMElement ) {
 			$validity = $this->validate_cdata_for_node( $node, $cdata );
 			if ( is_wp_error( $validity ) ) {
-				$this->remove_invalid_child( $node ); // @todo Code: illegal_cdata.
+				$this->remove_invalid_child( $node, [ 'code' => 'illegal_cdata' ] );
 				return null;
 			}
 		}

diff --git a/includes/validation/class-amp-validation-error-taxonomy.php b/includes/validation/class-amp-validation-error-taxonomy.php
@@ -2936,6 +2936,8 @@ public static function get_error_title_from_code( $validation_error ) {
 					$title .= sprintf( ': <code>%s</code>', esc_html( $validation_error['property_name'] ) );
 				}
 				return $title;
+			case 'illegal_cdata':
+				return esc_html__( 'Illegal text content', 'amp' );
 			case 'illegal_css_important':
 				$title = esc_html__( 'Illegal CSS !important property', 'amp' );
 				if ( isset( $validation_error['property_name'] ) ) {

diff --git a/tests/php/test-tag-and-attribute-sanitizer.php b/tests/php/test-tag-and-attribute-sanitizer.php
@@ -1909,10 +1909,10 @@ public function get_html_data() {
 			',
 			[ 'amp-bind' ],
 			[
+				'illegal_cdata',
 				'invalid_attribute',
 				'invalid_element',
 				'invalid_element',
-				'invalid_element',
 			],
 		];