Index: /trunk/src/wp-includes/class-wp-theme-json.php =================================================================== --- /trunk/src/wp-includes/class-wp-theme-json.php (revision 64308) +++ /trunk/src/wp-includes/class-wp-theme-json.php (revision 64309) @@ -1141,5 +1141,5 @@ $scale_path = array( 'settings', 'spacing', 'spacingScale' ); $spacing_scale = _wp_array_get( $this->theme_json, $scale_path, null ); - if ( null !== $spacing_scale ) { + if ( is_array( $spacing_scale ) ) { // If the spacingScale is not already keyed by origin. if ( empty( array_intersect( array_keys( $spacing_scale ), static::VALID_ORIGINS ) ) ) { @@ -1215,5 +1215,8 @@ $block_level_data = $new_theme_json['styles']['blocks'][ $block_type ]['variations'][ $variation_name ] ?? array(); $top_level_data = $variations[ $variation_name ] ?? array(); - $merged_data = array_replace_recursive( $top_level_data, $block_level_data ); + if ( ! is_array( $block_level_data ) || ! is_array( $top_level_data ) ) { + continue; + } + $merged_data = array_replace_recursive( $top_level_data, $block_level_data ); if ( ! empty( $merged_data ) ) { _wp_array_set( $new_theme_json, array( 'styles', 'blocks', $block_type, 'variations', $variation_name ), $merged_data ); @@ -1494,5 +1497,5 @@ $variation_pseudo_selectors = array(); foreach ( $input['blockTypes'] as $variation_block_type ) { - if ( isset( static::VALID_BLOCK_PSEUDO_SELECTORS[ $variation_block_type ] ) ) { + if ( is_string( $variation_block_type ) && isset( static::VALID_BLOCK_PSEUDO_SELECTORS[ $variation_block_type ] ) ) { $variation_pseudo_selectors = array_merge( $variation_pseudo_selectors, @@ -2102,5 +2105,8 @@ if ( in_array( 'custom-css', $types, true ) ) { // Add the global styles root CSS. - $stylesheet .= _wp_array_get( $this->theme_json, array( 'styles', 'css' ) ); + $root_css = $this->theme_json['styles']['css'] ?? ''; + if ( is_string( $root_css ) ) { + $stylesheet .= $root_css; + } } @@ -2122,5 +2128,5 @@ $processed_css = ''; - if ( empty( $css ) ) { + if ( empty( $css ) || ! is_string( $css ) ) { return $processed_css; } @@ -3242,5 +3248,5 @@ * the URL takes precedence and the ref is ignored. */ - if ( is_array( $value ) && isset( $value['ref'] ) ) { + if ( is_array( $value ) && isset( $value['ref'] ) && is_string( $value['ref'] ) ) { $value_path = explode( '.', $value['ref'] ); $ref_value = _wp_array_get( $theme_json, $value_path ); @@ -4432,9 +4438,11 @@ // Apply the base spacing scale to the current layer. - $base_spacing_scale = _wp_array_get( $this->theme_json, $scale_path, array() ); - $flattened_spacing_scale = array_replace( $flattened_spacing_scale, $base_spacing_scale ); + $base_spacing_scale = _wp_array_get( $this->theme_json, $scale_path, array() ); + if ( is_array( $base_spacing_scale ) ) { + $flattened_spacing_scale = array_replace( $flattened_spacing_scale, $base_spacing_scale ); + } $spacing_scale = _wp_array_get( $incoming_data, $scale_path, null ); - if ( ! isset( $spacing_scale ) ) { + if ( ! is_array( $spacing_scale ) ) { continue; } @@ -5570,4 +5578,5 @@ ! is_numeric( $spacing_scale['mediumStep'] ) || ! isset( $spacing_scale['unit'] ) || + ! is_string( $spacing_scale['unit'] ) || ! isset( $spacing_scale['operator'] ) || ( '+' !== $spacing_scale['operator'] && '*' !== $spacing_scale['operator'] ) || Index: /trunk/tests/phpunit/tests/theme/wpThemeJson.php =================================================================== --- /trunk/tests/phpunit/tests/theme/wpThemeJson.php (revision 64308) +++ /trunk/tests/phpunit/tests/theme/wpThemeJson.php (revision 64309) @@ -5898,4 +5898,120 @@ /** + * @ticket 66286 + * + * @dataProvider data_get_stylesheet_ignores_values_of_unexpected_types + * + * @param array $theme_json_data The theme.json data, without the version. + */ + public function test_get_stylesheet_ignores_values_of_unexpected_types( $theme_json_data ) { + $theme_json = new WP_Theme_JSON( + array_merge( array( 'version' => WP_Theme_JSON::LATEST_SCHEMA ), $theme_json_data ) + ); + + $this->assertIsString( $theme_json->get_stylesheet( array( 'variables', 'styles', 'presets', 'custom-css' ) ) ); + } + + /** + * Data provider. + * + * @return array + */ + public static function data_get_stylesheet_ignores_values_of_unexpected_types() { + return array( + 'root custom css as an object' => array( + array( 'styles' => array( 'css' => array( 'color' => 'red' ) ) ), + ), + 'element custom css as an object' => array( + array( 'styles' => array( 'elements' => array( 'link' => array( 'css' => array( 'color' => 'red' ) ) ) ) ), + ), + 'block custom css as a list' => array( + array( 'styles' => array( 'blocks' => array( 'core/paragraph' => array( 'css' => array( 'color: red;' ) ) ) ) ), + ), + 'ref as an array' => array( + array( 'styles' => array( 'color' => array( 'text' => array( 'ref' => array( 'styles', 'color' ) ) ) ) ), + ), + 'spacing scale as a string' => array( + array( 'settings' => array( 'spacing' => array( 'spacingScale' => '1.5' ) ) ), + ), + 'spacing scale unit as an array' => array( + array( + 'settings' => array( + 'spacing' => array( + 'spacingScale' => array( + 'operator' => '*', + 'increment' => 1.5, + 'steps' => 7, + 'mediumStep' => 1.5, + 'unit' => array( 'rem' ), + ), + ), + ), + ), + ), + 'shared style variation as a string' => array( + array( 'styles' => array( 'variations' => array( 'plain' => 'red' ) ) ), + ), + 'block types item as an array' => array( + array( 'blockTypes' => array( array( 'core/button' ) ) ), + ), + ); + } + + /** + * @ticket 66286 + */ + public function test_merge_does_not_generate_spacing_sizes_from_a_non_array_per_origin_spacing_scale() { + $theme_json = new WP_Theme_JSON( + array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'settings' => array( + 'spacing' => array( + 'spacingScale' => array( + 'operator' => '*', + 'increment' => 1.5, + 'steps' => 3, + 'mediumStep' => 1.5, + 'unit' => 'rem', + ), + ), + ), + ), + 'default' + ); + $theme_json->merge( + new WP_Theme_JSON( + array( + 'version' => WP_Theme_JSON::LATEST_SCHEMA, + 'settings' => array( 'spacing' => array( 'spacingScale' => array( 'theme' => '1.5' ) ) ), + ) + ) + ); + $spacing_sizes = $theme_json->get_settings()['spacing']['spacingSizes']; + + $this->assertSame( array(), $spacing_sizes['theme'], 'The theme layer with a non-array spacing scale should generate no sizes.' ); + $this->assertSame( + array( + array( + 'name' => 'Small', + 'slug' => '40', + 'size' => '1rem', + ), + array( + 'name' => 'Medium', + 'slug' => '50', + 'size' => '1.5rem', + ), + array( + 'name' => 'Large', + 'slug' => '60', + 'size' => '2.25rem', + ), + ), + $spacing_sizes['default'], + 'The default layer sizes should be unaffected.' + ); + } + + /** * @ticket 57583 * @ticket 61165 @@ -7412,4 +7528,5 @@ * @ticket 61165 * @ticket 61769 + * @ticket 66286 * * @dataProvider data_process_blocks_custom_css @@ -7445,4 +7562,18 @@ 'selector' => '.foo', 'css' => '', + ), + 'expected' => '', + ), + 'css as an object' => array( + 'input' => array( + 'selector' => '.foo', + 'css' => array( 'color' => 'red' ), + ), + 'expected' => '', + ), + 'css as a list of strings' => array( + 'input' => array( + 'selector' => '.foo', + 'css' => array( 'color: red;' ), ), 'expected' => '',