Changeset 61618 for trunk/tests/phpunit/tests/theme/wpThemeJson.php

Timestamp:

02/12/2026 04:18:09 AM (6 weeks ago)

Author:

ramonopoly

Message:

WP_Theme_JSON: preserve valid non-preset settings for lightbox when KSES filters are active

Extends VALID_SETTINGS entries to also do type validation (as well as schema key validation) for the lightbox settings only.

Previously, when KSES filters were active (via add_action( 'init', 'kses_init_filters' )), valid non-preset settings in Global Styles were being incorrectly filtered out. For example, lightbox.enabled and lightbox.allowEditing for Image blocks.

The idea is that VALID_SETTINGS values can act as type validation for further valid settings.

Props ramonopoly, mmtr86, oandregal, wildworks, westonruter, andrewserong.

Fixes #64280.

File:

• trunk/tests/phpunit/tests/theme/wpThemeJson.php (modified) (1 diff)

trunk/tests/phpunit/tests/theme/wpThemeJson.php

@@ -6906 +6906 @@
         $this->assertSame( $expected, $theme_json->get_stylesheet( array( 'styles' ), null, array( 'skip_root_layout_styles' => true ) ) );
     }
+
+    /**
+     * @covers WP_Theme_JSON::sanitize
+     * @covers WP_Theme_JSON::remove_keys_not_in_schema
+     *
+     * @ticket 64280
+     */
+    public function test_sanitize_preserves_boolean_values_when_schema_expects_boolean() {
+        $theme_json = new WP_Theme_JSON(
+            array(
+                'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+                'settings' => array(
+                    'lightbox' => array(
+                        'enabled'      => true,
+                        'allowEditing' => false,
+                    ),
+                ),
+            )
+        );
+
+        $settings = $theme_json->get_settings();
+        $this->assertTrue( $settings['lightbox']['enabled'], 'Enabled should be true' );
+        $this->assertFalse( $settings['lightbox']['allowEditing'], 'Allow editing should be false' );
+    }
+
+    /**
+     * @covers WP_Theme_JSON::sanitize
+     * @covers WP_Theme_JSON::remove_keys_not_in_schema
+     *
+     * @ticket 64280
+     */
+    public function test_sanitize_removes_non_boolean_values_when_schema_expects_boolean() {
+        $theme_json = new WP_Theme_JSON(
+            array(
+                'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+                'settings' => array(
+                    'lightbox' => array(
+                        'enabled'      => 'not-a-boolean',
+                        'allowEditing' => 123,
+                    ),
+                ),
+            )
+        );
+
+        $settings = $theme_json->get_settings();
+        $this->assertArrayNotHasKey( 'enabled', $settings['lightbox'] ?? array(), 'Enabled should be removed' );
+        $this->assertArrayNotHasKey( 'allowEditing', $settings['lightbox'] ?? array(), 'Allow editing should be removed' );
+    }
+
+    /**
+     * @covers WP_Theme_JSON::sanitize
+     * @covers WP_Theme_JSON::remove_keys_not_in_schema
+     *
+     * @ticket 64280
+     */
+    public function test_sanitize_preserves_boolean_values_in_block_settings() {
+        $theme_json = new WP_Theme_JSON(
+            array(
+                'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+                'settings' => array(
+                    'blocks' => array(
+                        'core/image' => array(
+                            'lightbox' => array(
+                                'enabled'      => true,
+                                'allowEditing' => false,
+                            ),
+                        ),
+                    ),
+                ),
+            )
+        );
+
+        $settings = $theme_json->get_settings();
+        $this->assertTrue( $settings['blocks']['core/image']['lightbox']['enabled'], 'Enabled should be true' );
+        $this->assertFalse( $settings['blocks']['core/image']['lightbox']['allowEditing'], 'Allow editing should be false' );
+    }
+
+    /**
+     * @covers WP_Theme_JSON::sanitize
+     * @covers WP_Theme_JSON::remove_keys_not_in_schema
+     *
+     * @ticket 64280
+     */
+    public function test_sanitize_removes_non_boolean_values_in_block_settings() {
+        $theme_json = new WP_Theme_JSON(
+            array(
+                'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+                'settings' => array(
+                    'blocks' => array(
+                        'core/image' => array(
+                            'lightbox' => array(
+                                'enabled'      => 'string-value',
+                                'allowEditing' => array( 'not', 'a', 'boolean' ),
+                            ),
+                        ),
+                    ),
+                ),
+            )
+        );
+
+        $settings = $theme_json->get_settings();
+        $lightbox = $settings['blocks']['core/image']['lightbox'] ?? array();
+        $this->assertArrayNotHasKey( 'enabled', $lightbox, 'Enabled should be removed' );
+        $this->assertArrayNotHasKey( 'allowEditing', $lightbox, 'Allow editing should be removed' );
+    }
+
+    /**
+     * @covers WP_Theme_JSON::sanitize
+     * @covers WP_Theme_JSON::remove_keys_not_in_schema
+     *
+     * @ticket 64280
+     */
+    public function test_sanitize_preserves_null_schema_behavior() {
+        // Test that settings with null in schema (no type validation) still accept any type.
+        $theme_json = new WP_Theme_JSON(
+            array(
+                'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+                'settings' => array(
+                    'appearanceTools' => 'string-value', // null in schema, should accept any type.
+                    'custom'          => array( 'nested' => 'value' ), // null in schema, should accept any type.
+                ),
+            )
+        );
+
+        $settings = $theme_json->get_settings();
+        $this->assertSame( 'string-value', $settings['appearanceTools'], 'Appearance tools should be string value' );
+        $this->assertSame( array( 'nested' => 'value' ), $settings['custom'], 'Custom should be array value' );
+    }
 }