Keep required script components when invalid markup is kept

Author: westonruter

includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php

@@ -612,14 +612,14 @@ static function ( $validation_error ) {
 		if ( ! empty( $cdata ) && $node instanceof DOMElement ) {
 			$validity = $this->validate_cdata_for_node( $node, $cdata );
 			if ( true !== $validity ) {
-				$this->remove_invalid_child(
+				$sanitized = $this->remove_invalid_child(
 					$node,
 					array_merge(
 						$validity,
 						[ 'spec_name' => $this->get_spec_name( $node, $tag_spec ) ]
 					)
 				);
-				return null;
+				return $sanitized ? null : $script_components;
 			}
 		}
 
@@ -656,8 +656,8 @@ static function ( $validation_error ) {
 		// Remove the element if it is has an invalid layout.
 		$layout_validity = $this->is_valid_layout( $tag_spec, $node );
 		if ( true !== $layout_validity ) {
-			$this->remove_invalid_child( $node, $layout_validity );
-			return null;
+			$sanitized = $this->remove_invalid_child( $node, $layout_validity );
+			return $sanitized ? null : $script_components;
 		}
 
 		// Identify attribute values that don't conform to the attr_spec.
@@ -758,54 +758,54 @@ static function ( $validation_error ) {
 		// After attributes have been sanitized (and potentially removed), if mandatory attribute(s) are missing, remove the element.
 		$missing_mandatory_attributes = $this->get_missing_mandatory_attributes( $merged_attr_spec_list, $node );
 		if ( ! empty( $missing_mandatory_attributes ) ) {
-			$this->remove_invalid_child(
+			$sanitized = $this->remove_invalid_child(
 				$node,
 				[
 					'code'       => self::ATTR_REQUIRED_BUT_MISSING,
 					'attributes' => $missing_mandatory_attributes,
 					'spec_name'  => $this->get_spec_name( $node, $tag_spec ),
 				]
 			);
-			return null;
+			return $sanitized ? null : $script_components;
 		}
 
 		if ( ! empty( $tag_spec[ AMP_Rule_Spec::MANDATORY_ANYOF ] ) ) {
 			$anyof_attributes = $this->get_element_attribute_intersection( $node, $tag_spec[ AMP_Rule_Spec::MANDATORY_ANYOF ] );
 			if ( 0 === count( $anyof_attributes ) ) {
-				$this->remove_invalid_child(
+				$sanitized = $this->remove_invalid_child(
 					$node,
 					[
 						'code'                  => self::MANDATORY_ANYOF_ATTR_MISSING,
 						'mandatory_anyof_attrs' => $tag_spec[ AMP_Rule_Spec::MANDATORY_ANYOF ], // @todo Temporary as value can be looked up via spec name. See https://github.com/ampproject/amp-wp/pull/3817.
 						'spec_name'             => $this->get_spec_name( $node, $tag_spec ),
 					]
 				);
-				return null;
+				return $sanitized ? null : $script_components;
 			}
 		}
 
 		if ( ! empty( $tag_spec[ AMP_Rule_Spec::MANDATORY_ONEOF ] ) ) {
 			$oneof_attributes = $this->get_element_attribute_intersection( $node, $tag_spec[ AMP_Rule_Spec::MANDATORY_ONEOF ] );
 			if ( 0 === count( $oneof_attributes ) ) {
-				$this->remove_invalid_child(
+				$sanitized = $this->remove_invalid_child(
 					$node,
 					[
 						'code'                  => self::MANDATORY_ONEOF_ATTR_MISSING,
 						'mandatory_oneof_attrs' => $tag_spec[ AMP_Rule_Spec::MANDATORY_ONEOF ], // @todo Temporary as value can be looked up via spec name. See https://github.com/ampproject/amp-wp/pull/3817.
 						'spec_name'             => $this->get_spec_name( $node, $tag_spec ),
 					]
 				);
-				return null;
+				return $sanitized ? null : $script_components;
 			} elseif ( count( $oneof_attributes ) > 1 ) {
-				$this->remove_invalid_child(
+				$sanitized = $this->remove_invalid_child(
 					$node,
 					[
 						'code'                  => self::DUPLICATE_ONEOF_ATTRS,
 						'duplicate_oneof_attrs' => $oneof_attributes,
 						'spec_name'             => $this->get_spec_name( $node, $tag_spec ),
 					]
 				);
-				return null;
+				return $sanitized ? null : $script_components;
 			}
 		}