Changeset 60727

Timestamp:

09/10/2025 08:25:46 PM (13 months ago)

Author:

dmsnell

Message:

Block Supports: Avoid throwing warning when checking for class attribute as string.

When encountering HTML tags with boolean or missing tags, the get_attribute() method in the HTML API returns true and null, respectively. If these returned values are sent directly into string comparison functions then as of PHP 8.0 they will throw E_DEPRECATED errors.

In this patch, block supports is enhanced to check that the class value is a string before it performs string operations on it.

Also in this patch: using assertEqualHTML() in background support test instead of assertSame()

Developed in ​https://github.com/WordPress/wordpress-develop/pull/5486
Discussed in https://core.trac.wordpress.org/ticket/59622

Props dmsnell, jonsurrell, hellofromtonya, peterwilsoncc.
Fixes #59622.

Location:

trunk

Files:

• src/wp-includes/block-supports/background.php (modified) (1 diff)
• tests/phpunit/tests/block-supports/layout.php (modified) (1 diff)
• tests/phpunit/tests/block-supports/wpRenderBackgroundSupport.php (modified) (1 diff)

trunk/src/wp-includes/block-supports/background.php

@@ -88 +88 @@
                 if ( $tags->next_tag() ) {
                         $existing_style = $tags->get_attribute( 'style' );
-                        $updated_style  = '';
-
-                        if ( ! empty( $existing_style ) ) {
-                                $updated_style = $existing_style;
-                                if ( ! str_ends_with( $existing_style, ';' ) ) {
-                                        $updated_style .= ';';
-                                }
+                        if ( is_string( $existing_style ) && '' !== $existing_style ) {
+                                $separator     = str_ends_with( $existing_style, ';' ) ? '' : ';';
+                                $updated_style = "{$existing_style}{$separator}{$styles['css']}";
+                        } else {
+                                $updated_style = $styles['css'];
                         }
 
-                        $updated_style .= $styles['css'];
                         $tags->set_attribute( 'style', $updated_style );
                         $tags->add_class( 'has-background' );

trunk/tests/phpunit/tests/block-supports/layout.php

@@ -185 +185 @@
                 switch_theme( 'default' );
                 $actual_output = wp_render_layout_support_flag( $args['block_content'], $args['block'] );
-                $this->assertSame( $expected_output, $actual_output );
+                $this->assertEqualHTML( $expected_output, $actual_output );
         }
 

trunk/tests/phpunit/tests/block-supports/wpRenderBackgroundSupport.php

@@ -187 +187 @@
                                 'wrapper'             => '<div class="wp-block-test" style="color: red;font-size: 15px;">Content</div>',
                         ),
+                        'background image style is appended if a boolean style attribute already exists' => array(
+                                'theme_name'          => 'block-theme-child-with-fluid-typography',
+                                'block_name'          => 'test/background-rules-are-output',
+                                'background_settings' => array(
+                                        'backgroundImage' => true,
+                                ),
+                                'background_style'    => array(
+                                        'backgroundImage' => array(
+                                                'url'    => 'https://example.com/image.jpg',
+                                                'source' => 'file',
+                                        ),
+                                ),
+                                'expected_wrapper'    => '<div class="has-background" classname="wp-block-test" style="background-image:url(&#039;https://example.com/image.jpg&#039;);background-size:cover;">Content</div>',
+                                'wrapper'             => '<div classname="wp-block-test" style>Content</div>',
+                        ),
                         'background image style is not applied if the block does not support background image' => array(
                                 'theme_name'          => 'block-theme-child-with-fluid-typography',