get_block_wrapper_attributes: Ensures that user-provided attributes override the attributes generated by block supports

src/wp-includes/class-wp-block-supports.php

@@ -179,30 +179,50 @@ function get_block_wrapper_attributes( $extra_attributes = array() ) {
 		return '';
 	}
 
-	// This is hardcoded on purpose.
-	// We only support a fixed list of attributes.
-	$attributes_to_merge = array( 'style', 'class', 'id', 'aria-label' );
-	$attributes          = array();
-	foreach ( $attributes_to_merge as $attribute_name ) {
-		if ( empty( $new_attributes[ $attribute_name ] ) && empty( $extra_attributes[ $attribute_name ] ) ) {
-			continue;
-		}
-
-		if ( empty( $new_attributes[ $attribute_name ] ) ) {
-			$attributes[ $attribute_name ] = $extra_attributes[ $attribute_name ];
-			continue;
-		}
-
-		if ( empty( $extra_attributes[ $attribute_name ] ) ) {
-			$attributes[ $attribute_name ] = $new_attributes[ $attribute_name ];
+	// Attribute values are concatenated or overridden depending on the attribute type.
+	// This is hardcoded on purpose, as we only support a fixed list of attributes.
+	$attribute_merge_callbacks = array(
+		'style'      => function ( $new_attribute, $extra_attribute ) {
+			$styles = array_filter(
+				array(
+					rtrim( trim( $extra_attribute ), ';' ),
+					rtrim( trim( $new_attribute ), ';' ),
+				)
+			);
+			return safecss_filter_attr( implode( ';', array_filter( $styles ) ) );
+		},
+		'class'      => function ( $new_attribute, $extra_attribute ) {
+			$classes = array_merge(
+				wp_parse_list( $extra_attribute ),
+				wp_parse_list( $new_attribute )
+			);
+			$classes = array_unique( array_filter( array_map( 'sanitize_html_class', $classes ) ) );
+			return implode( ' ', $classes );
+		},
+		'id'         => function ( $new_attribute, $extra_attribute ) {
+			return '' !== $extra_attribute ? $extra_attribute : $new_attribute;
+		},
+		'aria-label' => function ( $new_attribute, $extra_attribute ) {
+			return '' !== $extra_attribute ? $extra_attribute : $new_attribute;
+		},
+	);
+
+		$attributes = array();
+	foreach ( $attribute_merge_callbacks as $attribute_name => $merge_callback ) {
+		$new_attribute   = isset( $new_attributes[ $attribute_name ] ) ? $new_attributes[ $attribute_name ] : '';
+		$extra_attribute = isset( $extra_attributes[ $attribute_name ] ) ? $extra_attributes[ $attribute_name ] : '';
+		$new_attribute   = is_string( $new_attribute ) ? $new_attribute : '';
+		$extra_attribute = is_string( $extra_attribute ) ? $extra_attribute : '';
+
+		if ( '' === $new_attribute && '' === $extra_attribute ) {
 			continue;
 		}
 
-		$attributes[ $attribute_name ] = $extra_attributes[ $attribute_name ] . ' ' . $new_attributes[ $attribute_name ];
+		$attributes[ $attribute_name ] = $merge_callback( $new_attribute, $extra_attribute );
 	}
 
 	foreach ( $extra_attributes as $attribute_name => $value ) {
-		if ( ! in_array( $attribute_name, $attributes_to_merge, true ) ) {
+		if ( ! isset( $attribute_merge_callbacks[ $attribute_name ] ) ) {
 			$attributes[ $attribute_name ] = $value;
 		}
 	}