mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-04-04 20:23:27 +02:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Editor: Ensure get_block_templates() returns unique templates or template parts.

Browse Source 
The function was using the `array_column()` PHP function on an array of objects, which works as expected on PHP 7 or later, but not on PHP 5.6.

This resulted in customized templates being listed multiple times on the Templates and Template Parts screens, and being repeatedly added between lists when switching between the screens.

The issue is now resolved by replacing `array_column()` with the `wp_list_pluck()` WordPress core function, which provides consistent behavior beetween PHP versions.

Reference: [https://github.com/php/php-src/blob/PHP-7.0.0/UPGRADING#L626 PHP 7.0 Upgrade Notes: array_column()].

Props uofaberdeendarren, antonvlasenko, ironprogrammer, jonmackintosh, costdev, hellofromTonya, swissspidy, rudlinkon.
Merges [53927] to the 6.0 branch.
Fixes #56271.

git-svn-id: https://develop.svn.wordpress.org/branches/6.0@53928 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2022-08-23 14:54:57 +00:00
parent 1e9ba11079
commit 52b1a515d6
2 changed files with 117 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wp-includes/block-template-utils.php
View File

@ -705,7 +705,7 @@ function get_block_templates( $query = array(), $template_type = 'wp_template' )
$is_not_custom = false === array_search(
wp_get_theme()->get_stylesheet() . '//' . $template_file['slug'],
array_column( $query_result, 'id' ),
wp_list_pluck( $query_result, 'id' ),
true
);
$fits_slug_query =

116
tests/phpunit/tests/blocks/getBlockTemplates.php Normal file
View File

@ -0,0 +1,116 @@
<?php
/**
* @group block-templates
*
* @covers ::get_block_templates
*/
class Tests_Blocks_GetBlockTemplates extends WP_UnitTestCase {
const TEST_THEME = 'block-theme';
/**
* @var WP_Post
*/
private static $template;
/**
* @var WP_Post
*/
private static $template_part;
public static function set_up_before_class() {
parent::set_up_before_class();
/*
* This template has to have the same ID ("block-theme/index") as the template
* that is shipped with the "block-theme" theme. This is needed for testing purposes.
*/
static::$template = self::factory()->post->create_and_get(
array(
'post_type' => 'wp_template',
'post_name' => 'index',
'tax_input' => array(
'wp_theme' => array(
static::TEST_THEME,
),
),
)
);
wp_set_post_terms( static::$template->ID, static::TEST_THEME, 'wp_theme' );
/*
* This template part has to have the same ID ("block-theme/small-header") as the template part
* that is shipped with the "block-theme" theme. This is needed for testing purposes.
*/
self::$template_part = self::factory()->post->create_and_get(
array(
'post_type' => 'wp_template_part',
'post_name' => 'small-header',
'tax_input' => array(
'wp_theme' => array(
static::TEST_THEME,
),
'wp_template_part_area' => array(
WP_TEMPLATE_PART_AREA_HEADER,
),
),
)
);
wp_set_post_terms( self::$template_part->ID, WP_TEMPLATE_PART_AREA_HEADER, 'wp_template_part_area' );
wp_set_post_terms( self::$template_part->ID, static::TEST_THEME, 'wp_theme' );
}
public static function tear_down_after_class() {
wp_delete_post( static::$template->ID );
wp_delete_post( static::$template_part->ID );
parent::tear_down_after_class();
}
public function set_up() {
parent::set_up();
switch_theme( static::TEST_THEME );
}
/**
* @ticket 56271
*
* @dataProvider data_get_block_templates_returns_unique_entities
*
* @param string $template_type The template type.
* @param string $original_template_id ID (slug) of the default entity.
* @param string $error_message An error message to display if the test fails.
*/
public function test_get_block_templates_returns_unique_entities( $template_type, $original_template_id, $error_message ) {
$original_template = _get_block_template_file( $template_type, $original_template_id );
$this->assertNotEmpty( $original_template, 'An original (non-duplicate) template must exist for this test to work correctly.' );
$block_templates = get_block_templates( array(), $template_type );
$this->assertNotEmpty( $block_templates, 'get_block_templates() must return a non-empty value.' );
$block_template_ids = wp_list_pluck( $block_templates, 'id' );
$this->assertSame( count( array_unique( $block_template_ids ) ), count( $block_template_ids ), $error_message );
}
/**
* Data provider for test_get_block_templates_returns_unique_entities().
*
* @return array
*/
public function data_get_block_templates_returns_unique_entities() {
return array(
'wp_template template type' => array(
'template_type' => 'wp_template',
'original_template_id' => 'index',
'error_message' => 'get_block_templates() must return unique templates.',
),
'wp_template_part template type' => array(
'template_type' => 'wp_template_part',
'original_template_id' => 'small-header',
'error_message' => 'get_block_templates() must return unique template parts.',
),
);
}
}