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

Editor: Fix error handling of converting classic to block menus.

Browse Source 
Fixes the error handling for when `WP_Classic_To_Block_Menu_Converter::convert()` returns an instance of `WP_Error`. 
`WP_Navigation_Fallback::create_classic_menu_fallback()` now checks for `is_wp_error()` and if `true`, returns the error. And the `@return` type is updated to 
`string|WP_Error`.

Also includes a fix in the return type in `WP_Classic_To_Block_Menu_Converter::convert()` to return an empty string instead of an array instead, i.e. when bailing 
out for no menu items returned by `wp_get_nav_menu_items()`. The return type is clearly documented as a string.

Follow-up to [56052].

Props dlh, get_dave, antonvlasenko, hellofromTonya.
Reviewed by azaozz, audrasjb.
Merges [56422] to the 6.3 branch.
Fixes #58823.

 --Cette ligne, et les suivantes ci-dessous, seront 
ignorées--

_M   .
M    src/wp-includes/class-wp-classic-to-block-menu-converter.php
M    src/wp-includes/class-wp-navigation-fallback.php
M    tests/phpunit/tests/editor/classic-to-block-menu-converter.php


git-svn-id: https://develop.svn.wordpress.org/branches/6.3@56426 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jb Audras 2023-08-22 20:57:47 +00:00
parent 0550f74770
commit 0c07bc80a2
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wp-includes/class-wp-classic-to-block-menu-converter.php
View File

@ -20,7 +20,9 @@ class WP_Classic_To_Block_Menu_Converter {
* @since 6.3.0
*
* @param WP_Term $menu The Menu term object of the menu to convert.
* @return string the serialized and normalized parsed blocks.
* @return string|WP_Error The serialized and normalized parsed blocks on success,
* an empty string when there are no menus to convert,
* or WP_Error on invalid menu.
*/
public static function convert( $menu ) {
@ -34,7 +36,7 @@ class WP_Classic_To_Block_Menu_Converter {
$menu_items = wp_get_nav_menu_items( $menu->term_id, array( 'update_post_term_cache' => false ) );
if ( empty( $menu_items ) ) {
return array();
return '';
}
// Set up the $menu_item variables.

4
src/wp-includes/class-wp-navigation-fallback.php
View File

@ -105,6 +105,10 @@ class WP_Navigation_Fallback {
// If there is a classic menu then convert it to blocks.
$classic_nav_menu_blocks = WP_Classic_To_Block_Menu_Converter::convert( $classic_nav_menu );
if ( is_wp_error( $classic_nav_menu_blocks ) ) {
return $classic_nav_menu_blocks;
}
if ( empty( $classic_nav_menu_blocks ) ) {
return new WP_Error( 'cannot_convert_classic_menu', __( 'Unable to convert Classic Menu to blocks.' ) );
}

6
tests/phpunit/tests/editor/classic-to-block-menu-converter.php
View File

@ -205,16 +205,14 @@ class WP_Classic_To_Block_Menu_Converter_Test extends WP_UnitTestCase {
* @ticket 58557
* @covers WP_Classic_To_Block_Menu_Converter::convert
*/
public function test_returns_empty_array_for_menus_with_no_items() {
public function test_returns_empty_string_for_menus_with_no_items() {
$menu_id = wp_create_nav_menu( 'Empty Menu' );
$classic_nav_menu = wp_get_nav_menu_object( $menu_id );
$blocks = WP_Classic_To_Block_Menu_Converter::convert( $classic_nav_menu );
$this->assertEmpty( $blocks, 'Result should be empty.' );
$this->assertIsArray( $blocks, 'Result should be empty array.' );
$this->assertSame( '', $blocks, 'Result should be empty string.' );
wp_delete_nav_menu( $menu_id );
}